javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 12:29:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(picker): mark main button as strong

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2016-12-05 22:59:54 +01:00
parent 672266d4f7
commit af7139b7ab
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/button/button.ios.scss
View File

@ -318,5 +318,5 @@ $button-ios-round-border-radius: $button-round-border-radius
// -------------------------------------------------- // --------------------------------------------------
.button-strong-ios { .button-strong-ios {
font-weight: bold; font-weight: 600;
} }

5
src/components/picker/picker-component.ts
View File

@ -438,7 +438,7 @@ export class PickerColumnCmp {
<div class="picker-wrapper"> <div class="picker-wrapper">
<div class="picker-toolbar"> <div class="picker-toolbar">
<div *ngFor="let b of d.buttons" class="picker-toolbar-button" [ngClass]="b.cssRole"> <div *ngFor="let b of d.buttons" class="picker-toolbar-button" [ngClass]="b.cssRole">
<button ion-button (click)="btnClick(b)" [ngClass]="b.cssClass" class="picker-button" clear> <button ion-button (click)="btnClick(b)" [ngClass]="b.cssClass" class="picker-button" clear [strong]="b.strong">
{{b.text}} {{b.text}}
</button> </button>
</div> </div>
@ -500,6 +500,9 @@ export class PickerCmp {
} }
return button; return button;
}); });
if (data.buttons.length > 0) {
data.buttons[data.buttons.length - 1].strong = true;
}
// clean up dat data // clean up dat data
data.columns = data.columns.map(column => { data.columns = data.columns.map(column => {

2
src/components/toolbar/toolbar.ios.scss
View File

@ -378,5 +378,5 @@ $navbar-ios-height: $toolbar-ios-height !default;
// -------------------------------------------------- // --------------------------------------------------
.bar-button-strong-ios { .bar-button-strong-ios {
font-weight: bold; font-weight: 600;
} }