Lots of updates
This commit is contained in:
parent
e3cfff8310
commit
39e7af6238
55 changed files with 230911 additions and 46365 deletions
|
|
@ -18,6 +18,7 @@
|
|||
// Specified for the h4 to prevent conflicts of changing $headings-color
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
// Provide class for links that match alerts
|
||||
.alert-link {
|
||||
font-weight: $alert-link-font-weight;
|
||||
|
|
@ -28,6 +29,7 @@
|
|||
> ul {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
> p + p {
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
|
@ -57,12 +59,15 @@
|
|||
.alert-success {
|
||||
@include alert-variant($alert-success-bg, $alert-success-border, $alert-success-text);
|
||||
}
|
||||
|
||||
.alert-info {
|
||||
@include alert-variant($alert-info-bg, $alert-info-border, $alert-info-text);
|
||||
}
|
||||
|
||||
.alert-warning {
|
||||
@include alert-variant($alert-warning-bg, $alert-warning-border, $alert-warning-text);
|
||||
}
|
||||
|
||||
.alert-danger {
|
||||
@include alert-variant($alert-danger-bg, $alert-danger-border, $alert-danger-text);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
font-weight: $badge-font-weight;
|
||||
color: $badge-color;
|
||||
line-height: $badge-line-height;
|
||||
vertical-align: baseline;
|
||||
vertical-align: middle;
|
||||
white-space: nowrap;
|
||||
text-align: center;
|
||||
background-color: $badge-bg;
|
||||
|
|
@ -28,7 +28,9 @@
|
|||
position: relative;
|
||||
top: -1px;
|
||||
}
|
||||
.btn-xs & {
|
||||
|
||||
.btn-xs &,
|
||||
.btn-group-xs > .btn & {
|
||||
top: 0;
|
||||
padding: 1px 5px;
|
||||
}
|
||||
|
|
@ -36,11 +38,20 @@
|
|||
// [converter] extracted a& to a.badge
|
||||
|
||||
// Account for badges in navs
|
||||
a.list-group-item.active > &,
|
||||
.list-group-item.active > &,
|
||||
.nav-pills > .active > a > & {
|
||||
color: $badge-active-color;
|
||||
background-color: $badge-active-bg;
|
||||
}
|
||||
|
||||
.list-group-item > & {
|
||||
float: right;
|
||||
}
|
||||
|
||||
.list-group-item > & + & {
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
.nav-pills > li > a > & {
|
||||
margin-left: 3px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,9 @@
|
|||
display: inline-block;
|
||||
|
||||
+ li:before {
|
||||
content: "#{$breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
|
||||
// [converter] Workaround for https://github.com/sass/libsass/issues/1115
|
||||
$nbsp: "\00a0";
|
||||
content: "#{$breadcrumb-separator}#{$nbsp}"; // Unicode space added since inline-block means non-collapsing white-space
|
||||
padding: 0 5px;
|
||||
color: $breadcrumb-color;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,10 +18,6 @@
|
|||
&.active {
|
||||
z-index: 2;
|
||||
}
|
||||
&:focus {
|
||||
// Remove focus outline when dropdown JS adds it after closing the menu
|
||||
outline: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -38,8 +34,9 @@
|
|||
// Optional: Group multiple button groups together for a toolbar
|
||||
.btn-toolbar {
|
||||
margin-left: -5px; // Offset the first child's margin
|
||||
@include clearfix();
|
||||
@include clearfix;
|
||||
|
||||
.btn,
|
||||
.btn-group,
|
||||
.input-group {
|
||||
float: left;
|
||||
|
|
@ -75,13 +72,13 @@
|
|||
.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
|
||||
border-radius: 0;
|
||||
}
|
||||
.btn-group > .btn-group:first-child {
|
||||
.btn-group > .btn-group:first-child:not(:last-child) {
|
||||
> .btn:last-child,
|
||||
> .dropdown-toggle {
|
||||
@include border-right-radius(0);
|
||||
}
|
||||
}
|
||||
.btn-group > .btn-group:last-child > .btn:first-child {
|
||||
.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
|
||||
@include border-left-radius(0);
|
||||
}
|
||||
|
||||
|
|
@ -156,7 +153,7 @@
|
|||
|
||||
// Clear floats so dropdown menus can be properly placed
|
||||
> .btn-group {
|
||||
@include clearfix();
|
||||
@include clearfix;
|
||||
> .btn {
|
||||
float: none;
|
||||
}
|
||||
|
|
@ -176,12 +173,12 @@
|
|||
border-radius: 0;
|
||||
}
|
||||
&:first-child:not(:last-child) {
|
||||
border-top-right-radius: $border-radius-base;
|
||||
@include border-top-radius($btn-border-radius-base);
|
||||
@include border-bottom-radius(0);
|
||||
}
|
||||
&:last-child:not(:first-child) {
|
||||
border-bottom-left-radius: $border-radius-base;
|
||||
@include border-top-radius(0);
|
||||
@include border-bottom-radius($btn-border-radius-base);
|
||||
}
|
||||
}
|
||||
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
|
||||
|
|
@ -198,7 +195,6 @@
|
|||
}
|
||||
|
||||
|
||||
|
||||
// Justified button groups
|
||||
// ----------------------
|
||||
|
||||
|
|
@ -226,15 +222,23 @@
|
|||
// Checkbox and radio options
|
||||
//
|
||||
// In order to support the browser's form validation feedback, powered by the
|
||||
// `required` attribute, we have to "hide" the inputs via `opacity`. We cannot
|
||||
// use `display: none;` or `visibility: hidden;` as that also hides the popover.
|
||||
// `required` attribute, we have to "hide" the inputs via `clip`. We cannot use
|
||||
// `display: none;` or `visibility: hidden;` as that also hides the popover.
|
||||
// Simply visually hiding the inputs via `opacity` would leave them clickable in
|
||||
// certain cases which is prevented by using `clip` and `pointer-events`.
|
||||
// This way, we ensure a DOM element is visible to position the popover from.
|
||||
//
|
||||
// See https://github.com/twbs/bootstrap/pull/12794 for more.
|
||||
// See https://github.com/twbs/bootstrap/pull/12794 and
|
||||
// https://github.com/twbs/bootstrap/pull/14559 for more information.
|
||||
|
||||
[data-toggle="buttons"] > .btn > input[type="radio"],
|
||||
[data-toggle="buttons"] > .btn > input[type="checkbox"] {
|
||||
position: absolute;
|
||||
z-index: -1;
|
||||
@include opacity(0);
|
||||
[data-toggle="buttons"] {
|
||||
> .btn,
|
||||
> .btn-group > .btn {
|
||||
input[type="radio"],
|
||||
input[type="checkbox"] {
|
||||
position: absolute;
|
||||
clip: rect(0,0,0,0);
|
||||
pointer-events: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,23 +12,26 @@
|
|||
font-weight: $btn-font-weight;
|
||||
text-align: center;
|
||||
vertical-align: middle;
|
||||
touch-action: manipulation;
|
||||
cursor: pointer;
|
||||
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
|
||||
border: 1px solid transparent;
|
||||
white-space: nowrap;
|
||||
@include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base);
|
||||
@include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $btn-border-radius-base);
|
||||
@include user-select(none);
|
||||
|
||||
&,
|
||||
&:active,
|
||||
&.active {
|
||||
&:focus {
|
||||
@include tab-focus();
|
||||
&:focus,
|
||||
&.focus {
|
||||
@include tab-focus;
|
||||
}
|
||||
}
|
||||
|
||||
&:hover,
|
||||
&:focus {
|
||||
&:focus,
|
||||
&.focus {
|
||||
color: $btn-default-color;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
|
@ -43,11 +46,19 @@
|
|||
&.disabled,
|
||||
&[disabled],
|
||||
fieldset[disabled] & {
|
||||
cursor: not-allowed;
|
||||
pointer-events: none; // Future-proof disabling of clicks
|
||||
cursor: $cursor-disabled;
|
||||
@include opacity(.65);
|
||||
@include box-shadow(none);
|
||||
}
|
||||
|
||||
// [converter] extracted a& to a.btn
|
||||
}
|
||||
|
||||
a.btn {
|
||||
&.disabled,
|
||||
fieldset[disabled] & {
|
||||
pointer-events: none; // Future-proof disabling of clicks on `<a>` elements
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -85,11 +96,11 @@
|
|||
.btn-link {
|
||||
color: $link-color;
|
||||
font-weight: normal;
|
||||
cursor: pointer;
|
||||
border-radius: 0;
|
||||
|
||||
&,
|
||||
&:active,
|
||||
&.active,
|
||||
&[disabled],
|
||||
fieldset[disabled] & {
|
||||
background-color: transparent;
|
||||
|
|
@ -104,7 +115,7 @@
|
|||
&:hover,
|
||||
&:focus {
|
||||
color: $link-hover-color;
|
||||
text-decoration: underline;
|
||||
text-decoration: $link-hover-decoration;
|
||||
background-color: transparent;
|
||||
}
|
||||
&[disabled],
|
||||
|
|
@ -123,14 +134,14 @@
|
|||
|
||||
.btn-lg {
|
||||
// line-height: ensure even-numbered height of button next to large input
|
||||
@include button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
|
||||
@include button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $btn-border-radius-large);
|
||||
}
|
||||
.btn-sm {
|
||||
// line-height: ensure proper height of button next to small input
|
||||
@include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
|
||||
@include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $btn-border-radius-small);
|
||||
}
|
||||
.btn-xs {
|
||||
@include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $border-radius-small);
|
||||
@include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $btn-border-radius-small);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -21,9 +21,33 @@
|
|||
// Account for jankitude on images
|
||||
> img,
|
||||
> a > img {
|
||||
@include img-responsive();
|
||||
@include img-responsive;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
// WebKit CSS3 transforms for supported devices
|
||||
@media all and (transform-3d), (-webkit-transform-3d) {
|
||||
@include transition-transform(0.6s ease-in-out);
|
||||
@include backface-visibility(hidden);
|
||||
@include perspective(1000px);
|
||||
|
||||
&.next,
|
||||
&.active.right {
|
||||
@include translate3d(100%, 0, 0);
|
||||
left: 0;
|
||||
}
|
||||
&.prev,
|
||||
&.active.left {
|
||||
@include translate3d(-100%, 0, 0);
|
||||
left: 0;
|
||||
}
|
||||
&.next.left,
|
||||
&.prev.right,
|
||||
&.active {
|
||||
@include translate3d(0, 0, 0);
|
||||
left: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
> .active,
|
||||
|
|
@ -77,6 +101,7 @@
|
|||
color: $carousel-control-color;
|
||||
text-align: center;
|
||||
text-shadow: $carousel-text-shadow;
|
||||
background-color: rgba(0, 0, 0, 0); // Fix IE9 click-thru bug
|
||||
// We can't have this transition here because WebKit cancels the carousel
|
||||
// animation if you trip this while in the middle of another animation.
|
||||
|
||||
|
|
@ -106,6 +131,7 @@
|
|||
.glyphicon-chevron-right {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
margin-top: -10px;
|
||||
z-index: 5;
|
||||
display: inline-block;
|
||||
}
|
||||
|
|
@ -123,7 +149,7 @@
|
|||
.icon-next {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
margin-top: -10px;
|
||||
line-height: 1;
|
||||
font-family: serif;
|
||||
}
|
||||
|
||||
|
|
@ -171,6 +197,7 @@
|
|||
// Internet Explorer 8-9 does not support clicks on elements without a set
|
||||
// `background-color`. We cannot use `filter` since that's not viewed as a
|
||||
// background color by the browser. Thus, a hack is needed.
|
||||
// See https://developer.mozilla.org/en-US/docs/Web/Events/click#Internet_Explorer
|
||||
//
|
||||
// For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we
|
||||
// set alpha transparency for the best results possible.
|
||||
|
|
@ -214,18 +241,18 @@
|
|||
.glyphicon-chevron-right,
|
||||
.icon-prev,
|
||||
.icon-next {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
margin-top: -15px;
|
||||
font-size: 30px;
|
||||
width: ($carousel-control-font-size * 1.5);
|
||||
height: ($carousel-control-font-size * 1.5);
|
||||
margin-top: ($carousel-control-font-size / -2);
|
||||
font-size: ($carousel-control-font-size * 1.5);
|
||||
}
|
||||
.glyphicon-chevron-left,
|
||||
.icon-prev {
|
||||
margin-left: -15px;
|
||||
margin-left: ($carousel-control-font-size / -2);
|
||||
}
|
||||
.glyphicon-chevron-right,
|
||||
.icon-next {
|
||||
margin-right: -15px;
|
||||
margin-right: ($carousel-control-font-size / -2);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
// Additional properties for button version
|
||||
// iOS requires the button element instead of an anchor tag.
|
||||
// If you want the anchor version, it requires `href="#"`.
|
||||
// See https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
|
||||
button.close {
|
||||
padding: 0;
|
||||
cursor: pointer;
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ kbd {
|
|||
kbd {
|
||||
padding: 0;
|
||||
font-size: 100%;
|
||||
font-weight: bold;
|
||||
box-shadow: none;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,5 +31,7 @@ tbody.collapse.in { display: table-row-group; }
|
|||
position: relative;
|
||||
height: 0;
|
||||
overflow: hidden;
|
||||
@include transition(height .35s ease);
|
||||
@include transition-property(height, visibility);
|
||||
@include transition-duration(.35s);
|
||||
@include transition-timing-function(ease);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,12 +10,14 @@
|
|||
height: 0;
|
||||
margin-left: 2px;
|
||||
vertical-align: middle;
|
||||
border-top: $caret-width-base solid;
|
||||
border-top: $caret-width-base dashed;
|
||||
border-top: $caret-width-base solid \9; // IE8
|
||||
border-right: $caret-width-base solid transparent;
|
||||
border-left: $caret-width-base solid transparent;
|
||||
}
|
||||
|
||||
// The dropdown wrapper (div)
|
||||
.dropup,
|
||||
.dropdown {
|
||||
position: relative;
|
||||
}
|
||||
|
|
@ -103,16 +105,15 @@
|
|||
&:focus {
|
||||
color: $dropdown-link-disabled-color;
|
||||
}
|
||||
}
|
||||
// Nuke hover/focus effects
|
||||
.dropdown-menu > .disabled > a {
|
||||
|
||||
// Nuke hover/focus effects
|
||||
&:hover,
|
||||
&:focus {
|
||||
text-decoration: none;
|
||||
background-color: transparent;
|
||||
background-image: none; // Remove CSS gradient
|
||||
@include reset-filter();
|
||||
cursor: not-allowed;
|
||||
@include reset-filter;
|
||||
cursor: $cursor-disabled;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -184,14 +185,15 @@
|
|||
// Reverse the caret
|
||||
.caret {
|
||||
border-top: 0;
|
||||
border-bottom: $caret-width-base solid;
|
||||
border-bottom: $caret-width-base dashed;
|
||||
border-bottom: $caret-width-base solid \9; // IE8
|
||||
content: "";
|
||||
}
|
||||
// Different positioning for bottom up menu
|
||||
.dropdown-menu {
|
||||
top: auto;
|
||||
bottom: 100%;
|
||||
margin-bottom: 1px;
|
||||
margin-bottom: 2px;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -212,4 +214,3 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,6 @@ input[type="checkbox"] {
|
|||
line-height: normal;
|
||||
}
|
||||
|
||||
// Set the height of file controls to match text inputs
|
||||
input[type="file"] {
|
||||
display: block;
|
||||
}
|
||||
|
|
@ -77,7 +76,7 @@ select[size] {
|
|||
input[type="file"]:focus,
|
||||
input[type="radio"]:focus,
|
||||
input[type="checkbox"]:focus {
|
||||
@include tab-focus();
|
||||
@include tab-focus;
|
||||
}
|
||||
|
||||
// Adjust output element
|
||||
|
|
@ -123,15 +122,21 @@ output {
|
|||
background-color: $input-bg;
|
||||
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
|
||||
border: 1px solid $input-border;
|
||||
border-radius: $input-border-radius;
|
||||
border-radius: $input-border-radius; // Note: This has no effect on <select>s in some browsers, due to the limited stylability of <select>s in CSS.
|
||||
@include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
|
||||
@include transition(border-color ease-in-out .15s, box-shadow ease-in-out .15s);
|
||||
|
||||
// Customize the `:focus` state to imitate native WebKit styles.
|
||||
@include form-control-focus();
|
||||
@include form-control-focus;
|
||||
|
||||
// Placeholder
|
||||
@include placeholder();
|
||||
@include placeholder;
|
||||
|
||||
// Unstyle the caret on `<select>`s in IE10+.
|
||||
&::-ms-expand {
|
||||
border: 0;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
// Disabled and read-only inputs
|
||||
//
|
||||
|
|
@ -141,9 +146,13 @@ output {
|
|||
&[disabled],
|
||||
&[readonly],
|
||||
fieldset[disabled] & {
|
||||
cursor: not-allowed;
|
||||
background-color: $input-bg-disabled;
|
||||
opacity: 1; // iOS fix for unreadable disabled content
|
||||
opacity: 1; // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655
|
||||
}
|
||||
|
||||
&[disabled],
|
||||
fieldset[disabled] & {
|
||||
cursor: $cursor-disabled;
|
||||
}
|
||||
|
||||
// [converter] extracted textarea& to textarea.form-control
|
||||
|
|
@ -170,24 +179,30 @@ input[type="search"] {
|
|||
// Special styles for iOS temporal inputs
|
||||
//
|
||||
// In Mobile Safari, setting `display: block` on temporal inputs causes the
|
||||
// text within the input to become vertically misaligned.
|
||||
// As a workaround, we set a pixel line-height that matches the
|
||||
// given height of the input. Since this fucks up everything else, we have to
|
||||
// appropriately reset it for Internet Explorer and the size variations.
|
||||
// text within the input to become vertically misaligned. As a workaround, we
|
||||
// set a pixel line-height that matches the given height of the input, but only
|
||||
// for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
|
||||
//
|
||||
// Note that as of 8.3, iOS doesn't support `datetime` or `week`.
|
||||
|
||||
input[type="date"],
|
||||
input[type="time"],
|
||||
input[type="datetime-local"],
|
||||
input[type="month"] {
|
||||
line-height: $input-height-base;
|
||||
// IE8+ misaligns the text within date inputs, so we reset
|
||||
line-height: $line-height-base #{\0};
|
||||
@media screen and (-webkit-min-device-pixel-ratio: 0) {
|
||||
input[type="date"],
|
||||
input[type="time"],
|
||||
input[type="datetime-local"],
|
||||
input[type="month"] {
|
||||
&.form-control {
|
||||
line-height: $input-height-base;
|
||||
}
|
||||
|
||||
&.input-sm {
|
||||
line-height: $input-height-small;
|
||||
}
|
||||
&.input-lg {
|
||||
line-height: $input-height-large;
|
||||
&.input-sm,
|
||||
.input-group-sm & {
|
||||
line-height: $input-height-small;
|
||||
}
|
||||
|
||||
&.input-lg,
|
||||
.input-group-lg & {
|
||||
line-height: $input-height-large;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -198,7 +213,7 @@ input[type="month"] {
|
|||
// horizontal forms, use the predefined grid classes.
|
||||
|
||||
.form-group {
|
||||
margin-bottom: 15px;
|
||||
margin-bottom: $form-group-margin-bottom;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -210,11 +225,11 @@ input[type="month"] {
|
|||
.checkbox {
|
||||
position: relative;
|
||||
display: block;
|
||||
min-height: $line-height-computed; // clear the floating input if there is no label text
|
||||
margin-top: 10px;
|
||||
margin-bottom: 10px;
|
||||
|
||||
label {
|
||||
min-height: $line-height-computed; // Ensure the input doesn't jump when there is no text
|
||||
padding-left: 20px;
|
||||
margin-bottom: 0;
|
||||
font-weight: normal;
|
||||
|
|
@ -238,6 +253,7 @@ input[type="month"] {
|
|||
// Radios and checkboxes on same line
|
||||
.radio-inline,
|
||||
.checkbox-inline {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
padding-left: 20px;
|
||||
margin-bottom: 0;
|
||||
|
|
@ -260,7 +276,7 @@ input[type="checkbox"] {
|
|||
&[disabled],
|
||||
&.disabled,
|
||||
fieldset[disabled] & {
|
||||
cursor: not-allowed;
|
||||
cursor: $cursor-disabled;
|
||||
}
|
||||
}
|
||||
// These classes are used directly on <label>s
|
||||
|
|
@ -268,7 +284,7 @@ input[type="checkbox"] {
|
|||
.checkbox-inline {
|
||||
&.disabled,
|
||||
fieldset[disabled] & {
|
||||
cursor: not-allowed;
|
||||
cursor: $cursor-disabled;
|
||||
}
|
||||
}
|
||||
// These classes are used on elements with <label> descendants
|
||||
|
|
@ -277,7 +293,7 @@ input[type="checkbox"] {
|
|||
&.disabled,
|
||||
fieldset[disabled] & {
|
||||
label {
|
||||
cursor: not-allowed;
|
||||
cursor: $cursor-disabled;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -294,6 +310,7 @@ input[type="checkbox"] {
|
|||
padding-bottom: ($padding-base-vertical + 1);
|
||||
// Remove default margin from `p`
|
||||
margin-bottom: 0;
|
||||
min-height: ($line-height-computed + $font-size-base);
|
||||
|
||||
&.input-lg,
|
||||
&.input-sm {
|
||||
|
|
@ -307,10 +324,61 @@ input[type="checkbox"] {
|
|||
//
|
||||
// Build on `.form-control` with modifier classes to decrease or increase the
|
||||
// height and font-size of form controls.
|
||||
//
|
||||
// The `.form-group-* form-control` variations are sadly duplicated to avoid the
|
||||
// issue documented in https://github.com/twbs/bootstrap/issues/15074.
|
||||
|
||||
@include input-size('.input-sm', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
|
||||
@include input-size('.input-sm', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small);
|
||||
.form-group-sm {
|
||||
.form-control {
|
||||
height: $input-height-small;
|
||||
padding: $padding-small-vertical $padding-small-horizontal;
|
||||
font-size: $font-size-small;
|
||||
line-height: $line-height-small;
|
||||
border-radius: $input-border-radius-small;
|
||||
}
|
||||
select.form-control {
|
||||
height: $input-height-small;
|
||||
line-height: $input-height-small;
|
||||
}
|
||||
textarea.form-control,
|
||||
select[multiple].form-control {
|
||||
height: auto;
|
||||
}
|
||||
.form-control-static {
|
||||
height: $input-height-small;
|
||||
min-height: ($line-height-computed + $font-size-small);
|
||||
padding: ($padding-small-vertical + 1) $padding-small-horizontal;
|
||||
font-size: $font-size-small;
|
||||
line-height: $line-height-small;
|
||||
}
|
||||
}
|
||||
|
||||
@include input-size('.input-lg', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
|
||||
@include input-size('.input-lg', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large);
|
||||
.form-group-lg {
|
||||
.form-control {
|
||||
height: $input-height-large;
|
||||
padding: $padding-large-vertical $padding-large-horizontal;
|
||||
font-size: $font-size-large;
|
||||
line-height: $line-height-large;
|
||||
border-radius: $input-border-radius-large;
|
||||
}
|
||||
select.form-control {
|
||||
height: $input-height-large;
|
||||
line-height: $input-height-large;
|
||||
}
|
||||
textarea.form-control,
|
||||
select[multiple].form-control {
|
||||
height: auto;
|
||||
}
|
||||
.form-control-static {
|
||||
height: $input-height-large;
|
||||
min-height: ($line-height-computed + $font-size-large);
|
||||
padding: ($padding-large-vertical + 1) $padding-large-horizontal;
|
||||
font-size: $font-size-large;
|
||||
line-height: $line-height-large;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Form control feedback states
|
||||
|
|
@ -329,7 +397,7 @@ input[type="checkbox"] {
|
|||
// Feedback icon (requires .glyphicon classes)
|
||||
.form-control-feedback {
|
||||
position: absolute;
|
||||
top: ($line-height-computed + 5); // Height of the `label` and its margin
|
||||
top: 0;
|
||||
right: 0;
|
||||
z-index: 2; // Ensure icon is above input groups
|
||||
display: block;
|
||||
|
|
@ -337,13 +405,18 @@ input[type="checkbox"] {
|
|||
height: $input-height-base;
|
||||
line-height: $input-height-base;
|
||||
text-align: center;
|
||||
pointer-events: none;
|
||||
}
|
||||
.input-lg + .form-control-feedback {
|
||||
.input-lg + .form-control-feedback,
|
||||
.input-group-lg + .form-control-feedback,
|
||||
.form-group-lg .form-control + .form-control-feedback {
|
||||
width: $input-height-large;
|
||||
height: $input-height-large;
|
||||
line-height: $input-height-large;
|
||||
}
|
||||
.input-sm + .form-control-feedback {
|
||||
.input-sm + .form-control-feedback,
|
||||
.input-group-sm + .form-control-feedback,
|
||||
.form-group-sm .form-control + .form-control-feedback {
|
||||
width: $input-height-small;
|
||||
height: $input-height-small;
|
||||
line-height: $input-height-small;
|
||||
|
|
@ -360,10 +433,15 @@ input[type="checkbox"] {
|
|||
@include form-control-validation($state-danger-text, $state-danger-text, $state-danger-bg);
|
||||
}
|
||||
|
||||
// Reposition feedback icon if input has visible label above
|
||||
.has-feedback label {
|
||||
|
||||
// Reposition feedback icon if label is hidden with "screenreader only" state
|
||||
.has-feedback label.sr-only ~ .form-control-feedback {
|
||||
top: 0;
|
||||
& ~ .form-control-feedback {
|
||||
top: ($line-height-computed + 5); // Height of the `label` and its margin
|
||||
}
|
||||
&.sr-only ~ .form-control-feedback {
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -380,7 +458,6 @@ input[type="checkbox"] {
|
|||
}
|
||||
|
||||
|
||||
|
||||
// Inline forms
|
||||
//
|
||||
// Make forms appear inline(-block) by adding the `.form-inline` class. Inline
|
||||
|
|
@ -392,7 +469,8 @@ input[type="checkbox"] {
|
|||
//
|
||||
// Heads up! This is mixin-ed into `.navbar-form` in navbars.less.
|
||||
|
||||
.form-inline {
|
||||
// [converter] extracted from `.form-inline` for libsass compatibility
|
||||
@mixin form-inline {
|
||||
|
||||
// Kick in the inline
|
||||
@media (min-width: $screen-sm-min) {
|
||||
|
|
@ -410,6 +488,11 @@ input[type="checkbox"] {
|
|||
vertical-align: middle;
|
||||
}
|
||||
|
||||
// Make static controls behave like regular ones
|
||||
.form-control-static {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.input-group {
|
||||
display: inline-table;
|
||||
vertical-align: middle;
|
||||
|
|
@ -432,8 +515,7 @@ input[type="checkbox"] {
|
|||
}
|
||||
|
||||
// Remove default margin on radios/checkboxes that were used for stacking, and
|
||||
// then undo the floating of radios and checkboxes to match (which also avoids
|
||||
// a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).
|
||||
// then undo the floating of radios and checkboxes to match.
|
||||
.radio,
|
||||
.checkbox {
|
||||
display: inline-block;
|
||||
|
|
@ -451,15 +533,17 @@ input[type="checkbox"] {
|
|||
margin-left: 0;
|
||||
}
|
||||
|
||||
// Validation states
|
||||
//
|
||||
// Reposition the icon because it's now within a grid column and columns have
|
||||
// `position: relative;` on them. Also accounts for the grid gutter padding.
|
||||
// Re-override the feedback icon.
|
||||
.has-feedback .form-control-feedback {
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
// [converter] extracted as `@mixin form-inline` for libsass compatibility
|
||||
.form-inline {
|
||||
@include form-inline;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Horizontal forms
|
||||
|
|
@ -489,7 +573,7 @@ input[type="checkbox"] {
|
|||
|
||||
// Make form groups behave like rows
|
||||
.form-group {
|
||||
@include make-row();
|
||||
@include make-row;
|
||||
}
|
||||
|
||||
// Reset spacing and right align labels, but scope to media queries so that
|
||||
|
|
@ -507,8 +591,7 @@ input[type="checkbox"] {
|
|||
// Reposition the icon because it's now within a grid column and columns have
|
||||
// `position: relative;` on them. Also accounts for the grid gutter padding.
|
||||
.has-feedback .form-control-feedback {
|
||||
top: 0;
|
||||
right: ($grid-gutter-width / 2);
|
||||
right: floor(($grid-gutter-width / 2));
|
||||
}
|
||||
|
||||
// Form group sizes
|
||||
|
|
@ -518,21 +601,17 @@ input[type="checkbox"] {
|
|||
.form-group-lg {
|
||||
@media (min-width: $screen-sm-min) {
|
||||
.control-label {
|
||||
padding-top: (($padding-large-vertical * $line-height-large) + 1);
|
||||
padding-top: ($padding-large-vertical + 1);
|
||||
font-size: $font-size-large;
|
||||
}
|
||||
}
|
||||
.form-control {
|
||||
@extend .input-lg;
|
||||
}
|
||||
}
|
||||
.form-group-sm {
|
||||
@media (min-width: $screen-sm-min) {
|
||||
.control-label {
|
||||
padding-top: ($padding-small-vertical + 1);
|
||||
font-size: $font-size-small;
|
||||
}
|
||||
}
|
||||
.form-control {
|
||||
@extend .input-sm;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,3 @@
|
|||
//= depend_on "bootstrap/glyphicons-halflings-regular.eot"
|
||||
//= depend_on "bootstrap/glyphicons-halflings-regular.svg"
|
||||
//= depend_on "bootstrap/glyphicons-halflings-regular.ttf"
|
||||
//= depend_on "bootstrap/glyphicons-halflings-regular.woff"
|
||||
//
|
||||
// Glyphicons for Bootstrap
|
||||
//
|
||||
|
|
@ -11,14 +7,17 @@
|
|||
//
|
||||
// <a href="#"><span class="glyphicon glyphicon-star"></span> Star</a>
|
||||
|
||||
// Import the fonts
|
||||
@font-face {
|
||||
font-family: 'Glyphicons Halflings';
|
||||
src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot'), '#{$icon-font-path}#{$icon-font-name}.eot'));
|
||||
src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot?#iefix'), '#{$icon-font-path}#{$icon-font-name}.eot?#iefix')) format('embedded-opentype'),
|
||||
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff'), '#{$icon-font-path}#{$icon-font-name}.woff')) format('woff'),
|
||||
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.ttf'), '#{$icon-font-path}#{$icon-font-name}.ttf')) format('truetype'),
|
||||
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}'), '#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}')) format('svg');
|
||||
@at-root {
|
||||
// Import the fonts
|
||||
@font-face {
|
||||
font-family: 'Glyphicons Halflings';
|
||||
src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot'), '#{$icon-font-path}#{$icon-font-name}.eot'));
|
||||
src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot?#iefix'), '#{$icon-font-path}#{$icon-font-name}.eot?#iefix')) format('embedded-opentype'),
|
||||
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff2'), '#{$icon-font-path}#{$icon-font-name}.woff2')) format('woff2'),
|
||||
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff'), '#{$icon-font-path}#{$icon-font-name}.woff')) format('woff'),
|
||||
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.ttf'), '#{$icon-font-path}#{$icon-font-name}.ttf')) format('truetype'),
|
||||
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}'), '#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}')) format('svg');
|
||||
}
|
||||
}
|
||||
|
||||
// Catchall baseclass
|
||||
|
|
@ -35,9 +34,10 @@
|
|||
}
|
||||
|
||||
// Individual icons
|
||||
.glyphicon-asterisk { &:before { content: "\2a"; } }
|
||||
.glyphicon-plus { &:before { content: "\2b"; } }
|
||||
.glyphicon-euro { &:before { content: "\20ac"; } }
|
||||
.glyphicon-asterisk { &:before { content: "\002a"; } }
|
||||
.glyphicon-plus { &:before { content: "\002b"; } }
|
||||
.glyphicon-euro,
|
||||
.glyphicon-eur { &:before { content: "\20ac"; } }
|
||||
.glyphicon-minus { &:before { content: "\2212"; } }
|
||||
.glyphicon-cloud { &:before { content: "\2601"; } }
|
||||
.glyphicon-envelope { &:before { content: "\2709"; } }
|
||||
|
|
@ -235,3 +235,73 @@
|
|||
.glyphicon-cloud-upload { &:before { content: "\e198"; } }
|
||||
.glyphicon-tree-conifer { &:before { content: "\e199"; } }
|
||||
.glyphicon-tree-deciduous { &:before { content: "\e200"; } }
|
||||
.glyphicon-cd { &:before { content: "\e201"; } }
|
||||
.glyphicon-save-file { &:before { content: "\e202"; } }
|
||||
.glyphicon-open-file { &:before { content: "\e203"; } }
|
||||
.glyphicon-level-up { &:before { content: "\e204"; } }
|
||||
.glyphicon-copy { &:before { content: "\e205"; } }
|
||||
.glyphicon-paste { &:before { content: "\e206"; } }
|
||||
// The following 2 Glyphicons are omitted for the time being because
|
||||
// they currently use Unicode codepoints that are outside the
|
||||
// Basic Multilingual Plane (BMP). Older buggy versions of WebKit can't handle
|
||||
// non-BMP codepoints in CSS string escapes, and thus can't display these two icons.
|
||||
// Notably, the bug affects some older versions of the Android Browser.
|
||||
// More info: https://github.com/twbs/bootstrap/issues/10106
|
||||
// .glyphicon-door { &:before { content: "\1f6aa"; } }
|
||||
// .glyphicon-key { &:before { content: "\1f511"; } }
|
||||
.glyphicon-alert { &:before { content: "\e209"; } }
|
||||
.glyphicon-equalizer { &:before { content: "\e210"; } }
|
||||
.glyphicon-king { &:before { content: "\e211"; } }
|
||||
.glyphicon-queen { &:before { content: "\e212"; } }
|
||||
.glyphicon-pawn { &:before { content: "\e213"; } }
|
||||
.glyphicon-bishop { &:before { content: "\e214"; } }
|
||||
.glyphicon-knight { &:before { content: "\e215"; } }
|
||||
.glyphicon-baby-formula { &:before { content: "\e216"; } }
|
||||
.glyphicon-tent { &:before { content: "\26fa"; } }
|
||||
.glyphicon-blackboard { &:before { content: "\e218"; } }
|
||||
.glyphicon-bed { &:before { content: "\e219"; } }
|
||||
.glyphicon-apple { &:before { content: "\f8ff"; } }
|
||||
.glyphicon-erase { &:before { content: "\e221"; } }
|
||||
.glyphicon-hourglass { &:before { content: "\231b"; } }
|
||||
.glyphicon-lamp { &:before { content: "\e223"; } }
|
||||
.glyphicon-duplicate { &:before { content: "\e224"; } }
|
||||
.glyphicon-piggy-bank { &:before { content: "\e225"; } }
|
||||
.glyphicon-scissors { &:before { content: "\e226"; } }
|
||||
.glyphicon-bitcoin { &:before { content: "\e227"; } }
|
||||
.glyphicon-btc { &:before { content: "\e227"; } }
|
||||
.glyphicon-xbt { &:before { content: "\e227"; } }
|
||||
.glyphicon-yen { &:before { content: "\00a5"; } }
|
||||
.glyphicon-jpy { &:before { content: "\00a5"; } }
|
||||
.glyphicon-ruble { &:before { content: "\20bd"; } }
|
||||
.glyphicon-rub { &:before { content: "\20bd"; } }
|
||||
.glyphicon-scale { &:before { content: "\e230"; } }
|
||||
.glyphicon-ice-lolly { &:before { content: "\e231"; } }
|
||||
.glyphicon-ice-lolly-tasted { &:before { content: "\e232"; } }
|
||||
.glyphicon-education { &:before { content: "\e233"; } }
|
||||
.glyphicon-option-horizontal { &:before { content: "\e234"; } }
|
||||
.glyphicon-option-vertical { &:before { content: "\e235"; } }
|
||||
.glyphicon-menu-hamburger { &:before { content: "\e236"; } }
|
||||
.glyphicon-modal-window { &:before { content: "\e237"; } }
|
||||
.glyphicon-oil { &:before { content: "\e238"; } }
|
||||
.glyphicon-grain { &:before { content: "\e239"; } }
|
||||
.glyphicon-sunglasses { &:before { content: "\e240"; } }
|
||||
.glyphicon-text-size { &:before { content: "\e241"; } }
|
||||
.glyphicon-text-color { &:before { content: "\e242"; } }
|
||||
.glyphicon-text-background { &:before { content: "\e243"; } }
|
||||
.glyphicon-object-align-top { &:before { content: "\e244"; } }
|
||||
.glyphicon-object-align-bottom { &:before { content: "\e245"; } }
|
||||
.glyphicon-object-align-horizontal{ &:before { content: "\e246"; } }
|
||||
.glyphicon-object-align-left { &:before { content: "\e247"; } }
|
||||
.glyphicon-object-align-vertical { &:before { content: "\e248"; } }
|
||||
.glyphicon-object-align-right { &:before { content: "\e249"; } }
|
||||
.glyphicon-triangle-right { &:before { content: "\e250"; } }
|
||||
.glyphicon-triangle-left { &:before { content: "\e251"; } }
|
||||
.glyphicon-triangle-bottom { &:before { content: "\e252"; } }
|
||||
.glyphicon-triangle-top { &:before { content: "\e253"; } }
|
||||
.glyphicon-console { &:before { content: "\e254"; } }
|
||||
.glyphicon-superscript { &:before { content: "\e255"; } }
|
||||
.glyphicon-subscript { &:before { content: "\e256"; } }
|
||||
.glyphicon-menu-left { &:before { content: "\e257"; } }
|
||||
.glyphicon-menu-right { &:before { content: "\e258"; } }
|
||||
.glyphicon-menu-down { &:before { content: "\e259"; } }
|
||||
.glyphicon-menu-up { &:before { content: "\e260"; } }
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
// Set the container width, and override it for fixed navbars in media queries.
|
||||
|
||||
.container {
|
||||
@include container-fixed();
|
||||
@include container-fixed;
|
||||
|
||||
@media (min-width: $screen-sm-min) {
|
||||
width: $container-sm;
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
// width for fluid, full width layouts.
|
||||
|
||||
.container-fluid {
|
||||
@include container-fixed();
|
||||
@include container-fixed;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
// Rows contain and clear the floats of your columns.
|
||||
|
||||
.row {
|
||||
@include make-row();
|
||||
@include make-row;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
//
|
||||
// Common styles for small and large grid columns
|
||||
|
||||
@include make-grid-columns();
|
||||
@include make-grid-columns;
|
||||
|
||||
|
||||
// Extra small grid
|
||||
|
|
|
|||
|
|
@ -29,6 +29,10 @@
|
|||
|
||||
width: 100%;
|
||||
margin-bottom: 0;
|
||||
|
||||
&:focus {
|
||||
z-index: 3;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -79,18 +83,18 @@
|
|||
text-align: center;
|
||||
background-color: $input-group-addon-bg;
|
||||
border: 1px solid $input-group-addon-border-color;
|
||||
border-radius: $border-radius-base;
|
||||
border-radius: $input-border-radius;
|
||||
|
||||
// Sizing
|
||||
&.input-sm {
|
||||
padding: $padding-small-vertical $padding-small-horizontal;
|
||||
font-size: $font-size-small;
|
||||
border-radius: $border-radius-small;
|
||||
border-radius: $input-border-radius-small;
|
||||
}
|
||||
&.input-lg {
|
||||
padding: $padding-large-vertical $padding-large-horizontal;
|
||||
font-size: $font-size-large;
|
||||
border-radius: $border-radius-large;
|
||||
border-radius: $input-border-radius-large;
|
||||
}
|
||||
|
||||
// Nuke default margins from checkboxes and radios to vertically center within.
|
||||
|
|
@ -160,6 +164,7 @@
|
|||
&:last-child {
|
||||
> .btn,
|
||||
> .btn-group {
|
||||
z-index: 2;
|
||||
margin-left: -1px;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
|
||||
|
||||
.jumbotron {
|
||||
padding: $jumbotron-padding;
|
||||
padding-top: $jumbotron-padding;
|
||||
padding-bottom: $jumbotron-padding;
|
||||
margin-bottom: $jumbotron-padding;
|
||||
color: $jumbotron-color;
|
||||
background-color: $jumbotron-bg;
|
||||
|
|
@ -13,6 +14,7 @@
|
|||
.h1 {
|
||||
color: $jumbotron-heading-color;
|
||||
}
|
||||
|
||||
p {
|
||||
margin-bottom: ($jumbotron-padding / 2);
|
||||
font-size: $jumbotron-font-size;
|
||||
|
|
@ -23,8 +25,11 @@
|
|||
border-top-color: darken($jumbotron-bg, 10%);
|
||||
}
|
||||
|
||||
.container & {
|
||||
.container &,
|
||||
.container-fluid & {
|
||||
border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container
|
||||
padding-left: ($grid-gutter-width / 2);
|
||||
padding-right: ($grid-gutter-width / 2);
|
||||
}
|
||||
|
||||
.container {
|
||||
|
|
@ -35,14 +40,15 @@
|
|||
padding-top: ($jumbotron-padding * 1.6);
|
||||
padding-bottom: ($jumbotron-padding * 1.6);
|
||||
|
||||
.container & {
|
||||
.container &,
|
||||
.container-fluid & {
|
||||
padding-left: ($jumbotron-padding * 2);
|
||||
padding-right: ($jumbotron-padding * 2);
|
||||
}
|
||||
|
||||
h1,
|
||||
.h1 {
|
||||
font-size: ($font-size-base * 4.5);
|
||||
font-size: $jumbotron-heading-font-size;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,23 +35,16 @@
|
|||
margin-bottom: 0;
|
||||
@include border-bottom-radius($list-group-border-radius);
|
||||
}
|
||||
|
||||
// Align badges within list items
|
||||
> .badge {
|
||||
float: right;
|
||||
}
|
||||
> .badge + .badge {
|
||||
margin-right: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Linked list items
|
||||
// Interactive list items
|
||||
//
|
||||
// Use anchor elements instead of `li`s or `div`s to create linked list items.
|
||||
// Use anchor or button elements instead of `li`s or `div`s to create interactive items.
|
||||
// Includes an extra `.active` modifier class for showing selected items.
|
||||
|
||||
a.list-group-item {
|
||||
a.list-group-item,
|
||||
button.list-group-item {
|
||||
color: $list-group-link-color;
|
||||
|
||||
.list-group-item-heading {
|
||||
|
|
@ -67,6 +60,11 @@ a.list-group-item {
|
|||
}
|
||||
}
|
||||
|
||||
button.list-group-item {
|
||||
width: 100%;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.list-group-item {
|
||||
// Disabled state
|
||||
&.disabled,
|
||||
|
|
@ -74,8 +72,8 @@ a.list-group-item {
|
|||
&.disabled:focus {
|
||||
background-color: $list-group-disabled-bg;
|
||||
color: $list-group-disabled-color;
|
||||
cursor: not-allowed;
|
||||
|
||||
cursor: $cursor-disabled;
|
||||
|
||||
// Force color to inherit for custom content
|
||||
.list-group-item-heading {
|
||||
color: inherit;
|
||||
|
|
|
|||
|
|
@ -1,54 +1,64 @@
|
|||
// Media objects
|
||||
// Source: http://stubbornella.org/content/?p=497
|
||||
// --------------------------------------------------
|
||||
.media {
|
||||
// Proper spacing between instances of .media
|
||||
margin-top: 15px;
|
||||
|
||||
&:first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
}
|
||||
|
||||
// Common styles
|
||||
// -------------------------
|
||||
|
||||
// Clear the floats
|
||||
.media,
|
||||
.media-body {
|
||||
overflow: hidden;
|
||||
zoom: 1;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
// Proper spacing between instances of .media
|
||||
.media,
|
||||
.media .media {
|
||||
margin-top: 15px;
|
||||
}
|
||||
.media:first-child {
|
||||
margin-top: 0;
|
||||
.media-body {
|
||||
width: 10000px;
|
||||
}
|
||||
|
||||
// For images and videos, set to block
|
||||
.media-object {
|
||||
display: block;
|
||||
|
||||
// Fix collapse in webkit from max-width: 100% and display: table-cell.
|
||||
&.img-thumbnail {
|
||||
max-width: none;
|
||||
}
|
||||
}
|
||||
|
||||
.media-right,
|
||||
.media > .pull-right {
|
||||
padding-left: 10px;
|
||||
}
|
||||
|
||||
.media-left,
|
||||
.media > .pull-left {
|
||||
padding-right: 10px;
|
||||
}
|
||||
|
||||
.media-left,
|
||||
.media-right,
|
||||
.media-body {
|
||||
display: table-cell;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
.media-middle {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.media-bottom {
|
||||
vertical-align: bottom;
|
||||
}
|
||||
|
||||
// Reset margins on headings for tighter default spacing
|
||||
.media-heading {
|
||||
margin: 0 0 5px;
|
||||
margin-top: 0;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
|
||||
// Media image alignment
|
||||
// -------------------------
|
||||
|
||||
.media {
|
||||
> .pull-left {
|
||||
margin-right: 10px;
|
||||
}
|
||||
> .pull-right {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Media list variation
|
||||
// -------------------------
|
||||
|
||||
//
|
||||
// Undo default ul/ol styles
|
||||
.media-list {
|
||||
padding-left: 0;
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
@import "mixins/responsive-visibility";
|
||||
@import "mixins/size";
|
||||
@import "mixins/tab-focus";
|
||||
@import "mixins/reset-text";
|
||||
@import "mixins/text-emphasis";
|
||||
@import "mixins/text-overflow";
|
||||
@import "mixins/vendor-prefixes";
|
||||
|
|
|
|||
|
|
@ -30,10 +30,10 @@
|
|||
|
||||
// When fading in the modal, animate it to slide down
|
||||
&.fade .modal-dialog {
|
||||
@include translate3d(0, -25%, 0);
|
||||
@include translate(0, -25%);
|
||||
@include transition-transform(0.3s ease-out);
|
||||
}
|
||||
&.in .modal-dialog { @include translate3d(0, 0, 0) }
|
||||
&.in .modal-dialog { @include translate(0, 0) }
|
||||
}
|
||||
.modal-open .modal {
|
||||
overflow-x: hidden;
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
.modal-header {
|
||||
padding: $modal-title-padding;
|
||||
border-bottom: 1px solid $modal-header-border-color;
|
||||
min-height: ($modal-title-padding + $modal-title-line-height);
|
||||
@include clearfix;
|
||||
}
|
||||
// Close icon
|
||||
.modal-header .close {
|
||||
|
|
@ -104,7 +104,7 @@
|
|||
padding: $modal-inner-padding;
|
||||
text-align: right; // right align buttons
|
||||
border-top: 1px solid $modal-footer-border-color;
|
||||
@include clearfix(); // clear it in case folks use .pull-* classes on buttons
|
||||
@include clearfix; // clear it in case folks use .pull-* classes on buttons
|
||||
|
||||
// Properly space out buttons
|
||||
.btn + .btn {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
border: 1px solid transparent;
|
||||
|
||||
// Prevent floats from breaking the navbar
|
||||
@include clearfix();
|
||||
@include clearfix;
|
||||
|
||||
@media (min-width: $grid-float-breakpoint) {
|
||||
border-radius: $navbar-border-radius;
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
// styling of responsive aspects.
|
||||
|
||||
.navbar-header {
|
||||
@include clearfix();
|
||||
@include clearfix;
|
||||
|
||||
@media (min-width: $grid-float-breakpoint) {
|
||||
float: left;
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
padding-left: $navbar-padding-horizontal;
|
||||
border-top: 1px solid transparent;
|
||||
box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
|
||||
@include clearfix();
|
||||
@include clearfix;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
|
||||
&.in {
|
||||
|
|
@ -92,7 +92,7 @@
|
|||
.navbar-collapse {
|
||||
max-height: $navbar-collapse-max-height;
|
||||
|
||||
@media (max-width: $screen-xs-min) and (orientation: landscape) {
|
||||
@media (max-device-width: $screen-xs-min) and (orientation: landscape) {
|
||||
max-height: 200px;
|
||||
}
|
||||
}
|
||||
|
|
@ -141,7 +141,6 @@
|
|||
right: 0;
|
||||
left: 0;
|
||||
z-index: $zindex-navbar-fixed;
|
||||
@include translate3d(0, 0, 0);
|
||||
|
||||
// Undo the rounded corners
|
||||
@media (min-width: $grid-float-breakpoint) {
|
||||
|
|
@ -173,6 +172,10 @@
|
|||
text-decoration: none;
|
||||
}
|
||||
|
||||
> img {
|
||||
display: block;
|
||||
}
|
||||
|
||||
@media (min-width: $grid-float-breakpoint) {
|
||||
.navbar > .container &,
|
||||
.navbar > .container-fluid & {
|
||||
|
|
@ -271,26 +274,6 @@
|
|||
padding-bottom: $navbar-padding-vertical;
|
||||
}
|
||||
}
|
||||
|
||||
&.navbar-right:last-child {
|
||||
margin-right: -$navbar-padding-horizontal;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Component alignment
|
||||
//
|
||||
// Repurpose the pull utilities as their own navbar utilities to avoid specificity
|
||||
// issues with parents and chaining. Only do this when the navbar is uncollapsed
|
||||
// though so that navbar contents properly stack and align in mobile.
|
||||
|
||||
@media (min-width: $grid-float-breakpoint) {
|
||||
.navbar-left {
|
||||
float: left !important;
|
||||
}
|
||||
.navbar-right {
|
||||
float: right !important;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -310,11 +293,15 @@
|
|||
@include box-shadow($shadow);
|
||||
|
||||
// Mixin behavior for optimum display
|
||||
@extend .form-inline;
|
||||
@include form-inline;
|
||||
|
||||
.form-group {
|
||||
@media (max-width: $grid-float-breakpoint-max) {
|
||||
margin-bottom: 5px;
|
||||
|
||||
&:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -330,11 +317,6 @@
|
|||
padding-top: 0;
|
||||
padding-bottom: 0;
|
||||
@include box-shadow(none);
|
||||
|
||||
// Outdent the form if last child to line up with content down the page
|
||||
&.navbar-right:last-child {
|
||||
margin-right: -$navbar-padding-horizontal;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -348,6 +330,8 @@
|
|||
}
|
||||
// Menu position and menu caret support for dropups via extra dropup class
|
||||
.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
|
||||
margin-bottom: 0;
|
||||
@include border-top-radius($navbar-border-radius);
|
||||
@include border-bottom-radius(0);
|
||||
}
|
||||
|
||||
|
|
@ -379,14 +363,33 @@
|
|||
float: left;
|
||||
margin-left: $navbar-padding-horizontal;
|
||||
margin-right: $navbar-padding-horizontal;
|
||||
}
|
||||
}
|
||||
|
||||
// Outdent the form if last child to line up with content down the page
|
||||
&.navbar-right:last-child {
|
||||
|
||||
// Component alignment
|
||||
//
|
||||
// Repurpose the pull utilities as their own navbar utilities to avoid specificity
|
||||
// issues with parents and chaining. Only do this when the navbar is uncollapsed
|
||||
// though so that navbar contents properly stack and align in mobile.
|
||||
//
|
||||
// Declared after the navbar components to ensure more specificity on the margins.
|
||||
|
||||
@media (min-width: $grid-float-breakpoint) {
|
||||
.navbar-left {
|
||||
float: left !important;
|
||||
}
|
||||
.navbar-right {
|
||||
float: right !important;
|
||||
margin-right: -$navbar-padding-horizontal;
|
||||
|
||||
~ .navbar-right {
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Alternate navbars
|
||||
// --------------------------------------------------
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue