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 branch 'master' into alpha38

Browse Source 
Conflicts:
	ionic/components/popup/popup.ts
This commit is contained in:
Adam Bradley
2015-10-05 16:43:30 -05:00
parent 5c17f82e7f 2bac3a9ef8
commit 974a70cf0e
15 changed files with 353 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ionic/components/segment/segment.scss
View File

@ -57,11 +57,13 @@ ion-segment {
&:first-of-type {
border-radius: $button-border-radius 0px 0px $button-border-radius;
margin-right: 0;
}
&:last-of-type {
border-right-width: 1px;
border-radius: 0px $button-border-radius $button-border-radius 0px;
margin-left: 0;
}
}