diff options
Diffstat (limited to 'assets/stylesheets/bootstrap')
-rw-r--r-- | assets/stylesheets/bootstrap/_alert.scss | 1 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_card.scss | 2 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_custom-forms.scss | 33 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_dropdown.scss | 21 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_forms.scss | 2 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_input-group.scss | 2 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_labels.scss | 2 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_list-group.scss | 2 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_modal.scss | 2 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_navbar.scss | 9 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_type.scss | 2 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_utilities-spacing.scss | 2 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_variables.scss | 48 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/mixins/_buttons.scss | 32 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/mixins/_clearfix.scss | 19 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/mixins/_image.scss | 4 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/mixins/_list-group.scss | 6 |
17 files changed, 95 insertions, 94 deletions
diff --git a/assets/stylesheets/bootstrap/_alert.scss b/assets/stylesheets/bootstrap/_alert.scss index aaa2a1d..e52e957 100644 --- a/assets/stylesheets/bootstrap/_alert.scss +++ b/assets/stylesheets/bootstrap/_alert.scss @@ -20,7 +20,6 @@ // Headings for larger alerts .alert-heading { - margin-top: 0; // Specified to prevent conflicts of changing $headings-color color: inherit; } diff --git a/assets/stylesheets/bootstrap/_card.scss b/assets/stylesheets/bootstrap/_card.scss index 0a4f5b6..fc456c0 100644 --- a/assets/stylesheets/bootstrap/_card.scss +++ b/assets/stylesheets/bootstrap/_card.scss @@ -5,6 +5,7 @@ .card { position: relative; margin-bottom: $card-spacer-y; + background-color: #fff; border: $card-border-width solid $card-border-color; @include border-radius($card-border-radius); } @@ -14,7 +15,6 @@ } .card-title { - margin-top: 0; margin-bottom: $card-spacer-y; } diff --git a/assets/stylesheets/bootstrap/_custom-forms.scss b/assets/stylesheets/bootstrap/_custom-forms.scss index ec211ac..0565f2f 100644 --- a/assets/stylesheets/bootstrap/_custom-forms.scss +++ b/assets/stylesheets/bootstrap/_custom-forms.scss @@ -19,16 +19,17 @@ z-index: -1; // Put the input behind the label so it doesn't overlay text opacity: 0; - &:focus ~ .c-indicator { - @include box-shadow(0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9); - } - &:checked ~ .c-indicator { color: #fff; background-color: #0074d9; @include box-shadow(none); } + &:focus ~ .c-indicator { + // the mixin is not used here to make sure there is feedback + box-shadow: 0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9; + } + &:active ~ .c-indicator { color: #fff; background-color: #84c6ff; @@ -125,29 +126,27 @@ // // Replaces the browser default select with a custom one, mostly pulled from // http://primercss.io. +// +// Includes IE9-specific hacks (noted by ` \9`). .c-select { display: inline-block; max-width: 100%; padding: .375rem 1.75rem .375rem .75rem; + padding-right: .75rem \9; vertical-align: middle; - background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAUCAMAAACzvE1FAAAADFBMVEUzMzMzMzMzMzMzMzMKAG/3AAAAA3RSTlMAf4C/aSLHAAAAPElEQVR42q3NMQ4AIAgEQTn//2cLdRKppSGzBYwzVXvznNWs8C58CiussPJj8h6NwgorrKRdTvuV9v16Afn0AYFOB7aYAAAAAElFTkSuQmCC) no-repeat right .75rem center; + background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAUCAMAAACzvE1FAAAADFBMVEUzMzMzMzMzMzMzMzMKAG/3AAAAA3RSTlMAf4C/aSLHAAAAPElEQVR42q3NMQ4AIAgEQTn//2cLdRKppSGzBYwzVXvznNWs8C58CiussPJj8h6NwgorrKRdTvuV9v16Afn0AYFOB7aYAAAAAElFTkSuQmCC) no-repeat right .75rem center; + background-image: none \9; background-size: 8px 10px; border: 1px solid $input-border; - - // Have to include vendor prefixes as the `appearance` property isn't part of the CSS spec. - -webkit-appearance: none; + // Use vendor prefixes as `appearance` isn't part of the CSS spec. -moz-appearance: none; - appearance: none; - - // IE9 hacks to hide the background-image and reduce padding - padding-right: .75rem \9; - background-image: none \9; + -webkit-appearance: none; &:focus { - outline: none; border-color: #51a7e8; - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075), 0 0 5px rgba(81, 167, 232, 0.5); + outline: none; + @include box-shadow(inset 0 1px 2px rgba(0, 0, 0, 0.075), 0 0 5px rgba(81, 167, 232, 0.5)); } // Hides the default caret in IE11 @@ -198,7 +197,7 @@ background-color: #fff; border: .075rem solid #ddd; border-radius: .25rem; - box-shadow: inset 0 .2rem .4rem rgba(0,0,0,.05); + @include box-shadow(inset 0 .2rem .4rem rgba(0,0,0,.05)); } .file-custom:after { content: "Choose file..."; @@ -222,5 +221,5 @@ // Focus state .file input:focus ~ .file-custom { - box-shadow: 0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9; + @include box-shadow(0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9); } diff --git a/assets/stylesheets/bootstrap/_dropdown.scss b/assets/stylesheets/bootstrap/_dropdown.scss index d3588d2..3b0df96 100644 --- a/assets/stylesheets/bootstrap/_dropdown.scss +++ b/assets/stylesheets/bootstrap/_dropdown.scss @@ -24,6 +24,15 @@ } } +.dropup { + .dropdown-toggle { + &:after { + border-bottom: $caret-width solid; + border-top: 0; + } + } +} + // The dropdown menu (ul) .dropdown-menu { position: absolute; @@ -51,20 +60,20 @@ } // Links, buttons, and more within the dropdown menu +// +// `<button>`-specific styles are denoted with `// for <button>s` .dropdown-item { display: block; + width: 100%; // For `<button>`s padding: 3px 20px; clear: both; font-weight: normal; line-height: $line-height; color: $dropdown-link-color; + text-align: inherit; // For `<button>`s white-space: nowrap; // prevent links from randomly breaking onto new lines - - // For `<button>`s - text-align: inherit; - width: 100%; - background: none; - border: 0; + background: none; // For `<button>`s + border: 0; // For `<button>`s @include hover-focus { color: $dropdown-link-hover-color; diff --git a/assets/stylesheets/bootstrap/_forms.scss b/assets/stylesheets/bootstrap/_forms.scss index 6eafd53..72ec9b0 100644 --- a/assets/stylesheets/bootstrap/_forms.scss +++ b/assets/stylesheets/bootstrap/_forms.scss @@ -266,9 +266,9 @@ input[type="checkbox"] { .form-control-warning, .form-control-error { padding-right: ($input-padding-x * 3); + background-repeat: no-repeat; background-position: center right ($input-height * .25); background-size: ($input-height * .65) ($input-height * .65); - background-repeat: no-repeat; } // Form validation states diff --git a/assets/stylesheets/bootstrap/_input-group.scss b/assets/stylesheets/bootstrap/_input-group.scss index df8aa10..3b4ef63 100644 --- a/assets/stylesheets/bootstrap/_input-group.scss +++ b/assets/stylesheets/bootstrap/_input-group.scss @@ -97,7 +97,7 @@ @include border-radius($border-radius-sm); } &.form-control-lg { - padding: $input-padding-x-lg $input-padding-x-lg; + padding: $input-padding-y-lg $input-padding-x-lg; font-size: $font-size-lg; @include border-radius($border-radius-lg); } diff --git a/assets/stylesheets/bootstrap/_labels.scss b/assets/stylesheets/bootstrap/_labels.scss index 599f335..403504b 100644 --- a/assets/stylesheets/bootstrap/_labels.scss +++ b/assets/stylesheets/bootstrap/_labels.scss @@ -41,8 +41,8 @@ a.label { // Make them extra rounded with a modifier to replace v3's badges. .label-pill { - padding-left: .6em; padding-right: .6em; + padding-left: .6em; border-radius: 1rem; } diff --git a/assets/stylesheets/bootstrap/_list-group.scss b/assets/stylesheets/bootstrap/_list-group.scss index d909022..4e3d73c 100644 --- a/assets/stylesheets/bootstrap/_list-group.scss +++ b/assets/stylesheets/bootstrap/_list-group.scss @@ -48,8 +48,8 @@ a.list-group-item, button.list-group-item { width: 100%; - text-align: inherit; color: $list-group-link-color; + text-align: inherit; .list-group-item-heading { color: $list-group-link-heading-color; diff --git a/assets/stylesheets/bootstrap/_modal.scss b/assets/stylesheets/bootstrap/_modal.scss index f034c77..046810f 100644 --- a/assets/stylesheets/bootstrap/_modal.scss +++ b/assets/stylesheets/bootstrap/_modal.scss @@ -26,8 +26,8 @@ // When fading in the modal, animate it to slide down &.fade .modal-dialog { - transform: translate(0, -25%); transition: transform .3s ease-out; + transform: translate(0, -25%); } &.in .modal-dialog { transform: translate(0, 0); } } diff --git a/assets/stylesheets/bootstrap/_navbar.scss b/assets/stylesheets/bootstrap/_navbar.scss index 61c2121..94cf100 100644 --- a/assets/stylesheets/bootstrap/_navbar.scss +++ b/assets/stylesheets/bootstrap/_navbar.scss @@ -35,7 +35,6 @@ right: 0; left: 0; z-index: $zindex-navbar-fixed; - margin-bottom: 0; // override .navbar defaults // Undo the rounded corners @include media-breakpoint-up(sm) { @@ -70,9 +69,9 @@ .navbar-brand { float: left; - margin-right: 1rem; padding-top: .25rem; padding-bottom: .25rem; + margin-right: 1rem; font-size: $font-size-lg; @include hover-focus { @@ -90,12 +89,12 @@ width: 1px; padding-top: .425rem; padding-bottom: .425rem; - overflow: hidden; - margin-left: $navbar-padding-horizontal; margin-right: $navbar-padding-horizontal; + margin-left: $navbar-padding-horizontal; + overflow: hidden; &:before { - content: '\00a0'; + content: "\00a0"; } } diff --git a/assets/stylesheets/bootstrap/_type.scss b/assets/stylesheets/bootstrap/_type.scss index 2f5cdb4..3d349e6 100644 --- a/assets/stylesheets/bootstrap/_type.scss +++ b/assets/stylesheets/bootstrap/_type.scss @@ -176,8 +176,8 @@ mark, > img { @extend .img-responsive; - line-height: 1; margin-bottom: ($spacer-y / 2); + line-height: 1; } } diff --git a/assets/stylesheets/bootstrap/_utilities-spacing.scss b/assets/stylesheets/bootstrap/_utilities-spacing.scss index 547bea7..1c2cca4 100644 --- a/assets/stylesheets/bootstrap/_utilities-spacing.scss +++ b/assets/stylesheets/bootstrap/_utilities-spacing.scss @@ -40,7 +40,7 @@ .p-r-0 { padding-right: 0 !important; } .p-b-0 { padding-bottom: 0 !important; } .p-l-0 { padding-left: 0 !important; } -.p-x-0 { padding-left: 0 !important; padding-right: 0 !important; } +.p-x-0 { padding-right: 0 !important; padding-left: 0 !important; } .p-y-0 { padding-top: 0 !important; padding-bottom: 0 !important; } .p-a { padding: $spacer !important; } diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index 3b31dbd..b96e45b 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_variables.scss @@ -172,7 +172,7 @@ $blockquote-font-size: ($font-size-base * 1.25) !default; $blockquote-border-color: $gray-lighter !default; $hr-border-color: rgba(0,0,0,.1) !default; -$hr-border-width: $border-width; +$hr-border-width: $border-width !default; // Components @@ -212,8 +212,8 @@ $table-border-color: $gray-lighter !default; // // For each of Bootstrap's buttons, define text, background and border color. -$btn-padding-x: 1rem; -$btn-padding-y: .375rem; +$btn-padding-x: 1rem !default; +$btn-padding-y: .375rem !default; $btn-font-weight: normal !default; $btn-primary-color: #fff !default; @@ -249,9 +249,9 @@ $btn-padding-x-lg: 1.25rem !default; $btn-padding-y-lg: .75rem !default; // Allows for customizing button radius independently from global border radius -$btn-border-radius: $border-radius; -$btn-border-radius-lg: $border-radius-lg; -$btn-border-radius-sm: $border-radius-sm; +$btn-border-radius: $border-radius !default; +$btn-border-radius-lg: $border-radius-lg !default; +$btn-border-radius-sm: $border-radius-sm !default; // Forms @@ -285,7 +285,7 @@ $input-height: (($font-size-base * $line-height) + ($input-pad $input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2) + ($border-width * 2)) !default; $input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2) + ($border-width * 2)) !default; -$form-group-margin-bottom: 15px; +$form-group-margin-bottom: 15px !default; $input-group-addon-bg: $gray-lighter !default; $input-group-addon-border-color: $input-border !default; @@ -293,9 +293,9 @@ $input-group-addon-border-color: $input-border !default; $cursor-disabled: not-allowed !default; // Form validation icons -$form-icon-success: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkNoZWNrIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDYxMiA3OTIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDYxMiA3OTIiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxwYXRoIGZpbGw9IiM1Q0I4NUMiIGQ9Ik0yMzMuOCw2MTAuMWMtMTMuMywwLTI1LjktNi4yLTM0LTE2LjlMOTAuNSw0NDguOEM3Ni4zLDQzMCw4MCw0MDMuMyw5OC44LDM4OS4xYzE4LjgtMTQuMyw0NS41LTEwLjUsNTkuOCw4LjNsNzEuOSw5NWwyMjAuOS0yNTAuNWMxMi41LTIwLDM4LjgtMjYuMSw1OC44LTEzLjZjMjAsMTIuNCwyNi4xLDM4LjcsMTMuNiw1OC44TDI3MCw1OTBjLTcuNCwxMi0yMC4yLDE5LjQtMzQuMywyMC4xQzIzNS4xLDYxMC4xLDIzNC41LDYxMC4xLDIzMy44LDYxMC4xeiIvPjwvc3ZnPg=="; -$form-icon-warning: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9Ildhcm5pbmciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgNjEyIDc5MiIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgNjEyIDc5MiIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PHBhdGggZmlsbD0iI0YwQUQ0RSIgZD0iTTYwMyw2NDAuMmwtMjc4LjUtNTA5Yy0zLjgtNi42LTEwLjgtMTAuNi0xOC41LTEwLjZzLTE0LjcsNC4xLTE4LjUsMTAuNkw5LDY0MC4yYy0zLjcsNi41LTMuNiwxNC40LDAuMiwyMC44YzMuOCw2LjUsMTAuOCwxMC40LDE4LjMsMTAuNGg1NTcuMWM3LjUsMCwxNC41LTMuOSwxOC4zLTEwLjRDNjA2LjYsNjU0LjYsNjA2LjcsNjQ2LjYsNjAzLDY0MC4yeiBNMzM2LjYsNjEwLjJoLTYxLjJWNTQ5aDYxLjJWNjEwLjJ6IE0zMzYuNiw1MDMuMWgtNjEuMlYzMDQuMmg2MS4yVjUwMy4xeiIvPjwvc3ZnPg=="; -$form-icon-error: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkNyb3NzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDYxMiA3OTIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDYxMiA3OTIiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxwYXRoIGZpbGw9IiNEOTUzNEYiIGQ9Ik00NDcsNTQ0LjRjLTE0LjQsMTQuNC0zNy42LDE0LjQtNTEuOSwwTDMwNiw0NTEuN2wtODkuMSw5Mi43Yy0xNC40LDE0LjQtMzcuNiwxNC40LTUxLjksMGMtMTQuNC0xNC40LTE0LjQtMzcuNiwwLTUxLjlsOTIuNC05Ni40TDE2NSwyOTkuNmMtMTQuNC0xNC40LTE0LjQtMzcuNiwwLTUxLjlzMzcuNi0xNC40LDUxLjksMGw4OS4yLDkyLjdsODkuMS05Mi43YzE0LjQtMTQuNCwzNy42LTE0LjQsNTEuOSwwYzE0LjQsMTQuNCwxNC40LDM3LjYsMCw1MS45TDM1NC43LDM5Nmw5Mi40LDk2LjRDNDYxLjQsNTA2LjgsNDYxLjQsNTMwLDQ0Nyw1NDQuNHoiLz48L3N2Zz4="; +$form-icon-success: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkNoZWNrIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDYxMiA3OTIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDYxMiA3OTIiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxwYXRoIGZpbGw9IiM1Q0I4NUMiIGQ9Ik0yMzMuOCw2MTAuMWMtMTMuMywwLTI1LjktNi4yLTM0LTE2LjlMOTAuNSw0NDguOEM3Ni4zLDQzMCw4MCw0MDMuMyw5OC44LDM4OS4xYzE4LjgtMTQuMyw0NS41LTEwLjUsNTkuOCw4LjNsNzEuOSw5NWwyMjAuOS0yNTAuNWMxMi41LTIwLDM4LjgtMjYuMSw1OC44LTEzLjZjMjAsMTIuNCwyNi4xLDM4LjcsMTMuNiw1OC44TDI3MCw1OTBjLTcuNCwxMi0yMC4yLDE5LjQtMzQuMywyMC4xQzIzNS4xLDYxMC4xLDIzNC41LDYxMC4xLDIzMy44LDYxMC4xeiIvPjwvc3ZnPg==" !default; +$form-icon-warning: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9Ildhcm5pbmciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgNjEyIDc5MiIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgNjEyIDc5MiIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PHBhdGggZmlsbD0iI0YwQUQ0RSIgZD0iTTYwMyw2NDAuMmwtMjc4LjUtNTA5Yy0zLjgtNi42LTEwLjgtMTAuNi0xOC41LTEwLjZzLTE0LjcsNC4xLTE4LjUsMTAuNkw5LDY0MC4yYy0zLjcsNi41LTMuNiwxNC40LDAuMiwyMC44YzMuOCw2LjUsMTAuOCwxMC40LDE4LjMsMTAuNGg1NTcuMWM3LjUsMCwxNC41LTMuOSwxOC4zLTEwLjRDNjA2LjYsNjU0LjYsNjA2LjcsNjQ2LjYsNjAzLDY0MC4yeiBNMzM2LjYsNjEwLjJoLTYxLjJWNTQ5aDYxLjJWNjEwLjJ6IE0zMzYuNiw1MDMuMWgtNjEuMlYzMDQuMmg2MS4yVjUwMy4xeiIvPjwvc3ZnPg==" !default; +$form-icon-error: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkNyb3NzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDYxMiA3OTIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDYxMiA3OTIiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxwYXRoIGZpbGw9IiNEOTUzNEYiIGQ9Ik00NDcsNTQ0LjRjLTE0LjQsMTQuNC0zNy42LDE0LjQtNTEuOSwwTDMwNiw0NTEuN2wtODkuMSw5Mi43Yy0xNC40LDE0LjQtMzcuNiwxNC40LTUxLjksMGMtMTQuNC0xNC40LTE0LjQtMzcuNiwwLTUxLjlsOTIuNC05Ni40TDE2NSwyOTkuNmMtMTQuNC0xNC40LTE0LjQtMzcuNiwwLTUxLjlzMzcuNi0xNC40LDUxLjksMGw4OS4yLDkyLjdsODkuMS05Mi43YzE0LjQtMTQuNCwzNy42LTE0LjQsNTEuOSwwYzE0LjQsMTQuNCwxNC40LDM3LjYsMCw1MS45TDM1NC43LDM5Nmw5Mi40LDk2LjRDNDYxLjQsNTA2LjgsNDYxLjQsNTMwLDQ0Nyw1NDQuNHoiLz48L3N2Zz4=" !default; // Dropdowns @@ -341,15 +341,15 @@ $navbar-border-radius: $border-radius !default; $navbar-padding-horizontal: $spacer !default; $navbar-padding-vertical: ($spacer / 2) !default; -$navbar-dark-color: rgba(255,255,255,.5); -$navbar-dark-hover-color: rgba(255,255,255,.75); -$navbar-dark-active-color: rgba(255,255,255,1); -$navbar-dark-disabled-color: rgba(255,255,255,.25); +$navbar-dark-color: rgba(255,255,255,.5) !default; +$navbar-dark-hover-color: rgba(255,255,255,.75) !default; +$navbar-dark-active-color: rgba(255,255,255,1) !default; +$navbar-dark-disabled-color: rgba(255,255,255,.25) !default; -$navbar-light-color: rgba(0,0,0,.3); -$navbar-light-hover-color: rgba(0,0,0,.6); -$navbar-light-active-color: rgba(0,0,0,.8); -$navbar-light-disabled-color: rgba(0,0,0,.15); +$navbar-light-color: rgba(0,0,0,.3) !default; +$navbar-light-hover-color: rgba(0,0,0,.6) !default; +$navbar-light-active-color: rgba(0,0,0,.8) !default; +$navbar-light-disabled-color: rgba(0,0,0,.15) !default; // Navs @@ -445,12 +445,12 @@ $state-danger-border: darken($state-danger-bg, 5%) !default; // Cards -$card-spacer-x: 1.25rem; -$card-spacer-y: .75rem; -$card-border-width: .0625rem; -$card-border-radius: .25rem; -$card-border-color: #e5e5e5; -$card-border-radius-inner: ($card-border-radius - $card-border-width); +$card-spacer-x: 1.25rem !default; +$card-spacer-y: .75rem !default; +$card-border-width: .0625rem !default; +$card-border-radius: .25rem !default; +$card-border-color: #e5e5e5 !default; +$card-border-radius-inner: ($card-border-radius - $card-border-width) !default; $card-cap-bg: #f5f5f5; diff --git a/assets/stylesheets/bootstrap/mixins/_buttons.scss b/assets/stylesheets/bootstrap/mixins/_buttons.scss index 75d2847..c64f0e8 100644 --- a/assets/stylesheets/bootstrap/mixins/_buttons.scss +++ b/assets/stylesheets/bootstrap/mixins/_buttons.scss @@ -4,36 +4,46 @@ // and disabled options for all buttons @mixin button-variant($color, $background, $border) { + $active-background: darken($background, 10%); + $active-border: darken($border, 12%); + color: $color; background-color: $background; border-color: $border; -// $shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075); -// .box-shadow($shadow); - - $active-background: darken($background, 10%); - $active-border: darken($border, 12%); + @include box-shadow(inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075)); - &:focus, - &.focus, - &:active, - &.active, - .open > &.dropdown-toggle { + @include hover { color: $color; background-color: $active-background; border-color: $active-border; } - @include hover { + + &:focus, + &.focus { color: $color; background-color: $active-background; border-color: $active-border; } + &:active, &.active, .open > &.dropdown-toggle { + color: $color; + background-color: $active-background; + border-color: $active-border; // Remove the gradient for the pressed/active state background-image: none; @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); + + &:hover, + &:focus, + &.focus { + color: $color; + background-color: darken($background, 17%); + border-color: darken($border, 25%); + } } + &.disabled, &:disabled, fieldset[disabled] & { diff --git a/assets/stylesheets/bootstrap/mixins/_clearfix.scss b/assets/stylesheets/bootstrap/mixins/_clearfix.scss index dc3e2ab..439455f 100644 --- a/assets/stylesheets/bootstrap/mixins/_clearfix.scss +++ b/assets/stylesheets/bootstrap/mixins/_clearfix.scss @@ -1,22 +1,7 @@ -// Clearfix -// -// For modern browsers -// 1. The space content is one way to avoid an Opera bug when the -// contenteditable attribute is included anywhere else in the document. -// Otherwise it causes space to appear at the top and bottom of elements -// that are clearfixed. -// 2. The use of `table` rather than `block` is only necessary if using -// `:before` to contain the top-margins of child elements. -// -// Source: http://nicolasgallagher.com/micro-clearfix-hack/ - @mixin clearfix() { - &:before, - &:after { - content: " "; // 1 - display: table; // 2 - } &:after { + content: ""; + display: table; clear: both; } } diff --git a/assets/stylesheets/bootstrap/mixins/_image.scss b/assets/stylesheets/bootstrap/mixins/_image.scss index bec9626..e5ae10a 100644 --- a/assets/stylesheets/bootstrap/mixins/_image.scss +++ b/assets/stylesheets/bootstrap/mixins/_image.scss @@ -19,7 +19,7 @@ // Short retina mixin for setting background-image and -size. @mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) { - background-image: url("#{file-1x}"); + background-image: url($file-1x); @media only screen and (-webkit-min-device-pixel-ratio: 2), @@ -27,7 +27,7 @@ only screen and ( min-device-pixel-ratio: 2), only screen and ( min-resolution: 192dpi), only screen and ( min-resolution: 2dppx) { - background-image: url("#{file-2x}"); + background-image: url($file-2x); background-size: $width-1x $height-1x; } } diff --git a/assets/stylesheets/bootstrap/mixins/_list-group.scss b/assets/stylesheets/bootstrap/mixins/_list-group.scss index a40dda9..81b0f16 100644 --- a/assets/stylesheets/bootstrap/mixins/_list-group.scss +++ b/assets/stylesheets/bootstrap/mixins/_list-group.scss @@ -1,13 +1,13 @@ // List Groups @mixin list-group-item-variant($state, $background, $color) { - .list-group-item-#{state} { + .list-group-item-#{$state} { color: $color; background-color: $background; } - a.list-group-item-#{state}, - button.list-group-item-#{state} { + a.list-group-item-#{$state}, + button.list-group-item-#{$state} { color: $color; .list-group-item-heading { |