From d2055335eaf6e848968a9ff2c55c22ab14efba3f Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Fri, 25 Oct 2013 21:39:21 -0500 Subject: [PATCH] Added border radius to button bar items. Fixes #48 --- dist/css/ionic-ios7.css | 5 ++++- dist/css/ionic-scoped.css | 5 ++++- dist/css/ionic.css | 5 ++++- scss/ionic/_button-bar.scss | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dist/css/ionic-ios7.css b/dist/css/ionic-ios7.css index e3bcc7991a..c45cc4e535 100644 --- a/dist/css/ionic-ios7.css +++ b/dist/css/ionic-ios7.css @@ -2037,8 +2037,11 @@ a.button { text-overflow: ellipsis; white-space: nowrap; line-height: 15px; } + .button-bar > .button:first-child { + border-radius: 2px 0px 0px 2px; } .button-bar > .button:last-child { - border-right-width: 1px; } + border-right-width: 1px; + border-radius: 0px 2px 2px 0px; } .buttons { box-flex: 1; diff --git a/dist/css/ionic-scoped.css b/dist/css/ionic-scoped.css index cc8007bc4a..2e56aebd62 100644 --- a/dist/css/ionic-scoped.css +++ b/dist/css/ionic-scoped.css @@ -2729,8 +2729,11 @@ text-overflow: ellipsis; white-space: nowrap; line-height: 15px; } + .ionic .button-bar > .button:first-child { + border-radius: 2px 0px 0px 2px; } .ionic .button-bar > .button:last-child { - border-right-width: 1px; } + border-right-width: 1px; + border-radius: 0px 2px 2px 0px; } .ionic .buttons { box-flex: 1; -webkit-box-flex: 1; diff --git a/dist/css/ionic.css b/dist/css/ionic.css index 91713da08a..a92885d5c8 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -3258,8 +3258,11 @@ a.button { text-overflow: ellipsis; white-space: nowrap; line-height: 15px; } + .button-bar > .button:first-child { + border-radius: 2px 0px 0px 2px; } .button-bar > .button:last-child { - border-right-width: 1px; } + border-right-width: 1px; + border-radius: 0px 2px 2px 0px; } .buttons { box-flex: 1; diff --git a/scss/ionic/_button-bar.scss b/scss/ionic/_button-bar.scss index a70dfc3050..c91647065a 100644 --- a/scss/ionic/_button-bar.scss +++ b/scss/ionic/_button-bar.scss @@ -1,4 +1,3 @@ - .button-bar { @include box-flex(1); @include box-orient(horizontal); @@ -26,8 +25,12 @@ line-height: $button-bar-button-line-height; + &:first-child { + border-radius: 2px 0px 0px 2px; + } &:last-child { border-right-width: 1px; + border-radius: 0px 2px 2px 0px; } }