javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 19:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/css-refactor' into css-refactor

Browse Source
This commit is contained in:
Brandy Carney
2015-12-04 14:09:51 -05:00
parent 76dbdda086 d833e747cb
commit 45c7eae2e8
45 changed files with 165 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ionic/components/segment/modes/ios.scss
View File

@ -1,4 +1,5 @@
@import "../../../ionic.globals";
@import "../segment";
// iOS Segment
// --------------------------------------------------
@ -8,6 +9,7 @@ $segment-button-ios-min-height: 3.0rem !default;
$segment-button-ios-line-height: 3.0rem !default;
$segment-button-ios-bg-color: transparent !default;
$segment-button-ios-font-size: 1.3rem !default;
$segment-button-ios-border-radius: 4px !default;
$segment-button-ios-bg-color-activated: color(primary) !default;
$segment-button-ios-text-color: inverse($segment-button-ios-bg-color-activated) !default;
@ -49,17 +51,17 @@ ion-segment {
}
&:first-of-type {
border-radius: $button-border-radius 0px 0px $button-border-radius;
border-radius: $segment-button-ios-border-radius 0 0 $segment-button-ios-border-radius;
margin-right: 0;
}
&:not(:first-of-type) {
border-left-width: 0px;
border-left-width: 0;
}
&:last-of-type {
border-left-width: 0px;
border-radius: 0px $button-border-radius $button-border-radius 0px;
border-left-width: 0;
border-radius: 0 $segment-button-ios-border-radius $segment-button-ios-border-radius 0;
margin-left: 0;
}
}

1
ionic/components/segment/modes/md.scss
View File

@ -1,4 +1,5 @@
@import "../../../ionic.globals";
@import "../segment";
// iOS Segment
// --------------------------------------------------