diff options
| author | Mark Otto <[email protected]> | 2012-01-25 20:02:32 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-25 20:02:32 -0800 |
| commit | e877d125d7a2c673fec4e63600c2d8544c3128f6 (patch) | |
| tree | b9347cf770d83703bb145190b28fabc6e7f12503 | |
| parent | 0db2d45350a67bc1a98c0f2d1c4706e3bd25ca50 (diff) | |
| download | bootstrap-e877d125d7a2c673fec4e63600c2d8544c3128f6.tar.xz bootstrap-e877d125d7a2c673fec4e63600c2d8544c3128f6.zip | |
fix button group shadows, update js docs to fix alert js file link
| -rw-r--r-- | bootstrap.css | 8 | ||||
| -rw-r--r-- | bootstrap.min.css | 2 | ||||
| -rw-r--r-- | docs/assets/css/docs.css | 6 | ||||
| -rw-r--r-- | docs/components.html | 6 | ||||
| -rw-r--r-- | docs/javascript.html | 2 | ||||
| -rw-r--r-- | docs/templates/pages/components.mustache | 6 | ||||
| -rw-r--r-- | docs/templates/pages/javascript.mustache | 2 | ||||
| -rw-r--r-- | lib/button-groups.less | 2 |
8 files changed, 17 insertions, 17 deletions
diff --git a/bootstrap.css b/bootstrap.css index 0d81b9b03..4ece30d20 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Wed Jan 25 15:04:24 PST 2012 + * Date: Wed Jan 25 15:27:50 PST 2012 */ article, aside, @@ -2592,9 +2592,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .btn-group .dropdown-toggle { padding-left: 8px; padding-right: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn-group.open .dropdown-menu { display: block; diff --git a/bootstrap.min.css b/bootstrap.min.css index 447ecbb2d..50b328682 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -477,7 +477,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .btn-group .btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;} .btn-group .btn.large:last-child,.btn-group .large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;} .btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active{z-index:2;} -.btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),0 1px 2px rgba(0, 0, 0, 0.05);} +.btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);} .btn-group.open .dropdown-menu{display:block;margin-top:1px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} .btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);} .btn .caret{margin-top:6px;margin-left:0;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b70b039f2..3265e324f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -172,9 +172,9 @@ section { border-right-color: #ddd; border-left: 0; padding-left: 13px; - -webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.075); - -moz-box-shadow: inset 0 3px 5px rgba(0,0,0,.075); - box-shadow: inset 0 3px 5px rgba(0,0,0,.075); + -webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.05); + -moz-box-shadow: inset 0 3px 5px rgba(0,0,0,.05); + box-shadow: inset 0 3px 5px rgba(0,0,0,.05); } .subnav .nav li:first-child a { border-left: 0; diff --git a/docs/components.html b/docs/components.html index 56c5280db..2ccfd26e6 100644 --- a/docs/components.html +++ b/docs/components.html @@ -70,7 +70,7 @@ <div class="subnav"> <ul class="nav pills"> <li><a href="#buttonGroups">Button groups</a></li> - <li><a href="#buttonDropdowns">Button dropdowns</a></li> + <li><a href="#comboButtons">Combo buttons</a></li> <li><a href="#navs">Nav, tabs, pills</a></li> <li><a href="#navbar">Navbar</a></li> <li><a href="#breadcrumbs">Breadcrumbs</a></li> @@ -156,9 +156,9 @@ <!-- Split button dropdowns ================================================== --> -<section id="buttonDropdowns"> +<section id="comboButtons"> <div class="page-header"> - <h1>Split button dropdowns <small>Built on button groups to provide contextual menus</small></h1> + <h1>Combo buttons <small>Built on button groups to provide contextual dropdown menus</small></h1> </div> <div class="row"> <div class="span4"> diff --git a/docs/javascript.html b/docs/javascript.html index eb291a1a3..34d61ef9c 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -871,7 +871,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <div class="span3 columns"> <h3>About alerts</h3> <p>The alert plugin is a tiny class for adding close functionality to alerts.</p> - <a href="../js/bootstrap-alerts.js" target="_blank" class="btn">Download</a> + <a href="../js/bootstrap-alert.js" target="_blank" class="btn">Download</a> </div> <div class="span9 columns"> <h2>Example alerts</h2> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index effa10762..aaee36410 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -6,7 +6,7 @@ <div class="subnav"> <ul class="nav pills"> <li><a href="#buttonGroups">{{_i}}Button groups{{/i}}</a></li> - <li><a href="#buttonDropdowns">{{_i}}Button dropdowns{{/i}}</a></li> + <li><a href="#comboButtons">{{_i}}Combo buttons{{/i}}</a></li> <li><a href="#navs">{{_i}}Nav, tabs, pills{{/i}}</a></li> <li><a href="#navbar">{{_i}}Navbar{{/i}}</a></li> <li><a href="#breadcrumbs">{{_i}}Breadcrumbs{{/i}}</a></li> @@ -92,9 +92,9 @@ <!-- Split button dropdowns ================================================== --> -<section id="buttonDropdowns"> +<section id="comboButtons"> <div class="page-header"> - <h1>{{_i}}Split button dropdowns{{/i}} <small>{{_i}}Built on button groups to provide contextual menus{{/i}}</small></h1> + <h1>{{_i}}Combo buttons{{/i}} <small>{{_i}}Built on button groups to provide contextual dropdown menus{{/i}}</small></h1> </div> <div class="row"> <div class="span4"> diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 1c6aa4705..6b2a3693d 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -807,7 +807,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <div class="span3 columns"> <h3>{{_i}}About alerts{{/i}}</h3> <p>{{_i}}The alert plugin is a tiny class for adding close functionality to alerts.{{/i}}</p> - <a href="../js/bootstrap-alerts.js" target="_blank" class="btn">{{_i}}Download{{/i}}</a> + <a href="../js/bootstrap-alert.js" target="_blank" class="btn">{{_i}}Download{{/i}}</a> </div> <div class="span9 columns"> <h2>{{_i}}Example alerts{{/i}}</h2> diff --git a/lib/button-groups.less b/lib/button-groups.less index 4be4aca71..17957f1d6 100644 --- a/lib/button-groups.less +++ b/lib/button-groups.less @@ -81,7 +81,7 @@ .btn-group .dropdown-toggle { padding-left: 8px; padding-right: 8px; - @shadow: inset 1px 0 0 rgba(255,255,255,.125), 0 1px 2px rgba(0,0,0,.05); + @shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); .box-shadow(@shadow); } |
