...
 
Commits (2)
......@@ -69,25 +69,25 @@ minds-button-remind {
.minds-boost-button{
font-size: 12px;
font-weight: 400;
height: auto;
min-height: 0;
line-height: 18px;
text-transform: capitalize;
text-transform: uppercase;
align-self: center;
padding: 3px 0;
min-width: 62px;
min-width: 72px;
width: auto;
margin: -3px 0;
display: block;
@include m-theme(){
background-color: themed($m-blue) !important;
}
&:hover {
@include m-theme(){
background-color: rgba(themed($m-blue-dark),0.9) !important;
}
flex: 0 !important;
span {
min-width: 72px;
text-align: center;
vertical-align: middle;
}
}
.selected{
......@@ -136,4 +136,4 @@ minds-button-remind > a {
color: themed($m-blue-grey-800);
}
}
}
\ No newline at end of file
}
.tabs .m-wire-button{
transform: scale(0.8) translateY(-4px);
// transform: scale(0.8) translateY(-4px);
margin: -3px 0;
}
.m-pin-button {
overflow: visible;
......@@ -88,9 +89,9 @@ minds-activity {
padding-left: 8px;
margin: auto;
padding: 3px 0 3px 8px;
padding: 2px 0 2px 8px;
font-size: 14px;
line-height: 9px;
line-height: 8px;
border-radius: 3px;
vertical-align: middle;
//text-align: center;
......@@ -120,7 +121,7 @@ minds-activity {
}
.m-activity--metrics-metric{
font-size: 10px;
font-size: 9px;
display: inline-block;
vertical-align: middle;
......
......@@ -210,21 +210,21 @@
<div class="tabs" *ngIf="!hideTabs && !isPending(activity)">
<minds-button-thumbs-up [object]="activity"></minds-button-thumbs-up>
<minds-button-thumbs-down [object]="activity"></minds-button-thumbs-down>
<m-wire-button *ngIf="session.getLoggedInUser().guid != (activity.remind_object ? activity.remind_object.owner_guid : activity.owner_guid)"
[object]="activity.remind_object ? activity.remind_object : activity"
(done)="wireSubmitted($event)"
></m-wire-button>
<m-wire-button *ngIf="session.getLoggedInUser().guid != activity.owner_guid"
[object]="activity"
(done)="wireSubmitted($event)"
></m-wire-button>
<button class="m-btn m-btn--action m-btn--slim minds-boost-button"
*ngIf ="session.getLoggedInUser().guid == activity.owner_guid"
id="boost-actions"
(click)="showBoost()">
<span i18n="verb|@@M__ACTION__BOOST">Boost</span>
</button>
<minds-button-comment [object]="activity" (click)="openComments()"></minds-button-comment>
<minds-button-remind [object]="activity"></minds-button-remind>
<a class="mdl-button mdl-color-text--white mdl-button--colored minds-boost-button"
*ngIf ="session.getLoggedInUser().guid == activity.owner_guid"
id="boost-actions"
(click)="showBoost()">
<ng-container i18n="verb|@@M__ACTION__BOOST">Boost</ng-container>
</a>
</div>
<div class="impressions-tag m-activity--metrics" [class.m-activity--metrics-wire]="!session.getLoggedInUser() || session.getLoggedInUser().guid != activity.owner_guid" *ngIf="!activity.hide_impressions && !hideTabs">
<div class="impressions-tag m-activity--metrics m-activity--metrics-wire" *ngIf="!activity.hide_impressions && !hideTabs">
<div class="m-activity--metrics-inner m-border">
<div class="m-activity--metrics-metric" (click)="showWire()">
<i class="ion-icon ion-flash"></i>
......
.m-wire-button {
appearance: none;
/*appearance: none;
background: transparent;
border: 0;
border-radius: 0;
padding: 0;
*/
padding: 3px;
height: auto;
line-height: 18px;
cursor: pointer;
@include m-theme(){
color: themed($m-blue);
......@@ -16,7 +19,13 @@
}
> .ion-icon {
transform: scale(1.6);
// transform: scale(1.6);
font-size: 18px;
}
span {
margin-left: $minds-margin;
vertical-align: middle;
}
&:focus {
......
......@@ -8,8 +8,9 @@ import { Session } from '../../../services/session';
@Component({
selector: 'm-wire-button',
template: `
<button class="m-wire-button" (click)="wire()">
<i class="ion-icon ion-flash"></i>
<button class="m-btn m-btn--action m-btn--slim m-wire-button" (click)="wire()">
<i class="ion-icon ion-flash"></i>
<span>Donate</span>
</button>
`
})
......
......@@ -7,7 +7,7 @@
<i class="ion-icon ion-flash"></i>
<span class="m-wire-channel--cta-label">
<span i18n="@@WIRE__CHANNEL__WIRE_ME_ACTION">Wire me</span>
<span i18n="@@WIRE__CHANNEL__WIRE_ME_ACTION">Donate</span>
</span>
</button>
</div>
......