mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-19 16:54:24 +01:00
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
This commit is contained in:
Jacob Thornton
commit
a282dba58f
@ -1019,6 +1019,36 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
|
||||
<input type="text" placeholder="@line-height-base">
|
||||
<p class="help-block">Modal title line-height</p>
|
||||
</div>
|
||||
<div class="col-lg-4">
|
||||
<label>@modal-content-bg</label>
|
||||
<input type="text" placeholder="#fff">
|
||||
<p class="help-block">Background color of modal content area</p>
|
||||
</div>
|
||||
<div class="col-lg-4">
|
||||
<label>@modal-content-border-color</label>
|
||||
<input type="text" placeholder="rgba(0,0,0,.2)">
|
||||
<p class="help-block">Modal content border color</p>
|
||||
</div>
|
||||
<div class="col-lg-4">
|
||||
<label>@modal-content-fallback-border-color</label>
|
||||
<input type="text" placeholder="#999">
|
||||
<p class="help-block">Modal content border color <strong>for IE8</strong></p>
|
||||
</div>
|
||||
<div class="col-lg-4">
|
||||
<label>@modal-backdrop-bg</label>
|
||||
<input type="text" placeholder="#000">
|
||||
<p class="help-block">Modal backdrop background color</p>
|
||||
</div>
|
||||
<div class="col-lg-4">
|
||||
<label>@modal-header-border-color</label>
|
||||
<input type="text" placeholder="#e5e5e5">
|
||||
<p class="help-block">Modal header border color</p>
|
||||
</div>
|
||||
<div class="col-lg-4">
|
||||
<label>@modal-footer-border-color</label>
|
||||
<input type="text" placeholder="@modal-header-border-color">
|
||||
<p class="help-block">Modal footer border color</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h2 id="variables-carousel">Carousel</h2>
|
||||
|
||||
33
dist/css/bootstrap.css
vendored
33
dist/css/bootstrap.css
vendored
@ -2219,7 +2219,7 @@ input[type="button"].btn-block {
|
||||
.dropdown-menu > .disabled > a:hover,
|
||||
.dropdown-menu > .disabled > a:focus {
|
||||
text-decoration: none;
|
||||
cursor: default;
|
||||
cursor: not-allowed;
|
||||
background-color: transparent;
|
||||
background-image: none;
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
|
||||
@ -2540,7 +2540,7 @@ button.close {
|
||||
.nav > li.disabled > a:focus {
|
||||
color: #999999;
|
||||
text-decoration: none;
|
||||
cursor: default;
|
||||
cursor: not-allowed;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
@ -2605,6 +2605,7 @@ button.close {
|
||||
}
|
||||
|
||||
.nav-tabs.nav-justified {
|
||||
display: table;
|
||||
width: 100%;
|
||||
border-bottom: 0;
|
||||
}
|
||||
@ -2612,7 +2613,7 @@ button.close {
|
||||
.nav-tabs.nav-justified > li {
|
||||
display: table-cell;
|
||||
float: none;
|
||||
width: 1%;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.nav-tabs.nav-justified > li > a {
|
||||
@ -2657,19 +2658,33 @@ button.close {
|
||||
}
|
||||
|
||||
.nav-justified {
|
||||
display: table;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.nav-justified > li {
|
||||
display: table-cell;
|
||||
float: none;
|
||||
width: 1%;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.nav-justified > li > a {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.nav-tabs-justified {
|
||||
border-bottom: 0;
|
||||
}
|
||||
|
||||
.nav-tabs-justified > li > a {
|
||||
margin-right: 0;
|
||||
border-bottom: 1px solid #ddd;
|
||||
}
|
||||
|
||||
.nav-tabs-justified > .active > a {
|
||||
border-bottom-color: #ffffff;
|
||||
}
|
||||
|
||||
.tabbable:before,
|
||||
.tabbable:after {
|
||||
display: table;
|
||||
@ -3301,7 +3316,7 @@ button.close {
|
||||
.pagination > .disabled > a:hover,
|
||||
.pagination > .disabled > a:focus {
|
||||
color: #999999;
|
||||
cursor: default;
|
||||
cursor: not-allowed;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
|
||||
@ -3402,7 +3417,7 @@ button.close {
|
||||
.pager .disabled > a:focus,
|
||||
.pager .disabled > span {
|
||||
color: #999999;
|
||||
cursor: default;
|
||||
cursor: not-allowed;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
|
||||
@ -3444,8 +3459,8 @@ button.close {
|
||||
|
||||
.modal-content {
|
||||
position: relative;
|
||||
background-color: #fff;
|
||||
border: 1px solid #999;
|
||||
background-color: #ffffff;
|
||||
border: 1px solid #999999;
|
||||
border: 1px solid rgba(0, 0, 0, 0.2);
|
||||
border-radius: 6px;
|
||||
outline: none;
|
||||
@ -3461,7 +3476,7 @@ button.close {
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
z-index: 1030;
|
||||
background-color: #000;
|
||||
background-color: #000000;
|
||||
}
|
||||
|
||||
.modal-backdrop.fade {
|
||||
|
||||
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@ -102,7 +102,7 @@
|
||||
background-color: transparent;
|
||||
background-image: none; // Remove CSS gradient
|
||||
.reset-filter();
|
||||
cursor: default;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -46,10 +46,10 @@
|
||||
// Actual modal
|
||||
.modal-content {
|
||||
position: relative;
|
||||
background-color: #fff;
|
||||
border: 1px solid #999;
|
||||
border: 1px solid rgba(0,0,0,.2);
|
||||
border-radius: 6px;
|
||||
background-color: @modal-content-bg;
|
||||
border: 1px solid @modal-content-fallback-border-color; //old browsers fallback (ie8 etc)
|
||||
border: 1px solid @modal-content-border-color;
|
||||
border-radius: @border-radius-large;
|
||||
.box-shadow(0 3px 9px rgba(0,0,0,.5));
|
||||
.background-clip(padding-box);
|
||||
// Remove focus outline from opened modal
|
||||
@ -64,7 +64,7 @@
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
z-index: (@zindex-modal-background - 10);
|
||||
background-color: #000;
|
||||
background-color: @modal-backdrop-bg;
|
||||
// Fade for backdrop
|
||||
&.fade { .opacity(0); }
|
||||
&.fade.in { .opacity(.5); }
|
||||
@ -74,7 +74,7 @@
|
||||
// Top section of the modal w/ title and dismiss
|
||||
.modal-header {
|
||||
padding: @modal-title-padding;
|
||||
border-bottom: 1px solid #e5e5e5;
|
||||
border-bottom: 1px solid @modal-header-border-color;
|
||||
min-height: (@modal-title-padding + @modal-title-line-height);
|
||||
}
|
||||
// Close icon
|
||||
@ -100,7 +100,7 @@
|
||||
margin-top: 15px;
|
||||
padding: (@modal-inner-padding - 1) @modal-inner-padding @modal-inner-padding;
|
||||
text-align: right; // right align buttons
|
||||
border-top: 1px solid #e5e5e5;
|
||||
border-top: 1px solid @modal-footer-border-color;
|
||||
.clearfix(); // clear it in case folks use .pull-* classes on buttons
|
||||
|
||||
// Properly space out buttons
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
color: @gray-light;
|
||||
text-decoration: none;
|
||||
background-color: transparent;
|
||||
cursor: default;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
}
|
||||
|
||||
@ -115,8 +115,8 @@
|
||||
}
|
||||
// pulling this in mainly for less shorthand
|
||||
&.nav-justified {
|
||||
.nav-justified;
|
||||
.nav-tabs-justified;
|
||||
.nav-justified();
|
||||
.nav-tabs-justified();
|
||||
}
|
||||
}
|
||||
|
||||
@ -167,11 +167,12 @@
|
||||
// -------------------------
|
||||
|
||||
.nav-justified {
|
||||
display: table;
|
||||
width: 100%;
|
||||
> li {
|
||||
float: none;
|
||||
display: table-cell;
|
||||
width: 1%;
|
||||
width: auto;
|
||||
> a {
|
||||
text-align: center;
|
||||
}
|
||||
@ -179,7 +180,7 @@
|
||||
}
|
||||
|
||||
// Move borders to anchors instead of bottom of list
|
||||
.nav-tabs-justified () {
|
||||
.nav-tabs-justified {
|
||||
border-bottom: 0;
|
||||
> li > a {
|
||||
border-bottom: 1px solid #ddd;
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
> span {
|
||||
color: @gray-light;
|
||||
background-color: @pagination-bg;
|
||||
cursor: default;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -53,7 +53,7 @@
|
||||
> a:focus {
|
||||
color: @gray-light;
|
||||
background-color: @pagination-bg;
|
||||
cursor: default;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -296,6 +296,15 @@
|
||||
@modal-title-padding: 15px;
|
||||
@modal-title-line-height: @line-height-base;
|
||||
|
||||
@modal-content-bg: #fff;
|
||||
@modal-content-border-color: rgba(0,0,0,.2);
|
||||
@modal-content-fallback-border-color: #999;
|
||||
|
||||
@modal-backdrop-bg: #000;
|
||||
@modal-header-border-color: #e5e5e5;
|
||||
@modal-footer-border-color: @modal-header-border-color;
|
||||
|
||||
|
||||
// Alerts
|
||||
// -------------------------
|
||||
@alert-bg: @state-warning-bg;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user