diff options
Diffstat (limited to 'xstatic/pkg/bootstrap_scss/data/scss')
54 files changed, 582 insertions, 597 deletions
diff --git a/xstatic/pkg/bootstrap_scss/data/scss/_bootstrap.scss b/xstatic/pkg/bootstrap_scss/data/scss/_bootstrap.scss index e72d1de..89e3855 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/_bootstrap.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/_bootstrap.scss @@ -1,6 +1,6 @@ /*! - * Bootstrap v3.3.7 (http://getbootstrap.com) - * Copyright 2011-2016 Twitter, Inc. + * Bootstrap v3.4.1 (https://getbootstrap.com/) + * Copyright 2011-2019 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_alerts.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_alerts.scss index 7d1e1fd..f9e69bd 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_alerts.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_alerts.scss @@ -15,8 +15,7 @@ // Headings for larger alerts h4 { margin-top: 0; - // Specified for the h4 to prevent conflicts of changing $headings-color - color: inherit; + color: inherit; // Specified for the h4 to prevent conflicts of changing $headings-color } // Provide class for links that match alerts @@ -39,7 +38,8 @@ // // Expand the right padding and account for the close button's positioning. -.alert-dismissable, // The misspelled .alert-dismissable was deprecated in 3.2.0. +// The misspelled .alert-dismissable was deprecated in 3.2.0. +.alert-dismissable, .alert-dismissible { padding-right: ($alert-padding + 20); diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_badges.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_badges.scss index 70002e0..44d5dd6 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_badges.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_badges.scss @@ -10,11 +10,11 @@ padding: 3px 7px; font-size: $font-size-small; font-weight: $badge-font-weight; - color: $badge-color; line-height: $badge-line-height; - vertical-align: middle; - white-space: nowrap; + color: $badge-color; text-align: center; + white-space: nowrap; + vertical-align: middle; background-color: $badge-bg; border-radius: $badge-border-radius; diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_breadcrumbs.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_breadcrumbs.scss index b61f0c7..67e39d9 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_breadcrumbs.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_breadcrumbs.scss @@ -14,11 +14,11 @@ display: inline-block; + li:before { + padding: 0 5px; + color: $breadcrumb-color; // [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; } } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_button-groups.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_button-groups.scss index 4b385f5..6a62faf 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_button-groups.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_button-groups.scss @@ -103,18 +103,18 @@ // Give the line between buttons some depth .btn-group > .btn + .dropdown-toggle { - padding-left: 8px; padding-right: 8px; + padding-left: 8px; } .btn-group > .btn-lg + .dropdown-toggle { - padding-left: 12px; padding-right: 12px; + padding-left: 12px; } // The clickable button for toggling the menu // Remove the gradient and set the same inset shadow as the :active state .btn-group.open .dropdown-toggle { - @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); + @include box-shadow(inset 0 3px 5px rgba(0, 0, 0, .125)); // Show no shadow for `.btn-link` since it has no other button styles. &.btn-link { @@ -205,8 +205,8 @@ border-collapse: separate; > .btn, > .btn-group { - float: none; display: table-cell; + float: none; width: 1%; } > .btn-group .btn { @@ -237,7 +237,7 @@ input[type="radio"], input[type="checkbox"] { position: absolute; - clip: rect(0,0,0,0); + clip: rect(0, 0, 0, 0); pointer-events: none; } } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_buttons.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_buttons.scss index 6452b70..62962d7 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_buttons.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_buttons.scss @@ -11,12 +11,12 @@ margin-bottom: 0; // For input.btn font-weight: $btn-font-weight; text-align: center; + white-space: nowrap; 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, $btn-border-radius-base); @include user-select(none); @@ -38,9 +38,9 @@ &:active, &.active { - outline: 0; background-image: none; - @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); + outline: 0; + @include box-shadow(inset 0 3px 5px rgba(0, 0, 0, .125)); } &.disabled, @@ -94,8 +94,8 @@ a.btn { // Make a button look and behave like a link .btn-link { + font-weight: 400; color: $link-color; - font-weight: normal; border-radius: 0; &, diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_carousel.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_carousel.scss index 753d881..52a1f7b 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_carousel.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_carousel.scss @@ -10,12 +10,12 @@ .carousel-inner { position: relative; - overflow: hidden; width: 100%; + overflow: hidden; > .item { - display: none; position: relative; + display: none; @include transition(.6s ease-in-out left); // Account for jankitude on images @@ -93,34 +93,34 @@ .carousel-control { position: absolute; top: 0; - left: 0; bottom: 0; + left: 0; width: $carousel-control-width; - @include opacity($carousel-control-opacity); font-size: $carousel-control-font-size; color: $carousel-control-color; text-align: center; text-shadow: $carousel-text-shadow; background-color: rgba(0, 0, 0, 0); // Fix IE9 click-thru bug + @include opacity($carousel-control-opacity); // We can't have this transition here because WebKit cancels the carousel // animation if you trip this while in the middle of another animation. // Set gradients for backgrounds &.left { - @include gradient-horizontal($start-color: rgba(0,0,0,.5), $end-color: rgba(0,0,0,.0001)); + @include gradient-horizontal($start-color: rgba(0, 0, 0, .5), $end-color: rgba(0, 0, 0, .0001)); } &.right { - left: auto; right: 0; - @include gradient-horizontal($start-color: rgba(0,0,0,.0001), $end-color: rgba(0,0,0,.5)); + left: auto; + @include gradient-horizontal($start-color: rgba(0, 0, 0, .0001), $end-color: rgba(0, 0, 0, .5)); } // Hover/focus state &:hover, &:focus { - outline: 0; color: $carousel-control-color; text-decoration: none; + outline: 0; @include opacity(.9); } @@ -131,9 +131,9 @@ .glyphicon-chevron-right { position: absolute; top: 50%; - margin-top: -10px; z-index: 5; display: inline-block; + margin-top: -10px; } .icon-prev, .glyphicon-chevron-left { @@ -147,21 +147,20 @@ } .icon-prev, .icon-next { - width: 20px; + width: 20px; height: 20px; - line-height: 1; font-family: serif; + line-height: 1; } - .icon-prev { &:before { - content: '\2039';// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039) + content: "\2039";// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039) } } .icon-next { &:before { - content: '\203a';// SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (U+203A) + content: "\203a";// SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (U+203A) } } } @@ -177,21 +176,18 @@ left: 50%; z-index: 15; width: 60%; - margin-left: -30%; padding-left: 0; - list-style: none; + margin-left: -30%; text-align: center; + list-style: none; li { display: inline-block; - width: 10px; + width: 10px; height: 10px; margin: 1px; text-indent: -999px; - border: 1px solid $carousel-indicator-border-color; - border-radius: 10px; cursor: pointer; - // IE8-9 hack for event handling // // Internet Explorer 8-9 does not support clicks on elements without a set @@ -202,12 +198,16 @@ // For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we // set alpha transparency for the best results possible. background-color: #000 \9; // IE8 - background-color: rgba(0,0,0,0); // IE9 + background-color: rgba(0, 0, 0, 0); // IE9 + + border: 1px solid $carousel-indicator-border-color; + border-radius: 10px; } + .active { - margin: 0; - width: 12px; + width: 12px; height: 12px; + margin: 0; background-color: $carousel-indicator-active-bg; } } @@ -217,15 +217,16 @@ // Hidden by default for smaller viewports .carousel-caption { position: absolute; - left: 15%; right: 15%; bottom: 20px; + left: 15%; z-index: 10; padding-top: 20px; padding-bottom: 20px; color: $carousel-caption-color; text-align: center; text-shadow: $carousel-text-shadow; + & .btn { text-shadow: none; // No shadow for button elements in carousel-caption } @@ -258,8 +259,8 @@ // Show and left align the captions .carousel-caption { - left: 20%; right: 20%; + left: 20%; padding-bottom: 30px; } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_close.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_close.scss index 3b74d8a..a858a8f 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_close.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_close.scss @@ -33,4 +33,5 @@ button.close { background: transparent; border: 0; -webkit-appearance: none; + appearance: none; } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_code.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_code.scss index caa5f06..8e2b2a7 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_code.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_code.scss @@ -27,12 +27,12 @@ kbd { color: $kbd-color; background-color: $kbd-bg; border-radius: $border-radius-small; - box-shadow: inset 0 -1px 0 rgba(0,0,0,.25); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25); kbd { padding: 0; font-size: 100%; - font-weight: bold; + font-weight: 700; box-shadow: none; } } @@ -44,9 +44,9 @@ pre { margin: 0 0 ($line-height-computed / 2); font-size: ($font-size-base - 1); // 14px to 13px line-height: $line-height-base; + color: $pre-color; word-break: break-all; word-wrap: break-word; - color: $pre-color; background-color: $pre-bg; border: 1px solid $pre-border-color; border-radius: $border-radius-base; diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_component-animations.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_component-animations.scss index ca3b43c..ca4d6b0 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_component-animations.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_component-animations.scss @@ -10,6 +10,7 @@ .fade { opacity: 0; @include transition(opacity .15s linear); + &.in { opacity: 1; } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_dropdowns.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_dropdowns.scss index aac8459..0a5898a 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_dropdowns.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_dropdowns.scss @@ -10,10 +10,10 @@ height: 0; margin-left: 2px; vertical-align: middle; - border-top: $caret-width-base dashed; - border-top: $caret-width-base solid \9; // IE8 + 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; + border-left: $caret-width-base solid transparent; } // The dropdown wrapper (div) @@ -38,15 +38,15 @@ min-width: 160px; padding: 5px 0; margin: 2px 0 0; // override default ul - list-style: none; font-size: $font-size-base; text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer) + list-style: none; background-color: $dropdown-bg; + background-clip: padding-box; border: 1px solid $dropdown-fallback-border; // IE8 fallback border: 1px solid $dropdown-border; border-radius: $border-radius-base; - @include box-shadow(0 6px 12px rgba(0,0,0,.175)); - background-clip: padding-box; + @include box-shadow(0 6px 12px rgba(0, 0, 0, .175)); // Aligns the dropdown menu to right // @@ -66,20 +66,17 @@ display: block; padding: 3px 20px; clear: both; - font-weight: normal; + font-weight: 400; line-height: $line-height-base; color: $dropdown-link-color; white-space: nowrap; // prevent links from randomly breaking onto new lines - } -} -// Hover/Focus state -.dropdown-menu > li > a { - &:hover, - &:focus { - text-decoration: none; - color: $dropdown-link-hover-color; - background-color: $dropdown-link-hover-bg; + &:hover, + &:focus { + color: $dropdown-link-hover-color; + text-decoration: none; + background-color: $dropdown-link-hover-bg; + } } } @@ -90,8 +87,8 @@ &:focus { color: $dropdown-link-active-color; text-decoration: none; - outline: 0; background-color: $dropdown-link-active-bg; + outline: 0; } } @@ -110,10 +107,10 @@ &:hover, &:focus { text-decoration: none; + cursor: $cursor-disabled; background-color: transparent; background-image: none; // Remove CSS gradient @include reset-filter; - cursor: $cursor-disabled; } } @@ -135,8 +132,8 @@ // Add extra class to `.dropdown-menu` to flip the alignment of the dropdown // menu with the parent. .dropdown-menu-right { - left: auto; // Reset the default from `.dropdown-menu` right: 0; + left: auto; // Reset the default from `.dropdown-menu` } // With v3, we enabled auto-flipping if you have a dropdown within a right // aligned nav component. To enable the undoing of that, we provide an override @@ -145,8 +142,8 @@ // This is only for left-aligning a dropdown menu within a `.navbar-right` or // `.pull-right` nav component. .dropdown-menu-left { - left: 0; right: auto; + left: 0; } // Dropdown section headers @@ -162,10 +159,10 @@ // Backdrop to catch body clicks on mobile, etc. .dropdown-backdrop { position: fixed; - left: 0; + top: 0; right: 0; bottom: 0; - top: 0; + left: 0; z-index: ($zindex-dropdown - 10); } @@ -184,10 +181,10 @@ .navbar-fixed-bottom .dropdown { // Reverse the caret .caret { + content: ""; border-top: 0; border-bottom: $caret-width-base dashed; border-bottom: $caret-width-base solid \9; // IE8 - content: ""; } // Different positioning for bottom up menu .dropdown-menu { diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_forms.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_forms.scss index ac26a6a..d2e2bac 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_forms.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_forms.scss @@ -8,13 +8,13 @@ // Restyle and baseline non-control form elements. fieldset { - padding: 0; - margin: 0; - border: 0; // Chrome and Firefox set a `min-width: min-content;` on fieldsets, // so we reset that to ensure it behaves more like a standard block element. // See https://github.com/twbs/bootstrap/issues/12359. min-width: 0; + padding: 0; + margin: 0; + border: 0; } legend { @@ -33,7 +33,7 @@ label { display: inline-block; max-width: 100%; // Force IE8 to wrap long content (see https://github.com/twbs/bootstrap/issues/13141) margin-bottom: 5px; - font-weight: bold; + font-weight: 700; } @@ -43,9 +43,18 @@ label { // is required to ensure optimum display with or without those classes to better // address browser inconsistencies. -// Override content-box in Normalize (* isn't specific enough) input[type="search"] { + // Override content-box in Normalize (* isn't specific enough) @include box-sizing(border-box); + + // Search inputs in iOS + // + // This overrides the extra rounded corners on search inputs in iOS so that our + // `.form-control` class can properly style them. Note that this cannot simply + // be added to `.form-control` as it's not specific enough. For details, see + // https://github.com/twbs/bootstrap/issues/11586. + -webkit-appearance: none; + appearance: none; } // Position radios and checkboxes better @@ -54,6 +63,16 @@ input[type="checkbox"] { margin: 4px 0 0; margin-top: 1px \9; // IE8-9 line-height: normal; + + // Apply same disabled cursor tweak as for inputs + // Some special care is needed because <label>s don't inherit their parent's `cursor`. + // + // Note: Neither radios nor checkboxes can be readonly. + &[disabled], + &.disabled, + fieldset[disabled] & { + cursor: $cursor-disabled; + } } input[type="file"] { @@ -123,7 +142,7 @@ output { 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; // 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 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. @@ -134,8 +153,8 @@ output { // Unstyle the caret on `<select>`s in IE10+. &::-ms-expand { - border: 0; background-color: transparent; + border: 0; } // Disabled and read-only inputs @@ -164,18 +183,6 @@ textarea.form-control { } -// Search inputs in iOS -// -// This overrides the extra rounded corners on search inputs in iOS so that our -// `.form-control` class can properly style them. Note that this cannot simply -// be added to `.form-control` as it's not specific enough. For details, see -// https://github.com/twbs/bootstrap/issues/11586. - -input[type="search"] { - -webkit-appearance: none; -} - - // Special styles for iOS temporal inputs // // In Mobile Safari, setting `display: block` on temporal inputs causes the @@ -228,11 +235,19 @@ input[type="search"] { margin-top: 10px; margin-bottom: 10px; + // These are used on elements with <label> descendants + &.disabled, + fieldset[disabled] & { + label { + cursor: $cursor-disabled; + } + } + 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; + font-weight: 400; cursor: pointer; } } @@ -241,8 +256,8 @@ input[type="search"] { .checkbox input[type="checkbox"], .checkbox-inline input[type="checkbox"] { position: absolute; - margin-left: -20px; margin-top: 4px \9; + margin-left: -20px; } .radio + .radio, @@ -257,45 +272,20 @@ input[type="search"] { display: inline-block; padding-left: 20px; margin-bottom: 0; + font-weight: 400; vertical-align: middle; - font-weight: normal; cursor: pointer; -} -.radio-inline + .radio-inline, -.checkbox-inline + .checkbox-inline { - margin-top: 0; - margin-left: 10px; // space out consecutive inline controls -} -// Apply same disabled cursor tweak as for inputs -// Some special care is needed because <label>s don't inherit their parent's `cursor`. -// -// Note: Neither radios nor checkboxes can be readonly. -input[type="radio"], -input[type="checkbox"] { - &[disabled], - &.disabled, - fieldset[disabled] & { - cursor: $cursor-disabled; - } -} -// These classes are used directly on <label>s -.radio-inline, -.checkbox-inline { + // These are used directly on <label>s &.disabled, fieldset[disabled] & { cursor: $cursor-disabled; } } -// These classes are used on elements with <label> descendants -.radio, -.checkbox { - &.disabled, - fieldset[disabled] & { - label { - cursor: $cursor-disabled; - } - } +.radio-inline + .radio-inline, +.checkbox-inline + .checkbox-inline { + margin-top: 0; + margin-left: 10px; // space out consecutive inline controls } @@ -305,17 +295,17 @@ input[type="checkbox"] { // a horizontal form layout. .form-control-static { + min-height: ($line-height-computed + $font-size-base); // Size it appropriately next to real form controls padding-top: ($padding-base-vertical + 1); 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 { - padding-left: 0; padding-right: 0; + padding-left: 0; } } @@ -560,9 +550,9 @@ input[type="checkbox"] { .checkbox, .radio-inline, .checkbox-inline { + padding-top: ($padding-base-vertical + 1); // Default padding plus a border margin-top: 0; margin-bottom: 0; - padding-top: ($padding-base-vertical + 1); // Default padding plus a border } // Account for padding we're adding to ensure the alignment and of help text // and other content below items @@ -580,9 +570,9 @@ input[type="checkbox"] { // labels on narrow viewports stack the same as a default form example. @media (min-width: $screen-sm-min) { .control-label { - text-align: right; - margin-bottom: 0; padding-top: ($padding-base-vertical + 1); // Default padding plus a border + margin-bottom: 0; + text-align: right; } } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_glyphicons.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_glyphicons.scss index 07a0fc9..bd5966d 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_glyphicons.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_glyphicons.scss @@ -10,13 +10,13 @@ @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'); + 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"); } } @@ -25,9 +25,9 @@ position: relative; top: 1px; display: inline-block; - font-family: 'Glyphicons Halflings'; + font-family: "Glyphicons Halflings"; font-style: normal; - font-weight: normal; + font-weight: 400; line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_grid.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_grid.scss index b15ca27..2ddb73d 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_grid.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_grid.scss @@ -40,6 +40,16 @@ @include make-row; } +.row-no-gutters { + margin-right: 0; + margin-left: 0; + + [class*="col-"] { + padding-right: 0; + padding-left: 0; + } +} + // Columns // diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_input-groups.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_input-groups.scss index 81f46f3..04015fe 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_input-groups.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_input-groups.scss @@ -12,8 +12,8 @@ // Undo padding and float of grid classes &[class*="col-"] { float: none; - padding-left: 0; padding-right: 0; + padding-left: 0; } .form-control { @@ -77,7 +77,7 @@ .input-group-addon { padding: $padding-base-vertical $padding-base-horizontal; font-size: $font-size-base; - font-weight: normal; + font-weight: 400; line-height: 1; color: $input-color; text-align: center; diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_jumbotron.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_jumbotron.scss index a27da47..7215b99 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_jumbotron.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_jumbotron.scss @@ -4,7 +4,7 @@ .jumbotron { - padding-top: $jumbotron-padding; + padding-top: $jumbotron-padding; padding-bottom: $jumbotron-padding; margin-bottom: $jumbotron-padding; color: $jumbotron-color; @@ -27,9 +27,9 @@ .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); + padding-left: ($grid-gutter-width / 2); + border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container } .container { @@ -37,13 +37,13 @@ } @media screen and (min-width: $screen-sm-min) { - padding-top: ($jumbotron-padding * 1.6); + padding-top: ($jumbotron-padding * 1.6); padding-bottom: ($jumbotron-padding * 1.6); .container &, .container-fluid & { - padding-left: ($jumbotron-padding * 2); padding-right: ($jumbotron-padding * 2); + padding-left: ($jumbotron-padding * 2); } h1, diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_labels.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_labels.scss index 42ed6ea..f7f3013 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_labels.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_labels.scss @@ -6,7 +6,7 @@ display: inline; padding: .2em .6em .3em; font-size: 75%; - font-weight: bold; + font-weight: 700; line-height: 1; color: $label-color; text-align: center; diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_list-group.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_list-group.scss index 7cb83aa..529f179 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_list-group.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_list-group.scss @@ -9,8 +9,8 @@ .list-group { // No need to set list-style: none; since .list-group-item is block level - margin-bottom: 20px; padding-left: 0; // reset padding because ul and ol + margin-bottom: 20px; } @@ -35,44 +35,14 @@ margin-bottom: 0; @include border-bottom-radius($list-group-border-radius); } -} - - -// Interactive 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, -button.list-group-item { - color: $list-group-link-color; - - .list-group-item-heading { - color: $list-group-link-heading-color; - } - - // Hover state - &:hover, - &:focus { - text-decoration: none; - color: $list-group-link-hover-color; - background-color: $list-group-hover-bg; - } -} - -button.list-group-item { - width: 100%; - text-align: left; -} -.list-group-item { // Disabled state &.disabled, &.disabled:hover, &.disabled:focus { - background-color: $list-group-disabled-bg; color: $list-group-disabled-color; cursor: $cursor-disabled; + background-color: $list-group-disabled-bg; // Force color to inherit for custom content .list-group-item-heading { @@ -105,6 +75,34 @@ button.list-group-item { } +// Interactive 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, +button.list-group-item { + color: $list-group-link-color; + + .list-group-item-heading { + color: $list-group-link-heading-color; + } + + // Hover state + &:hover, + &:focus { + color: $list-group-link-hover-color; + text-decoration: none; + background-color: $list-group-hover-bg; + } +} + +button.list-group-item { + width: 100%; + text-align: left; +} + + // Contextual variants // // Add modifier classes to change text and background color on individual items. diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_media.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_media.scss index 8c835e8..e4ae445 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_media.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_media.scss @@ -9,8 +9,8 @@ .media, .media-body { - zoom: 1; overflow: hidden; + zoom: 1; } .media-body { diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_modals.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_modals.scss index 823870f..cf59bef 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_modals.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_modals.scss @@ -14,14 +14,14 @@ // Container that the modal scrolls within .modal { - display: none; - overflow: hidden; position: fixed; top: 0; right: 0; bottom: 0; left: 0; z-index: $zindex-modal; + display: none; + overflow: hidden; -webkit-overflow-scrolling: touch; // Prevent Chrome on Windows from adding a focus outline. For details, see @@ -33,7 +33,7 @@ @include translate(0, -25%); @include transition-transform(0.3s ease-out); } - &.in .modal-dialog { @include translate(0, 0) } + &.in .modal-dialog { @include translate(0, 0); } } .modal-open .modal { overflow-x: hidden; @@ -51,11 +51,11 @@ .modal-content { position: relative; background-color: $modal-content-bg; + background-clip: padding-box; 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; - @include box-shadow(0 3px 9px rgba(0,0,0,.5)); - background-clip: padding-box; + @include box-shadow(0 3px 9px rgba(0, 0, 0, .5)); // Remove focus outline from opened modal outline: 0; } @@ -108,8 +108,8 @@ // Properly space out buttons .btn + .btn { - margin-left: 5px; margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs + margin-left: 5px; } // but override that for button groups .btn-group .btn + .btn { @@ -138,7 +138,7 @@ margin: 30px auto; } .modal-content { - @include box-shadow(0 5px 15px rgba(0,0,0,.5)); + @include box-shadow(0 5px 15px rgba(0, 0, 0, .5)); } // Modal sizes diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_navbar.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_navbar.scss index 11e5c01..5d9093a 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_navbar.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_navbar.scss @@ -48,11 +48,11 @@ // content for the user's viewport. .navbar-collapse { - overflow-x: visible; padding-right: $navbar-padding-horizontal; - padding-left: $navbar-padding-horizontal; + padding-left: $navbar-padding-horizontal; + overflow-x: visible; border-top: 1px solid transparent; - box-shadow: inset 0 1px 0 rgba(255,255,255,.1); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1); @include clearfix; -webkit-overflow-scrolling: touch; @@ -81,8 +81,8 @@ .navbar-fixed-top &, .navbar-static-top &, .navbar-fixed-bottom & { - padding-left: 0; padding-right: 0; + padding-left: 0; } } } @@ -96,6 +96,27 @@ max-height: 200px; } } + + // Fix the top/bottom navbars when screen real estate supports it + position: fixed; + right: 0; + left: 0; + z-index: $zindex-navbar-fixed; + + // Undo the rounded corners + @media (min-width: $grid-float-breakpoint) { + border-radius: 0; + } +} + +.navbar-fixed-top { + top: 0; + border-width: 0 0 1px; +} +.navbar-fixed-bottom { + bottom: 0; + margin-bottom: 0; // override .navbar defaults + border-width: 1px 0 0; } @@ -108,11 +129,11 @@ > .navbar-header, > .navbar-collapse { margin-right: -$navbar-padding-horizontal; - margin-left: -$navbar-padding-horizontal; + margin-left: -$navbar-padding-horizontal; @media (min-width: $grid-float-breakpoint) { margin-right: 0; - margin-left: 0; + margin-left: 0; } } } @@ -134,38 +155,15 @@ } } -// Fix the top/bottom navbars when screen real estate supports it -.navbar-fixed-top, -.navbar-fixed-bottom { - position: fixed; - right: 0; - left: 0; - z-index: $zindex-navbar-fixed; - - // Undo the rounded corners - @media (min-width: $grid-float-breakpoint) { - border-radius: 0; - } -} -.navbar-fixed-top { - top: 0; - border-width: 0 0 1px; -} -.navbar-fixed-bottom { - bottom: 0; - margin-bottom: 0; // override .navbar defaults - border-width: 1px 0 0; -} - // Brand/project name .navbar-brand { float: left; + height: $navbar-height; padding: $navbar-padding-vertical $navbar-padding-horizontal; font-size: $font-size-large; line-height: $line-height-computed; - height: $navbar-height; &:hover, &:focus { @@ -193,8 +191,8 @@ .navbar-toggle { position: relative; float: right; - margin-right: $navbar-padding-horizontal; padding: 9px 10px; + margin-right: $navbar-padding-horizontal; @include navbar-vertical-align(34px); background-color: transparent; background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 @@ -233,7 +231,7 @@ margin: ($navbar-padding-vertical / 2) (-$navbar-padding-horizontal); > li > a { - padding-top: 10px; + padding-top: 10px; padding-bottom: 10px; line-height: $line-height-computed; } @@ -270,7 +268,7 @@ > li { float: left; > a { - padding-top: $navbar-padding-vertical; + padding-top: $navbar-padding-vertical; padding-bottom: $navbar-padding-vertical; } } @@ -284,12 +282,12 @@ // our navbars. .navbar-form { - margin-left: -$navbar-padding-horizontal; - margin-right: -$navbar-padding-horizontal; padding: 10px $navbar-padding-horizontal; + margin-right: -$navbar-padding-horizontal; + margin-left: -$navbar-padding-horizontal; border-top: 1px solid transparent; border-bottom: 1px solid transparent; - $shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); + $shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1); @include box-shadow($shadow); // Mixin behavior for optimum display @@ -311,11 +309,11 @@ // Undo 100% width for pull classes @media (min-width: $grid-float-breakpoint) { width: auto; - border: 0; - margin-left: 0; - margin-right: 0; padding-top: 0; padding-bottom: 0; + margin-right: 0; + margin-left: 0; + border: 0; @include box-shadow(none); } } @@ -361,8 +359,8 @@ @media (min-width: $grid-float-breakpoint) { float: left; - margin-left: $navbar-padding-horizontal; margin-right: $navbar-padding-horizontal; + margin-left: $navbar-padding-horizontal; } } @@ -437,33 +435,15 @@ background-color: $navbar-default-link-disabled-bg; } } - } - - .navbar-toggle { - border-color: $navbar-default-toggle-border-color; - &:hover, - &:focus { - background-color: $navbar-default-toggle-hover-bg; - } - .icon-bar { - background-color: $navbar-default-toggle-icon-bar-bg; - } - } - .navbar-collapse, - .navbar-form { - border-color: $navbar-default-border; - } - - // Dropdown menu items - .navbar-nav { + // Dropdown menu items // Remove background color from open dropdown > .open > a { &, &:hover, &:focus { - background-color: $navbar-default-link-active-bg; color: $navbar-default-link-active-color; + background-color: $navbar-default-link-active-bg; } } @@ -498,6 +478,22 @@ } } + .navbar-toggle { + border-color: $navbar-default-toggle-border-color; + &:hover, + &:focus { + background-color: $navbar-default-toggle-hover-bg; + } + .icon-bar { + background-color: $navbar-default-toggle-icon-bar-bg; + } + } + + .navbar-collapse, + .navbar-form { + border-color: $navbar-default-border; + } + // Links in navbars // @@ -571,33 +567,14 @@ background-color: $navbar-inverse-link-disabled-bg; } } - } - - // Darken the responsive nav toggle - .navbar-toggle { - border-color: $navbar-inverse-toggle-border-color; - &:hover, - &:focus { - background-color: $navbar-inverse-toggle-hover-bg; - } - .icon-bar { - background-color: $navbar-inverse-toggle-icon-bar-bg; - } - } - .navbar-collapse, - .navbar-form { - border-color: darken($navbar-inverse-bg, 7%); - } - - // Dropdowns - .navbar-nav { + // Dropdowns > .open > a { &, &:hover, &:focus { - background-color: $navbar-inverse-link-active-bg; color: $navbar-inverse-link-active-color; + background-color: $navbar-inverse-link-active-bg; } } @@ -638,6 +615,23 @@ } } + // Darken the responsive nav toggle + .navbar-toggle { + border-color: $navbar-inverse-toggle-border-color; + &:hover, + &:focus { + background-color: $navbar-inverse-toggle-hover-bg; + } + .icon-bar { + background-color: $navbar-inverse-toggle-icon-bar-bg; + } + } + + .navbar-collapse, + .navbar-form { + border-color: darken($navbar-inverse-bg, 7%); + } + .navbar-link { color: $navbar-inverse-link-color; &:hover { diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_navs.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_navs.scss index 9d369f3..f4f0a55 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_navs.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_navs.scss @@ -7,8 +7,8 @@ // -------------------------------------------------- .nav { - margin-bottom: 0; padding-left: 0; // Override default ul/ol + margin-bottom: 0; list-style: none; @include clearfix; @@ -35,8 +35,8 @@ &:focus { color: $nav-disabled-link-hover-color; text-decoration: none; - background-color: transparent; cursor: $cursor-disabled; + background-color: transparent; } } } @@ -97,10 +97,10 @@ &:hover, &:focus { color: $nav-tabs-active-link-hover-color; + cursor: default; background-color: $nav-tabs-active-link-hover-bg; border: 1px solid $nav-tabs-active-link-hover-border-color; border-bottom-color: transparent; - cursor: default; } } } @@ -163,8 +163,8 @@ > li { float: none; > a { - text-align: center; margin-bottom: 5px; + text-align: center; } } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_normalize.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_normalize.scss index 9dddf73..7850b9a 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_normalize.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_normalize.scss @@ -104,11 +104,14 @@ a:hover { // ========================================================================== // -// Address styling not present in IE 8/9/10/11, Safari, and Chrome. +// 1. Remove the bottom border in Chrome 57- and Firefox 39-. +// 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. // abbr[title] { - border-bottom: 1px dotted; + border-bottom: none; // 1 + text-decoration: underline; // 2 + text-decoration: underline dotted; // 2 } // diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_pager.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_pager.scss index c234217..0762238 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_pager.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_pager.scss @@ -6,8 +6,8 @@ .pager { padding-left: 0; margin: $line-height-computed 0; - list-style: none; text-align: center; + list-style: none; @include clearfix; li { display: inline; @@ -47,8 +47,8 @@ > a:focus, > span { color: $pager-disabled-color; - background-color: $pager-bg; cursor: $cursor-disabled; + background-color: $pager-bg; } } } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_pagination.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_pagination.scss index fecfa9c..c530828 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_pagination.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_pagination.scss @@ -14,12 +14,20 @@ position: relative; float: left; // Collapse white-space padding: $padding-base-vertical $padding-base-horizontal; + margin-left: -1px; line-height: $line-height-base; - text-decoration: none; color: $pagination-color; + text-decoration: none; background-color: $pagination-bg; border: 1px solid $pagination-border; - margin-left: -1px; + + &:hover, + &:focus { + z-index: 2; + color: $pagination-hover-color; + background-color: $pagination-hover-bg; + border-color: $pagination-hover-border; + } } &:first-child { > a, @@ -36,17 +44,6 @@ } } - > li > a, - > li > span { - &:hover, - &:focus { - z-index: 2; - color: $pagination-hover-color; - background-color: $pagination-hover-bg; - border-color: $pagination-hover-border; - } - } - > .active > a, > .active > span { &, @@ -54,9 +51,9 @@ &:focus { z-index: 3; color: $pagination-active-color; + cursor: default; background-color: $pagination-active-bg; border-color: $pagination-active-border; - cursor: default; } } @@ -68,9 +65,9 @@ > a:hover, > a:focus { color: $pagination-disabled-color; + cursor: $cursor-disabled; background-color: $pagination-disabled-bg; border-color: $pagination-disabled-border; - cursor: $cursor-disabled; } } } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_panels.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_panels.scss index 6c568de..8947ed2 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_panels.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_panels.scss @@ -9,7 +9,7 @@ background-color: $panel-bg; border: 1px solid transparent; border-radius: $panel-border-radius; - @include box-shadow(0 1px 1px rgba(0,0,0,.05)); + @include box-shadow(0 1px 1px rgba(0, 0, 0, .05)); } // Panel contents @@ -113,8 +113,8 @@ margin-bottom: 0; caption { - padding-left: $panel-body-padding; padding-right: $panel-body-padding; + padding-left: $panel-body-padding; } } // Add border top radius for first one @@ -147,8 +147,8 @@ > tbody:last-child, > tfoot:last-child { > tr:last-child { - border-bottom-left-radius: ($panel-border-radius - 1); border-bottom-right-radius: ($panel-border-radius - 1); + border-bottom-left-radius: ($panel-border-radius - 1); td:first-child, th:first-child { @@ -208,8 +208,8 @@ } } > .table-responsive { - border: 0; margin-bottom: 0; + border: 0; } } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_popovers.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_popovers.scss index 9b90a2e..6f83842 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_popovers.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_popovers.scss @@ -15,99 +15,81 @@ // So reset our font and text properties to avoid inheriting weird values. @include reset-text; font-size: $font-size-base; - background-color: $popover-bg; background-clip: padding-box; border: 1px solid $popover-fallback-border-color; border: 1px solid $popover-border-color; border-radius: $border-radius-large; - @include box-shadow(0 5px 10px rgba(0,0,0,.2)); + @include box-shadow(0 5px 10px rgba(0, 0, 0, .2)); // Offset the popover to account for the popover arrow - &.top { margin-top: -$popover-arrow-width; } - &.right { margin-left: $popover-arrow-width; } - &.bottom { margin-top: $popover-arrow-width; } - &.left { margin-left: -$popover-arrow-width; } -} + &.top { margin-top: -$popover-arrow-width; } + &.right { margin-left: $popover-arrow-width; } + &.bottom { margin-top: $popover-arrow-width; } + &.left { margin-left: -$popover-arrow-width; } -.popover-title { - margin: 0; // reset heading margin - padding: 8px 14px; - font-size: $font-size-base; - background-color: $popover-title-bg; - border-bottom: 1px solid darken($popover-title-bg, 5%); - border-radius: ($border-radius-large - 1) ($border-radius-large - 1) 0 0; -} + // Arrows + // .arrow is outer, .arrow:after is inner + > .arrow { + border-width: $popover-arrow-outer-width; -.popover-content { - padding: 9px 14px; -} - -// Arrows -// -// .arrow is outer, .arrow:after is inner + &, + &:after { + position: absolute; + display: block; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; + } -.popover > .arrow { - &, - &:after { - position: absolute; - display: block; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; + &:after { + content: ""; + border-width: $popover-arrow-width; + } } -} -.popover > .arrow { - border-width: $popover-arrow-outer-width; -} -.popover > .arrow:after { - border-width: $popover-arrow-width; - content: ""; -} -.popover { &.top > .arrow { + bottom: -$popover-arrow-outer-width; left: 50%; margin-left: -$popover-arrow-outer-width; - border-bottom-width: 0; border-top-color: $popover-arrow-outer-fallback-color; // IE8 fallback border-top-color: $popover-arrow-outer-color; - bottom: -$popover-arrow-outer-width; + border-bottom-width: 0; &:after { - content: " "; bottom: 1px; margin-left: -$popover-arrow-width; - border-bottom-width: 0; + content: " "; border-top-color: $popover-arrow-color; + border-bottom-width: 0; } } &.right > .arrow { top: 50%; left: -$popover-arrow-outer-width; margin-top: -$popover-arrow-outer-width; - border-left-width: 0; border-right-color: $popover-arrow-outer-fallback-color; // IE8 fallback border-right-color: $popover-arrow-outer-color; + border-left-width: 0; &:after { - content: " "; - left: 1px; bottom: -$popover-arrow-width; - border-left-width: 0; + left: 1px; + content: " "; border-right-color: $popover-arrow-color; + border-left-width: 0; } } &.bottom > .arrow { + top: -$popover-arrow-outer-width; left: 50%; margin-left: -$popover-arrow-outer-width; border-top-width: 0; border-bottom-color: $popover-arrow-outer-fallback-color; // IE8 fallback border-bottom-color: $popover-arrow-outer-color; - top: -$popover-arrow-outer-width; &:after { - content: " "; top: 1px; margin-left: -$popover-arrow-width; + content: " "; border-top-width: 0; border-bottom-color: $popover-arrow-color; } @@ -121,11 +103,24 @@ border-left-color: $popover-arrow-outer-fallback-color; // IE8 fallback border-left-color: $popover-arrow-outer-color; &:after { - content: " "; right: 1px; + bottom: -$popover-arrow-width; + content: " "; border-right-width: 0; border-left-color: $popover-arrow-color; - bottom: -$popover-arrow-width; } } } + +.popover-title { + padding: 8px 14px; + margin: 0; // reset heading margin + font-size: $font-size-base; + background-color: $popover-title-bg; + border-bottom: 1px solid darken($popover-title-bg, 5%); + border-radius: ($border-radius-large - 1) ($border-radius-large - 1) 0 0; +} + +.popover-content { + padding: 9px 14px; +} diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_print.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_print.scss index 66e54ab..564f304 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_print.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_print.scss @@ -6,96 +6,94 @@ // ========================================================================== @media print { - *, - *:before, - *:after { - background: transparent !important; - color: #000 !important; // Black prints faster: h5bp.com/s - box-shadow: none !important; - text-shadow: none !important; - } - - a, - a:visited { - text-decoration: underline; - } - - a[href]:after { - content: " (" attr(href) ")"; - } - - abbr[title]:after { - content: " (" attr(title) ")"; - } - - // Don't show links that are fragment identifiers, - // or use the `javascript:` pseudo protocol - a[href^="#"]:after, - a[href^="javascript:"]:after { - content: ""; - } - - pre, - blockquote { - border: 1px solid #999; - page-break-inside: avoid; - } - - thead { - display: table-header-group; // h5bp.com/t - } - - tr, - img { - page-break-inside: avoid; - } - - img { - max-width: 100% !important; - } - - p, - h2, - h3 { - orphans: 3; - widows: 3; - } - - h2, - h3 { - page-break-after: avoid; - } - - // Bootstrap specific changes start - - // Bootstrap components - .navbar { - display: none; - } - .btn, - .dropup > .btn { - > .caret { - border-top-color: #000 !important; - } - } - .label { - border: 1px solid #000; - } - - .table { - border-collapse: collapse !important; - - td, - th { - background-color: #fff !important; - } - } - .table-bordered { - th, - td { - border: 1px solid #ddd !important; - } - } - - // Bootstrap specific changes end + *, + *:before, + *:after { + color: #000 !important; // Black prints faster: h5bp.com/s + text-shadow: none !important; + background: transparent !important; + box-shadow: none !important; + } + + a, + a:visited { + text-decoration: underline; + } + + a[href]:after { + content: " (" attr(href) ")"; + } + + abbr[title]:after { + content: " (" attr(title) ")"; + } + + // Don't show links that are fragment identifiers, + // or use the `javascript:` pseudo protocol + a[href^="#"]:after, + a[href^="javascript:"]:after { + content: ""; + } + + pre, + blockquote { + border: 1px solid #999; + page-break-inside: avoid; + } + + thead { + display: table-header-group; // h5bp.com/t + } + + tr, + img { + page-break-inside: avoid; + } + + img { + max-width: 100% !important; + } + + p, + h2, + h3 { + orphans: 3; + widows: 3; + } + + h2, + h3 { + page-break-after: avoid; + } + + // Bootstrap specific changes start + + // Bootstrap components + .navbar { + display: none; + } + .btn, + .dropup > .btn { + > .caret { + border-top-color: #000 !important; + } + } + .label { + border: 1px solid #000; + } + + .table { + border-collapse: collapse !important; + + td, + th { + background-color: #fff !important; + } + } + .table-bordered { + th, + td { + border: 1px solid #ddd !important; + } + } } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_progress-bars.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_progress-bars.scss index 343df63..e7897de 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_progress-bars.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_progress-bars.scss @@ -24,12 +24,12 @@ // Outer container .progress { - overflow: hidden; height: $line-height-computed; margin-bottom: $line-height-computed; + overflow: hidden; background-color: $progress-bg; border-radius: $progress-border-radius; - @include box-shadow(inset 0 1px 2px rgba(0,0,0,.1)); + @include box-shadow(inset 0 1px 2px rgba(0, 0, 0, .1)); } // Bar of progress @@ -42,7 +42,7 @@ color: $progress-bar-color; text-align: center; background-color: $progress-bar-bg; - @include box-shadow(inset 0 -1px 0 rgba(0,0,0,.15)); + @include box-shadow(inset 0 -1px 0 rgba(0, 0, 0, .15)); @include transition(width .6s ease); } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_responsive-embed.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_responsive-embed.scss index 080a511..5a0e0b8 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_responsive-embed.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_responsive-embed.scss @@ -16,10 +16,10 @@ video { position: absolute; top: 0; - left: 0; bottom: 0; - height: 100%; + left: 0; width: 100%; + height: 100%; border: 0; } } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_responsive-utilities.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_responsive-utilities.scss index f3f0c83..73641aa 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_responsive-utilities.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_responsive-utilities.scss @@ -14,9 +14,9 @@ // For more information, see the following: // // Issue: https://github.com/twbs/bootstrap/issues/10497 -// Docs: http://getbootstrap.com/getting-started/#support-ie10-width -// Source: http://timkadlec.com/2013/01/windows-phone-8-and-device-width/ -// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/ +// Docs: https://getbootstrap.com/docs/3.4/getting-started/#support-ie10-width +// Source: https://timkadlec.com/2013/01/windows-phone-8-and-device-width/ +// Source: https://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/ @at-root { @-ms-viewport { diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_scaffolding.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_scaffolding.scss index 362c7e2..7fda593 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_scaffolding.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_scaffolding.scss @@ -7,7 +7,7 @@ // // Heads up! This reset may cause conflicts with some third-party widgets. // For recommendations on resolving such conflicts, see -// http://getbootstrap.com/getting-started/#third-box-sizing +// https://getbootstrap.com/docs/3.4/getting-started/#third-box-sizing * { @include box-sizing(border-box); } @@ -21,7 +21,7 @@ html { font-size: 10px; - -webkit-tap-highlight-color: rgba(0,0,0,0); + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } body { @@ -111,7 +111,7 @@ img { // Horizontal rules hr { - margin-top: $line-height-computed; + margin-top: $line-height-computed; margin-bottom: $line-height-computed; border: 0; border-top: 1px solid $hr-border; @@ -120,21 +120,21 @@ hr { // Only display content to screen readers // -// See: http://a11yproject.com/posts/how-to-hide-content +// See: https://a11yproject.com/posts/how-to-hide-content .sr-only { position: absolute; width: 1px; height: 1px; - margin: -1px; padding: 0; + margin: -1px; overflow: hidden; - clip: rect(0,0,0,0); + clip: rect(0, 0, 0, 0); border: 0; } // Use in conjunction with .sr-only to only display content when it's focused. -// Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1 +// Useful for "Skip to main content" links; see https://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1 // Credit: HTML5 Boilerplate .sr-only-focusable { diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_tables.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_tables.scss index affcc58..7bff4b0 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_tables.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_tables.scss @@ -5,13 +5,34 @@ table { background-color: $table-bg; + + // Table cell sizing + // + // Reset default table behavior + + col[class*="col-"] { + position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623) + display: table-column; + float: none; + } + + td, + th { + &[class*="col-"] { + position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623) + display: table-cell; + float: none; + } + } } + caption { padding-top: $table-cell-padding; padding-bottom: $table-cell-padding; color: $text-muted; text-align: left; } + th { text-align: left; } @@ -128,27 +149,6 @@ th { } -// Table cell sizing -// -// Reset default table behavior - -table col[class*="col-"] { - position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623) - float: none; - display: table-column; -} -table { - td, - th { - &[class*="col-"] { - position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623) - float: none; - display: table-cell; - } - } -} - - // Table backgrounds // // Exact selectors below required to override `.table-striped` and prevent @@ -169,12 +169,12 @@ table { // will display normally. .table-responsive { + min-height: .01%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837) overflow-x: auto; - min-height: 0.01%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837) @media screen and (max-width: $screen-xs-max) { width: 100%; - margin-bottom: ($line-height-computed * 0.75); + margin-bottom: ($line-height-computed * .75); overflow-y: hidden; -ms-overflow-style: -ms-autohiding-scrollbar; border: 1px solid $table-border-color; diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_theme.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_theme.scss index c1b0e9c..046eed7 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_theme.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_theme.scss @@ -1,6 +1,6 @@ /*! - * Bootstrap v3.3.7 (http://getbootstrap.com) - * Copyright 2011-2016 Twitter, Inc. + * Bootstrap v3.4.1 (https://getbootstrap.com/) + * Copyright 2011-2019 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ @@ -23,14 +23,14 @@ .btn-info, .btn-warning, .btn-danger { - text-shadow: 0 -1px 0 rgba(0,0,0,.2); - $shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075); + text-shadow: 0 -1px 0 rgba(0, 0, 0, .2); + $shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075); @include box-shadow($shadow); // Reset the shadow &:active, &.active { - @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); + @include box-shadow(inset 0 3px 5px rgba(0, 0, 0, .125)); } &.disabled, @@ -88,7 +88,11 @@ } // Apply the mixin to the buttons -.btn-default { @include btn-styles($btn-default-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; } +.btn-default { + @include btn-styles($btn-default-bg); + text-shadow: 0 1px 0 #fff; + border-color: #ccc; +} .btn-primary { @include btn-styles($btn-primary-bg); } .btn-success { @include btn-styles($btn-success-bg); } .btn-info { @include btn-styles($btn-info-bg); } @@ -102,7 +106,7 @@ .thumbnail, .img-thumbnail { - @include box-shadow(0 1px 2px rgba(0,0,0,.075)); + @include box-shadow(0 1px 2px rgba(0, 0, 0, .075)); } @@ -132,18 +136,18 @@ @include gradient-vertical($start-color: lighten($navbar-default-bg, 10%), $end-color: $navbar-default-bg); @include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered border-radius: $navbar-border-radius; - $shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075); + $shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075); @include box-shadow($shadow); .navbar-nav > .open > a, .navbar-nav > .active > a { @include gradient-vertical($start-color: darken($navbar-default-link-active-bg, 5%), $end-color: darken($navbar-default-link-active-bg, 2%)); - @include box-shadow(inset 0 3px 9px rgba(0,0,0,.075)); + @include box-shadow(inset 0 3px 9px rgba(0, 0, 0, .075)); } } .navbar-brand, .navbar-nav > li > a { - text-shadow: 0 1px 0 rgba(255,255,255,.25); + text-shadow: 0 1px 0 rgba(255, 255, 255, .25); } // Inverted navbar @@ -154,12 +158,12 @@ .navbar-nav > .open > a, .navbar-nav > .active > a { @include gradient-vertical($start-color: $navbar-inverse-link-active-bg, $end-color: lighten($navbar-inverse-link-active-bg, 2.5%)); - @include box-shadow(inset 0 3px 9px rgba(0,0,0,.25)); + @include box-shadow(inset 0 3px 9px rgba(0, 0, 0, .25)); } .navbar-brand, .navbar-nav > li > a { - text-shadow: 0 -1px 0 rgba(0,0,0,.25); + text-shadow: 0 -1px 0 rgba(0, 0, 0, .25); } } @@ -189,8 +193,8 @@ // Common styles .alert { - text-shadow: 0 1px 0 rgba(255,255,255,.2); - $shadow: inset 0 1px 0 rgba(255,255,255,.25), 0 1px 2px rgba(0,0,0,.05); + text-shadow: 0 1px 0 rgba(255, 255, 255, .2); + $shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05); @include box-shadow($shadow); } @@ -241,7 +245,7 @@ .list-group { border-radius: $border-radius-base; - @include box-shadow(0 1px 2px rgba(0,0,0,.075)); + @include box-shadow(0 1px 2px rgba(0, 0, 0, .075)); } .list-group-item.active, .list-group-item.active:hover, @@ -262,7 +266,7 @@ // Common styles .panel { - @include box-shadow(0 1px 2px rgba(0,0,0,.05)); + @include box-shadow(0 1px 2px rgba(0, 0, 0, .05)); } // Mixin for generating new styles @@ -286,6 +290,6 @@ .well { @include gradient-vertical($start-color: darken($well-bg, 5%), $end-color: $well-bg); border-color: darken($well-bg, 10%); - $shadow: inset 0 1px 3px rgba(0,0,0,.05), 0 1px 0 rgba(255,255,255,.1); + $shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1); @include box-shadow($shadow); } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_thumbnails.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_thumbnails.scss index da0e1e7..835452f 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_thumbnails.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_thumbnails.scss @@ -17,8 +17,8 @@ > img, a > img { @include img-responsive; - margin-left: auto; margin-right: auto; + margin-left: auto; } // [converter] extracted a&:hover, a&:focus, a&.active to a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_tooltip.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_tooltip.scss index f0c1658..fa69a81 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_tooltip.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_tooltip.scss @@ -15,33 +15,25 @@ @include opacity(0); - &.in { @include opacity($tooltip-opacity); } - &.top { margin-top: -3px; padding: $tooltip-arrow-width 0; } - &.right { margin-left: 3px; padding: 0 $tooltip-arrow-width; } - &.bottom { margin-top: 3px; padding: $tooltip-arrow-width 0; } - &.left { margin-left: -3px; padding: 0 $tooltip-arrow-width; } -} - -// Wrapper for the tooltip content -.tooltip-inner { - max-width: $tooltip-max-width; - padding: 3px 8px; - color: $tooltip-color; - text-align: center; - background-color: $tooltip-bg; - border-radius: $border-radius-base; -} + &.in { @include opacity($tooltip-opacity); } + &.top { + padding: $tooltip-arrow-width 0; + margin-top: -3px; + } + &.right { + padding: 0 $tooltip-arrow-width; + margin-left: 3px; + } + &.bottom { + padding: $tooltip-arrow-width 0; + margin-top: 3px; + } + &.left { + padding: 0 $tooltip-arrow-width; + margin-left: -3px; + } -// Arrows -.tooltip-arrow { - position: absolute; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} -// Note: Deprecated .top-left, .top-right, .bottom-left, and .bottom-right as of v3.3.1 -.tooltip { + // Note: Deprecated .top-left, .top-right, .bottom-left, and .bottom-right as of v3.3.1 &.top .tooltip-arrow { bottom: 0; left: 50%; @@ -50,8 +42,8 @@ border-top-color: $tooltip-arrow-color; } &.top-left .tooltip-arrow { - bottom: 0; right: $tooltip-arrow-width; + bottom: 0; margin-bottom: -$tooltip-arrow-width; border-width: $tooltip-arrow-width $tooltip-arrow-width 0; border-top-color: $tooltip-arrow-color; @@ -99,3 +91,22 @@ border-bottom-color: $tooltip-arrow-color; } } + +// Wrapper for the tooltip content +.tooltip-inner { + max-width: $tooltip-max-width; + padding: 3px 8px; + color: $tooltip-color; + text-align: center; + background-color: $tooltip-bg; + border-radius: $border-radius-base; +} + +// Arrows +.tooltip-arrow { + position: absolute; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; +} diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_type.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_type.scss index 620796a..c63cc4c 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_type.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_type.scss @@ -15,7 +15,7 @@ h1, h2, h3, h4, h5, h6, small, .small { - font-weight: normal; + font-weight: 400; line-height: 1; color: $headings-small-color; } @@ -82,8 +82,8 @@ small, mark, .mark { - background-color: $state-warning-bg; padding: .2em; + background-color: $state-warning-bg; } // Alignment @@ -176,8 +176,8 @@ ol { > li { display: inline-block; - padding-left: 5px; padding-right: 5px; + padding-left: 5px; } } @@ -191,7 +191,7 @@ dd { line-height: $line-height-base; } dt { - font-weight: bold; + font-weight: 700; } dd { margin-left: 0; // Undo browser default @@ -226,12 +226,12 @@ dd { // ------------------------- // Abbreviations and acronyms -abbr[title], // Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257 +abbr[title], abbr[data-original-title] { cursor: help; - border-bottom: 1px dotted $abbr-border-color; } + .initialism { font-size: 90%; @extend .text-uppercase; @@ -263,7 +263,7 @@ blockquote { color: $blockquote-small-color; &:before { - content: '\2014 \00A0'; // em dash, nbsp + content: "\2014 \00A0"; // em dash, nbsp } } } @@ -275,17 +275,17 @@ blockquote { blockquote.pull-right { padding-right: 15px; padding-left: 0; + text-align: right; border-right: 5px solid $blockquote-border-color; border-left: 0; - text-align: right; // Account for citation footer, small, .small { - &:before { content: ''; } + &:before { content: ""; } &:after { - content: '\00A0 \2014'; // nbsp, em dash + content: "\00A0 \2014"; // nbsp, em dash } } } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_variables.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_variables.scss index e049685..898ef14 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_variables.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_variables.scss @@ -51,14 +51,14 @@ $font-family-base: $font-family-sans-serif !default; $font-size-base: 14px !default; $font-size-large: ceil(($font-size-base * 1.25)) !default; // ~18px -$font-size-small: ceil(($font-size-base * 0.85)) !default; // ~12px +$font-size-small: ceil(($font-size-base * .85)) !default; // ~12px $font-size-h1: floor(($font-size-base * 2.6)) !default; // ~36px $font-size-h2: floor(($font-size-base * 2.15)) !default; // ~30px $font-size-h3: ceil(($font-size-base * 1.7)) !default; // ~24px $font-size-h4: ceil(($font-size-base * 1.25)) !default; // ~18px $font-size-h5: $font-size-base !default; -$font-size-h6: ceil(($font-size-base * 0.85)) !default; // ~12px +$font-size-h6: ceil(($font-size-base * .85)) !default; // ~12px //** Unit-less `line-height` for use in components like buttons. $line-height-base: 1.428571429 !default; // 20/14 @@ -239,7 +239,7 @@ $cursor-disabled: not-allowed !default; //** Background for the dropdown menu. $dropdown-bg: #fff !default; //** Dropdown menu `border-color`. -$dropdown-border: rgba(0,0,0,.15) !default; +$dropdown-border: rgba(0, 0, 0, .15) !default; //** Dropdown menu `border-color` **for IE8**. $dropdown-fallback-border: #ccc !default; //** Divider color for between dropdown items. @@ -545,7 +545,7 @@ $popover-bg: #fff !default; //** Popover maximum width $popover-max-width: 276px !default; //** Popover border color -$popover-border-color: rgba(0,0,0,.2) !default; +$popover-border-color: rgba(0, 0, 0, .2) !default; //** Popover fallback border color $popover-fallback-border-color: #ccc !default; @@ -603,7 +603,7 @@ $modal-title-line-height: $line-height-base !default; //** Background color of modal content area $modal-content-bg: #fff !default; //** Modal content border color -$modal-content-border-color: rgba(0,0,0,.2) !default; +$modal-content-border-color: rgba(0, 0, 0, .2) !default; //** Modal content border color **for IE8** $modal-content-fallback-border-color: #999 !default; @@ -808,7 +808,7 @@ $breadcrumb-separator: "/" !default; // //## -$carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6) !default; +$carousel-text-shadow: 0 1px 2px rgba(0, 0, 0, .6) !default; $carousel-control-color: #fff !default; $carousel-control-width: 15% !default; diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_wells.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_wells.scss index b865711..9a048bd 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_wells.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/_wells.scss @@ -11,10 +11,10 @@ background-color: $well-bg; border: 1px solid $well-border; border-radius: $border-radius-base; - @include box-shadow(inset 0 1px 1px rgba(0,0,0,.05)); + @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, .05)); blockquote { border-color: #ddd; - border-color: rgba(0,0,0,.15); + border-color: rgba(0, 0, 0, .15); } } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_alerts.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_alerts.scss index 3faf0b5..b1e6df9 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_alerts.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_alerts.scss @@ -1,13 +1,14 @@ // Alerts @mixin alert-variant($background, $border, $text-color) { + color: $text-color; background-color: $background; border-color: $border; - color: $text-color; hr { border-top-color: darken($border, 5%); } + .alert-link { color: darken($text-color, 10%); } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_border-radius.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_border-radius.scss index ce19499..e03c390 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_border-radius.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_border-radius.scss @@ -1,18 +1,18 @@ // Single side border-radius @mixin border-top-radius($radius) { + border-top-left-radius: $radius; border-top-right-radius: $radius; - border-top-left-radius: $radius; } @mixin border-right-radius($radius) { + border-top-right-radius: $radius; border-bottom-right-radius: $radius; - border-top-right-radius: $radius; } @mixin border-bottom-radius($radius) { border-bottom-right-radius: $radius; - border-bottom-left-radius: $radius; + border-bottom-left-radius: $radius; } @mixin border-left-radius($radius) { + border-top-left-radius: $radius; border-bottom-left-radius: $radius; - border-top-left-radius: $radius; } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_buttons.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_buttons.scss index b93f84b..5afa735 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_buttons.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_buttons.scss @@ -12,33 +12,29 @@ &.focus { color: $color; background-color: darken($background, 10%); - border-color: darken($border, 25%); + border-color: darken($border, 25%); } &:hover { color: $color; background-color: darken($background, 10%); - border-color: darken($border, 12%); + border-color: darken($border, 12%); } &:active, &.active, .open > &.dropdown-toggle { color: $color; background-color: darken($background, 10%); - border-color: darken($border, 12%); + background-image: none; + border-color: darken($border, 12%); &:hover, &:focus, &.focus { color: $color; background-color: darken($background, 17%); - border-color: darken($border, 25%); + border-color: darken($border, 25%); } } - &:active, - &.active, - .open > &.dropdown-toggle { - background-image: none; - } &.disabled, &[disabled], fieldset[disabled] & { @@ -46,7 +42,7 @@ &:focus, &.focus { background-color: $background; - border-color: $border; + border-color: $border; } } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_center-block.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_center-block.scss index e06fb5e..ed69097 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_center-block.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_center-block.scss @@ -2,6 +2,6 @@ @mixin center-block() { display: block; - margin-left: auto; margin-right: auto; + margin-left: auto; } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_clearfix.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_clearfix.scss index dc3e2ab..e45eca5 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_clearfix.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_clearfix.scss @@ -13,8 +13,8 @@ @mixin clearfix() { &:before, &:after { - content: " "; // 1 display: table; // 2 + content: " "; // 1 } &:after { clear: both; diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_forms.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_forms.scss index 277aa5f..46578a1 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_forms.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_forms.scss @@ -20,18 +20,18 @@ // Set the border and box shadow on specific inputs to match .form-control { border-color: $border-color; - @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work + @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, .075)); // Redeclare so transitions work &:focus { border-color: darken($border-color, 10%); - $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($border-color, 20%); + $shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px lighten($border-color, 20%); @include box-shadow($shadow); } } // Set validation states also for addons .input-group-addon { color: $text-color; - border-color: $border-color; background-color: $background-color; + border-color: $border-color; } // Optional feedback icon .form-control-feedback { @@ -57,7 +57,7 @@ &:focus { border-color: $color; outline: 0; - @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px $color-rgba); + @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px $color-rgba); } } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_gradients.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_gradients.scss index a8939f5..fd81440 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_gradients.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_gradients.scss @@ -1,5 +1,3 @@ -// Gradients - // Horizontal gradient, from left to right @@ -10,8 +8,8 @@ background-image: -webkit-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // Safari 5.1-6, Chrome 10+ background-image: -o-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // Opera 12 background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ - background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down + background-repeat: repeat-x; } // Vertical gradient, from top to bottom @@ -22,36 +20,36 @@ background-image: -webkit-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // Safari 5.1-6, Chrome 10+ background-image: -o-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // Opera 12 background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ - background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down + background-repeat: repeat-x; } @mixin gradient-directional($start-color: #555, $end-color: #333, $deg: 45deg) { - background-repeat: repeat-x; background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1-6, Chrome 10+ background-image: -o-linear-gradient($deg, $start-color, $end-color); // Opera 12 background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ + background-repeat: repeat-x; } @mixin gradient-horizontal-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { background-image: -webkit-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color); background-image: -o-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color); background-image: linear-gradient(to right, $start-color, $mid-color $color-stop, $end-color); - background-repeat: no-repeat; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down, gets no color-stop at all for proper fallback + background-repeat: no-repeat; } @mixin gradient-vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { background-image: -webkit-linear-gradient($start-color, $mid-color $color-stop, $end-color); background-image: -o-linear-gradient($start-color, $mid-color $color-stop, $end-color); background-image: linear-gradient($start-color, $mid-color $color-stop, $end-color); - background-repeat: no-repeat; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback + background-repeat: no-repeat; } @mixin gradient-radial($inner-color: #555, $outer-color: #333) { background-image: -webkit-radial-gradient(circle, $inner-color, $outer-color); background-image: radial-gradient(circle, $inner-color, $outer-color); background-repeat: no-repeat; } -@mixin gradient-striped($color: rgba(255,255,255,.15), $angle: 45deg) { +@mixin gradient-striped($color: rgba(255, 255, 255, .15), $angle: 45deg) { background-image: -webkit-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent); background-image: -o-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent); background-image: linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent); diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_grid-framework.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_grid-framework.scss index 16d038c..2b84cb1 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_grid-framework.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_grid-framework.scss @@ -13,8 +13,8 @@ // Prevent columns from collapsing when empty min-height: 1px; // Inner gutter via padding - padding-left: ceil(($grid-gutter-width / 2)); padding-right: floor(($grid-gutter-width / 2)); + padding-left: ceil(($grid-gutter-width / 2)); } } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_grid.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_grid.scss index 59551da..884ac4f 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_grid.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_grid.scss @@ -4,17 +4,17 @@ // Centered container element @mixin container-fixed($gutter: $grid-gutter-width) { + padding-right: ceil(($gutter / 2)); + padding-left: floor(($gutter / 2)); margin-right: auto; margin-left: auto; - padding-left: floor(($gutter / 2)); - padding-right: ceil(($gutter / 2)); @include clearfix; } // Creates a wrapper for a series of columns @mixin make-row($gutter: $grid-gutter-width) { - margin-left: ceil(($gutter / -2)); margin-right: floor(($gutter / -2)); + margin-left: ceil(($gutter / -2)); @include clearfix; } @@ -24,8 +24,8 @@ float: left; width: percentage(($columns / $grid-columns)); min-height: 1px; - padding-left: ($gutter / 2); padding-right: ($gutter / 2); + padding-left: ($gutter / 2); } @mixin make-xs-column-offset($columns) { margin-left: percentage(($columns / $grid-columns)); @@ -41,8 +41,8 @@ @mixin make-sm-column($columns, $gutter: $grid-gutter-width) { position: relative; min-height: 1px; - padding-left: ($gutter / 2); padding-right: ($gutter / 2); + padding-left: ($gutter / 2); @media (min-width: $screen-sm-min) { float: left; @@ -69,8 +69,8 @@ @mixin make-md-column($columns, $gutter: $grid-gutter-width) { position: relative; min-height: 1px; - padding-left: ($gutter / 2); padding-right: ($gutter / 2); + padding-left: ($gutter / 2); @media (min-width: $screen-md-min) { float: left; @@ -97,8 +97,8 @@ @mixin make-lg-column($columns, $gutter: $grid-gutter-width) { position: relative; min-height: 1px; - padding-left: ($gutter / 2); padding-right: ($gutter / 2); + padding-left: ($gutter / 2); @media (min-width: $screen-lg-min) { float: left; diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_image.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_image.scss index c8dcf5e..b5a109b 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_image.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_image.scss @@ -1,8 +1,3 @@ -// Image Mixins -// - Responsive image -// - Retina image - - // Responsive image // // Keep images from scaling beyond the width of their parents. @@ -22,11 +17,11 @@ @media only screen and (-webkit-min-device-pixel-ratio: 2), - only screen and ( min--moz-device-pixel-ratio: 2), - only screen and ( -o-min-device-pixel-ratio: 2/1), - only screen and ( min-device-pixel-ratio: 2), - only screen and ( min-resolution: 192dpi), - only screen and ( min-resolution: 2dppx) { + only screen and ( min--moz-device-pixel-ratio: 2), + only screen and ( -o-min-device-pixel-ratio: 2/1), + only screen and ( min-device-pixel-ratio: 2), + only screen and ( min-resolution: 192dpi), + only screen and ( min-resolution: 2dppx) { background-image: url(if($bootstrap-sass-asset-helper, twbs-image-path("#{$file-2x}"), "#{$file-2x}")); background-size: $width-1x $height-1x; } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_opacity.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_opacity.scss index 88e9a57..e9c5573 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_opacity.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_opacity.scss @@ -1,8 +1,7 @@ // Opacity @mixin opacity($opacity) { - opacity: $opacity; - // IE8 filter - $opacity-ie: ($opacity * 100); + $opacity-ie: ($opacity * 100); // IE8 filter filter: alpha(opacity=$opacity-ie); + opacity: $opacity; } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_reset-text.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_reset-text.scss index c9c2841..8997eca 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_reset-text.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_reset-text.scss @@ -2,17 +2,17 @@ font-family: $font-family-base; // We deliberately do NOT reset font-size. font-style: normal; - font-weight: normal; - letter-spacing: normal; - line-break: auto; + font-weight: 400; line-height: $line-height-base; + line-break: auto; text-align: left; // Fallback for where `start` is not supported text-align: start; text-decoration: none; text-shadow: none; text-transform: none; - white-space: normal; + letter-spacing: normal; word-break: normal; word-spacing: normal; word-wrap: normal; + white-space: normal; } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_resize.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_resize.scss index 83fa637..66f233a 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_resize.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_resize.scss @@ -1,6 +1,6 @@ // Resize anything @mixin resizable($direction) { - resize: $direction; // Options: horizontal, vertical, both overflow: auto; // Per CSS3 UI, `resize` only applies when `overflow` isn't `visible` + resize: $direction; // Options: horizontal, vertical, both } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_responsive-visibility.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_responsive-visibility.scss index cbdf777..d25ef97 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_responsive-visibility.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_responsive-visibility.scss @@ -1,7 +1,3 @@ -// Responsive utilities - -// -// More easily include all the states for responsive-utilities.less. // [converter] $parent hack @mixin responsive-visibility($parent) { #{$parent} { diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_vendor-prefixes.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_vendor-prefixes.scss index b3d0371..93d5775 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_vendor-prefixes.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_vendor-prefixes.scss @@ -89,12 +89,12 @@ // Optional hyphenation @mixin hyphens($mode: auto) { - word-wrap: break-word; -webkit-hyphens: $mode; -moz-hyphens: $mode; -ms-hyphens: $mode; // IE10+ -o-hyphens: $mode; hyphens: $mode; + word-wrap: break-word; } // Placeholder text |