javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-07 06:57:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added border radius to button bar items. Fixes #48

Browse Source
This commit is contained in:
Max Lynch
2013-10-25 21:39:21 -05:00
parent fc87f2f3e1
commit d2055335ea
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dist/css/ionic-ios7.css vendored
View File

@ -2037,8 +2037,11 @@ a.button {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
line-height: 15px; } line-height: 15px; }
.button-bar > .button:first-child {
border-radius: 2px 0px 0px 2px; }
.button-bar > .button:last-child { .button-bar > .button:last-child {
border-right-width: 1px; } border-right-width: 1px;
border-radius: 0px 2px 2px 0px; }
.buttons { .buttons {
box-flex: 1; box-flex: 1;

5
dist/css/ionic-scoped.css vendored
View File

@ -2729,8 +2729,11 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
line-height: 15px; } line-height: 15px; }
.ionic .button-bar > .button:first-child {
border-radius: 2px 0px 0px 2px; }
.ionic .button-bar > .button:last-child { .ionic .button-bar > .button:last-child {
border-right-width: 1px; } border-right-width: 1px;
border-radius: 0px 2px 2px 0px; }
.ionic .buttons { .ionic .buttons {
box-flex: 1; box-flex: 1;
-webkit-box-flex: 1; -webkit-box-flex: 1;

5
dist/css/ionic.css vendored
View File

@ -3258,8 +3258,11 @@ a.button {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
line-height: 15px; } line-height: 15px; }
.button-bar > .button:first-child {
border-radius: 2px 0px 0px 2px; }
.button-bar > .button:last-child { .button-bar > .button:last-child {
border-right-width: 1px; } border-right-width: 1px;
border-radius: 0px 2px 2px 0px; }
.buttons { .buttons {
box-flex: 1; box-flex: 1;

5
scss/ionic/_button-bar.scss
View File

@ -1,4 +1,3 @@
.button-bar { .button-bar {
@include box-flex(1); @include box-flex(1);
@include box-orient(horizontal); @include box-orient(horizontal);
@ -26,8 +25,12 @@
line-height: $button-bar-button-line-height; line-height: $button-bar-button-line-height;
&:first-child {
border-radius: 2px 0px 0px 2px;
}
&:last-child { &:last-child {
border-right-width: 1px; border-right-width: 1px;
border-radius: 0px 2px 2px 0px;
} }
} }