From 045888fa3887f5e65658499da11c8ad737222759 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 6 Jan 2017 08:38:04 -0800 Subject: version bump --- scss/bootstrap.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scss') diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index 8cce876de..88a60cafa 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap v4.0.0-alpha.5 (https://getbootstrap.com) + * Bootstrap v4.0.0-alpha.6 (https://getbootstrap.com) * Copyright 2011-2017 The Bootstrap Authors * Copyright 2011-2017 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) -- cgit v1.2.3 From e7035aee3fc04fb92af47ba07bf16b942ba71797 Mon Sep 17 00:00:00 2001 From: Zulfiqar Ali Date: Sat, 7 Jan 2017 23:38:43 -0500 Subject: _custom.scss should be the first include --- scss/bootstrap.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scss') diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index 88a60cafa..e47021ce9 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -6,9 +6,9 @@ */ // Core variables and mixins +@import "custom"; @import "variables"; @import "mixins"; -@import "custom"; // Reset and dependencies @import "normalize"; -- cgit v1.2.3 From 2f429fbd778ecbc4d35738ed55ff54f2d27d35e1 Mon Sep 17 00:00:00 2001 From: Rishabh Rajgarhia Date: Sat, 7 Jan 2017 20:56:21 +0530 Subject: Update breakpoints in breakpoints.scss comments --- scss/mixins/_breakpoints.scss | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'scss') diff --git a/scss/mixins/_breakpoints.scss b/scss/mixins/_breakpoints.scss index 6fd2e8e1e..904b60f7a 100644 --- a/scss/mixins/_breakpoints.scss +++ b/scss/mixins/_breakpoints.scss @@ -2,7 +2,7 @@ // // Breakpoints are defined as a map of (name: minimum width), order from small to large: // -// (xs: 0, sm: 576px, md: 768px) +// (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px) // // The map defined in the `$grid-breakpoints` global variable is used as the `$breakpoints` argument by default. @@ -10,9 +10,9 @@ // // >> breakpoint-next(sm) // md -// >> breakpoint-next(sm, (xs: 0, sm: 576px, md: 768px)) +// >> breakpoint-next(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)) // md -// >> breakpoint-next(sm, $breakpoint-names: (xs sm md)) +// >> breakpoint-next(sm, $breakpoint-names: (xs sm md lg xl)) // md @function breakpoint-next($name, $breakpoints: $grid-breakpoints, $breakpoint-names: map-keys($breakpoints)) { $n: index($breakpoint-names, $name); @@ -21,7 +21,7 @@ // Minimum breakpoint width. Null for the smallest (first) breakpoint. // -// >> breakpoint-min(sm, (xs: 0, sm: 576px, md: 768px)) +// >> breakpoint-min(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)) // 576px @function breakpoint-min($name, $breakpoints: $grid-breakpoints) { $min: map-get($breakpoints, $name); @@ -31,7 +31,7 @@ // Maximum breakpoint width. Null for the largest (last) breakpoint. // The maximum value is calculated as the minimum of the next one less 0.1. // -// >> breakpoint-max(sm, (xs: 0, sm: 576px, md: 768px)) +// >> breakpoint-max(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)) // 767px @function breakpoint-max($name, $breakpoints: $grid-breakpoints) { $next: breakpoint-next($name, $breakpoints); @@ -41,9 +41,9 @@ // Returns a blank string if smallest breakpoint, otherwise returns the name with a dash infront. // Useful for making responsive utilities. // -// >> breakpoint-infix(xs, (xs: 0, sm: 576px, md: 768px)) +// >> breakpoint-infix(xs, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)) // "" (Returns a blank string) -// >> breakpoint-infix(sm, (xs: 0, sm: 576px, md: 768px)) +// >> breakpoint-infix(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)) // "-sm" @function breakpoint-infix($name, $breakpoints: $grid-breakpoints) { @return if(breakpoint-min($name, $breakpoints) == null, "", "-#{$name}"); -- cgit v1.2.3 From fc82352594ba94ed415003acf79b727b86917d6a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Jan 2017 21:23:38 -0800 Subject: fixes #21625, closes #21539 don't set focus styles on the anchor, just set hover styles --- scss/_reboot.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scss') diff --git a/scss/_reboot.scss b/scss/_reboot.scss index 557829f25..266ed7819 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -164,7 +164,7 @@ a { color: $link-color; text-decoration: $link-decoration; - @include hover-focus { + @include hover { color: $link-hover-color; text-decoration: $link-hover-decoration; } -- cgit v1.2.3 From d7af46359b14340265e02243e2f0a9d8aa1fce50 Mon Sep 17 00:00:00 2001 From: Christian Oliff Date: Tue, 10 Jan 2017 20:36:50 +0900 Subject: Remove filter: alpha(opacity = 0); Not needed (and all other old IE filter attributes have been removed from the CSS. This was the only one remaining --- scss/_custom-forms.scss | 1 - 1 file changed, 1 deletion(-) (limited to 'scss') diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index ef2aab354..3bc02a239 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -208,7 +208,6 @@ max-width: 100%; height: $custom-file-height; margin: 0; - filter: alpha(opacity = 0); opacity: 0; &:focus ~ .custom-file-control { -- cgit v1.2.3 From a3bc607c1080df2d0bbca03c613aa9e992acb722 Mon Sep 17 00:00:00 2001 From: Pierre-Denis Vanduynslager Date: Mon, 16 Jan 2017 00:35:18 -0500 Subject: Remove unused scss variables (#21579) * Remove unused scss variables * Remove unnecessary space * Remove $zindex-navbar from docs * Re-add $progress-box-shadow --- scss/_variables.scss | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index 36dc429c8..0f4c56f93 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -183,9 +183,6 @@ $sizes: ( $body-bg: $white !default; $body-color: $gray-dark !default; -$inverse-bg: $gray-dark !default; -$inverse-color: $gray-lighter !default; - // Links // @@ -245,7 +242,6 @@ $grid-gutter-widths: ( // Font, line-height, and color for body text, headings, and more. $font-family-sans-serif: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default; -$font-family-serif: Georgia, "Times New Roman", Times, serif !default; $font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default; $font-family-base: $font-family-sans-serif !default; @@ -291,8 +287,6 @@ $small-font-size: 80% !default; $text-muted: $gray-light !default; -$abbr-border-color: $gray-light !default; - $blockquote-small-color: $gray-light !default; $blockquote-font-size: ($font-size-base * 1.25) !default; $blockquote-border-color: $gray-lighter !default; @@ -400,7 +394,6 @@ $btn-padding-x-lg: 1.5rem !default; $btn-padding-y-lg: .75rem !default; $btn-block-spacing-y: .5rem !default; -$btn-toolbar-margin: .5rem !default; // Allows for customizing button radius independently from global border radius $btn-border-radius: $border-radius !default; @@ -469,7 +462,6 @@ $custom-control-spacer-x: 1rem !default; $custom-control-spacer-y: .25rem !default; $custom-control-indicator-size: 1rem !default; -$custom-control-indicator-margin-y: (($line-height-base * 1rem) - $custom-control-indicator-size) / -2 !default; $custom-control-indicator-bg: #ddd !default; $custom-control-indicator-bg-size: 50% 50% !default; $custom-control-indicator-box-shadow: inset 0 .25rem .25rem rgba($black,.1) !default; @@ -517,7 +509,6 @@ $custom-select-border-radius: $border-radius !default; $custom-select-focus-border-color: lighten($brand-primary, 25%) !default; $custom-select-focus-box-shadow: inset 0 1px 2px rgba($black, .075), 0 0 5px rgba($custom-select-focus-border-color, .5) !default; -$custom-select-sm-padding-y: .2rem !default; $custom-select-sm-font-size: 75% !default; $custom-file-height: 2.5rem !default; @@ -589,7 +580,6 @@ $dropdown-header-color: $gray-light !default; // of components dependent on the z-axis and are designed to all work together. $zindex-dropdown-backdrop: 990 !default; -$zindex-navbar: 1000 !default; $zindex-dropdown: 1000 !default; $zindex-fixed: 1030 !default; $zindex-sticky: 1030 !default; @@ -598,15 +588,11 @@ $zindex-modal: 1050 !default; $zindex-popover: 1060 !default; $zindex-tooltip: 1070 !default; - // Navbar -$navbar-border-radius: $border-radius !default; $navbar-padding-x: $spacer !default; $navbar-padding-y: ($spacer / 2) !default; -$navbar-brand-padding-y: .25rem !default; - $navbar-toggler-padding-x: .75rem !default; $navbar-toggler-padding-y: .25rem !default; $navbar-toggler-font-size: $font-size-lg !default; @@ -628,10 +614,7 @@ $navbar-light-toggler-border: rgba($black,.1) !default; // Navs -$nav-item-margin: .2rem !default; -$nav-item-inline-spacer: 1rem !default; $nav-link-padding: .5em 1em !default; -$nav-link-hover-bg: $gray-lighter !default; $nav-disabled-link-color: $gray-light !default; $nav-tabs-border-color: #ddd !default; @@ -641,8 +624,6 @@ $nav-tabs-link-hover-border-color: $gray-lighter !default; $nav-tabs-active-link-hover-color: $gray !default; $nav-tabs-active-link-hover-bg: $body-bg !default; $nav-tabs-active-link-hover-border-color: #ddd !default; -$nav-tabs-justified-link-border-color: #ddd !default; -$nav-tabs-justified-active-link-border-color: $body-bg !default; $nav-pills-border-radius: $border-radius !default; $nav-pills-active-link-color: $component-active-color !default; @@ -943,7 +924,6 @@ $close-font-weight: $font-weight-bold !default; $close-color: $black !default; $close-text-shadow: 0 1px 0 $white !default; - // Code $code-font-size: 90% !default; @@ -955,7 +935,5 @@ $code-bg: $gray-lightest !default; $kbd-color: $white !default; $kbd-bg: $gray-dark !default; -$pre-bg: $gray-lightest !default; $pre-color: $gray-dark !default; -$pre-border-color: #ccc !default; $pre-scrollable-max-height: 340px !default; -- cgit v1.2.3 From d6a5439a8cc7cb3f916efb36bf785bdbd836858d Mon Sep 17 00:00:00 2001 From: Pierre-Denis Vanduynslager Date: Mon, 16 Jan 2017 00:36:15 -0500 Subject: Remove list-group-item-heading and list-group-item-text (#21653) --- scss/_list-group.scss | 23 ----------------------- scss/_variables.scss | 3 --- scss/mixins/_list-group.scss | 4 ---- 3 files changed, 30 deletions(-) (limited to 'scss') diff --git a/scss/_list-group.scss b/scss/_list-group.scss index ec813c807..bb8a8d103 100644 --- a/scss/_list-group.scss +++ b/scss/_list-group.scss @@ -22,10 +22,6 @@ color: $list-group-link-color; text-align: inherit; // For `