Skip to content

B
bootstrap
Commit 358e3a53 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch 'phopkins-ie_buttons' into 2.0-wip

parents b8c1950c edef89f3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 125 deletions
bootstrap.css
View file @ 358e3a53
This diff is collapsed.
bootstrap.min.css
View file @ 358e3a53
This diff is collapsed.
docs/base-css.html
View file @ 358e3a53
......@@ -432,10 +432,10 @@
</tr>
<tr>
<td>
<span class="label notice">Notice</span>
<span class="label info">Info</span>
</td>
<td>
<code>&lt;span class="label notice"&gt;Notice&lt;/span&gt;</code>
<code>&lt;span class="label info"&gt;Info&lt;/span&gt;</code>
</td>
</tr>
</tbody>
......@@ -1210,6 +1210,8 @@
<!-- Buttons
================================================== -->
<section id="buttons">
<div class="page-header">
<h1>Buttons</h1>
......@@ -1278,9 +1280,9 @@
<a href="#" class="btn small">Action</a>
</p>
</div>
<div class="span8">
<div class="span4">
<h3>Disabled state</h3>
<p>For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s <code>.disabled</code> for links and <code>:disabled</code> for <code>&lt;button&gt;</code> elements.</p>
<p>For disabled buttons, use <code>.disabled</code> for links and <code>:disabled</code> for <code>&lt;button&gt;</code> elements.</p>
<p>
<a href="#" class="btn large primary disabled">Primary action</a>
<a href="#" class="btn large disabled">Action</a>
......@@ -1290,6 +1292,11 @@
<button class="btn large" disabled>Action</button>
</p>
</div>
<div class="span4">
<h3>Cross browser compatibility</h3>
<p>In IE9, we drop the gradient on all buttons in favor of rounded corners as IE9 doesn't crop background gradients to the corners.</p>
<p>Related, IE9 jankifies disabled <code>button</code> elements, rendering text gray with a nasty text-shadow&mdash;unfortunately we can't fix this.</p>
</div>
</div>
<br>
......
docs/less.html
View file @ 358e3a53
......@@ -468,11 +468,6 @@
<td><code>@opacity: 100</code></td>
<td>Set, in whole numbers, the opacity percentage (e.g., "50" or "75")</td>
</tr>
<tr>
<td><code>.reset-filter()</code></td>
<td><em class="muted">none</em></td>
<td>Resets any IE filter</td>
</tr>
</tbody>
</table>
<h3>Forms</h3>
......
docs/templates/pages/base-css.mustache
View file @ 358e3a53
......@@ -367,10 +367,10 @@
</tr>
<tr>
<td>
<span class="label notice">{{_i}}Notice{{/i}}</span>
<span class="label info">{{_i}}Info{{/i}}</span>
</td>
<td>
<code>&lt;span class="label notice"&gt;{{_i}}Notice{{/i}}&lt;/span&gt;</code>
<code>&lt;span class="label info"&gt;{{_i}}Info{{/i}}&lt;/span&gt;</code>
</td>
</tr>
</tbody>
......@@ -1145,6 +1145,8 @@
<!-- Buttons
================================================== -->
<section id="buttons">
<div class="page-header">
<h1>{{_i}}Buttons{{/i}}</h1>
......@@ -1213,9 +1215,9 @@
<a href="#" class="btn small">{{_i}}Action{{/i}}</a>
</p>
</div>
<div class="span8">
<div class="span4">
<h3>{{_i}}Disabled state{{/i}}</h3>
<p>{{_i}}For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s <code>.disabled</code> for links and <code>:disabled</code> for <code>&lt;button&gt;</code> elements.{{/i}}</p>
<p>{{_i}}For disabled buttons, use <code>.disabled</code> for links and <code>:disabled</code> for <code>&lt;button&gt;</code> elements.{{/i}}</p>
<p>
<a href="#" class="btn large primary disabled">{{_i}}Primary action{{/i}}</a>
<a href="#" class="btn large disabled">{{_i}}Action{{/i}}</a>
......@@ -1225,6 +1227,11 @@
<button class="btn large" disabled>{{_i}}Action{{/i}}</button>
</p>
</div>
<div class="span4">
<h3>Cross browser compatibility</h3>
<p>In IE9, we drop the gradient on all buttons in favor of rounded corners as IE9 doesn't crop background gradients to the corners.</p>
<p>Related, IE9 jankifies disabled <code>button</code> elements, rendering text gray with a nasty text-shadow&mdash;unfortunately we can't fix this.</p>
</div>
</div>
<br>
......
docs/templates/pages/less.mustache
View file @ 358e3a53
......@@ -403,11 +403,6 @@
<td><code>@opacity: 100</code></td>
<td>{{_i}}Set, in whole numbers, the opacity percentage (e.g., "50" or "75"){{/i}}</td>
</tr>
<tr>
<td><code>.reset-filter()</code></td>
<td><em class="muted">none</em></td>
<td>{{_i}}Resets any IE filter{{/i}}</td>
</tr>
</tbody>
</table>
<h3>Forms</h3>
......
lib/buttons.less
View file @ 358e3a53
// BUTTON STYLES
// -------------
// Shared colors for buttons and alerts
// Colors
// ------
.btn {
// Set text color
&.primary,
&.primary:hover,
&.danger,
&.danger:hover,
&.success,
......@@ -13,21 +18,51 @@
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
color: @white
}
&.primary {
.buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 15));
}
// Danger and error appear as red
&.danger {
.gradientBar(#ee5f5b, #c43c35);
.buttonBackground(#ee5f5b, #c43c35);
}
// Success appears as green
&.success {
.gradientBar(#62c462, #57a957);
.buttonBackground(#62c462, #57a957);
}
// Info appears as a neutral blue
&.info {
.gradientBar(#5bc0de, #339bb9);
.buttonBackground(#5bc0de, #339bb9);
}
}
// Mixin for generating button backgrounds
// ---------------------------------------
.buttonBackground(@startColor, @endColor) {
// gradientBar will set the background to a pleasing blend of these, to support IE<=9
.gradientBar(@startColor, @endColor);
// in these cases the gradient won't cover the background, so we override
&:hover, &:active, &.active, &.disabled {
background-color: @endColor;
}
// called out separately because IE8 would ignore otherwise
&[disabled] {
background-color: @endColor;
}
// IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
&:active,
&.active {
background-color: darken(@endColor, 10%) e("\9");
}
}
// Base .btn styles
// Base styles
// -----------
.btn {
// Button Base
display: inline-block;
......@@ -47,7 +82,12 @@
&:hover {
color: @grayDark;
text-decoration: none;
background-color: darken(@white, 10%);
background-position: 0 -15px;
// transition is only when going to hover, otherwise the background
// behind the gradient (there for IE<=9 fallback) gets mismatched
.transition(background-position .1s linear);
}
// Focus state for keyboard and accessibility
......@@ -55,27 +95,19 @@
outline: 1px dotted #666;
}
// Primary Button Type
&.primary {
color: @white;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
.gradientBar(@primaryButtonBackground, spin(@primaryButtonBackground, 15));
}
// Transitions
.transition(.1s linear all);
// Active and Disabled states
&.active,
&:active {
background-image: none;
@shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
background-color: darken(@white, 10%);
background-color: darken(@white, 15%) e("\9");
}
&.disabled {
cursor: default;
background-image: none;
.reset-filter();
background-color: darken(@white, 10%);
.opacity(65);
.box-shadow(none);
}
......@@ -84,7 +116,7 @@
// def because IE8 and below will drop it ;_;
cursor: default;
background-image: none;
.reset-filter();
background-color: darken(@white, 10%);
.opacity(65);
.box-shadow(none);
}
......@@ -101,10 +133,6 @@
font-size: @baseFontSize - 2px;
}
}
// Super jank hack for removing border-radius from IE9 so we can keep filter gradients on alerts and buttons
:root .btn {
border-radius: 0 \0;
}
// Help Firefox not be a jerk about adding extra padding to buttons
button.btn,
......@@ -113,4 +141,4 @@ input[type=submit].btn {
padding: 0;
border: 0;
}
}
\ No newline at end of file
}
lib/labels.less
View file @ 358e3a53
......@@ -9,8 +9,8 @@
text-transform: uppercase;
background-color: @grayLight;
.border-radius(3px);
&.important { background-color: #c43c35; }
&.important { background-color: @errorText; }
&.warning { background-color: @orange; }
&.success { background-color: @green; }
&.notice { background-color: lighten(@blue, 25%); }
&.success { background-color: @successText; }
&.info { background-color: @infoText; }
}
lib/mixins.less
View file @ 358e3a53
......@@ -266,10 +266,9 @@
background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10
background-image: linear-gradient(left, @startColor, @endColor); // Le standard
background-repeat: repeat-x;
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE9 and down
}
.vertical(@startColor: #555, @endColor: #333) {
background-color: @endColor;
background-color: mix(@startColor, @endColor, 60%);
background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+
background-image: -ms-linear-gradient(top, @startColor, @endColor); // IE10
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
......@@ -277,7 +276,6 @@
background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
background-image: linear-gradient(top, @startColor, @endColor); // The standard
background-repeat: repeat-x;
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down
}
.directional(@startColor: #555, @endColor: #333, @deg: 45deg) {
background-color: @endColor;
......@@ -289,7 +287,7 @@
background-image: linear-gradient(@deg, @startColor, @endColor); // The standard
}
.vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
background-color: @endColor;
background-color: mix(@midColor, @endColor, 80%);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor);
background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor);
......@@ -297,7 +295,6 @@
background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
background-repeat: no-repeat;
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down, gets no color-stop at all for proper fallback
}
.radial(@innerColor: #555, @outerColor: #333) {
background-color: @outsideColor;
......@@ -319,11 +316,6 @@
}
}
// Reset filters for IE
.reset-filter() {
filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)"));
}
// COMPONENT MIXINS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment