From: Catalin Zalog Date: Sun, 16 Sep 2018 21:32:11 +0000 (+0300) Subject: _variables.scss comments/spacing consistency (#27247) X-Git-Tag: v4.2.0~314 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=928ebd89254300aee284fc78b84c8a57de188d71;p=thirdparty%2Fbootstrap.git _variables.scss comments/spacing consistency (#27247) * style: `_variables.scss` comments consistency * style: `_variables.scss` spacing consistency --- diff --git a/scss/_variables.scss b/scss/_variables.scss index 8cf67a18c8..05e0a5b21c 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -4,9 +4,7 @@ // consistent naming. Ex: $nav-link-disabled-color and $modal-content-box-shadow-xs. -// // Color system -// $white: #fff !default; $gray-100: #f8f9fa !default; @@ -37,7 +35,6 @@ $grays: map-merge( $grays ); - $blue: #007bff !default; $indigo: #6610f2 !default; $purple: #6f42c1 !default; @@ -105,6 +102,7 @@ $yiq-contrasted-threshold: 150 !default; $yiq-text-dark: $gray-900 !default; $yiq-text-light: $white !default; + // Options // // Quickly modify global styling by enabling or disabling optional features. @@ -119,6 +117,7 @@ $enable-grid-classes: true !default; $enable-print-styles: true !default; $enable-validation-icons: true !default; + // Spacing // // Control the default styling of most Bootstrap elements by modifying these @@ -154,6 +153,7 @@ $sizes: map-merge( $sizes ); + // Body // // Settings for the `` element. @@ -161,6 +161,7 @@ $sizes: map-merge( $body-bg: $white !default; $body-color: $gray-900 !default; + // Links // // Style anchor elements. @@ -170,6 +171,7 @@ $link-decoration: none !default; $link-hover-color: darken($link-color, 15%) !default; $link-hover-decoration: underline !default; + // Paragraphs // // Style p element. @@ -215,6 +217,7 @@ $container-max-widths: ( $grid-columns: 12 !default; $grid-gutter-width: 30px !default; + // Components // // Define common padding and border radius sizes and more. @@ -346,6 +349,7 @@ $table-striped-order: odd !default; $table-caption-color: $text-muted !default; + // Buttons + Forms // // Shared variables that are reassigned to `$input-` and `$btn-` specific variables. @@ -580,6 +584,7 @@ $custom-file-text: ( // Form validation + $form-feedback-margin-top: $form-text-margin-top !default; $form-feedback-font-size: $small-font-size !default; $form-feedback-valid-color: theme-color("success") !default; @@ -633,6 +638,7 @@ $zindex-modal: 1050 !default; $zindex-popover: 1060 !default; $zindex-tooltip: 1070 !default; + // Navs $nav-link-padding-y: .5rem !default; @@ -654,6 +660,7 @@ $nav-pills-link-active-bg: $component-active-bg !default; $nav-divider-color: $gray-200 !default; $nav-divider-margin-y: ($spacer / 2) !default; + // Navbar $navbar-padding-y: ($spacer / 2) !default; @@ -870,6 +877,7 @@ $progress-bar-bg: theme-color("primary") !default; $progress-bar-animation-timing: 1s linear infinite !default; $progress-bar-transition: width .6s ease !default; + // List group $list-group-bg: $white !default; @@ -958,6 +966,7 @@ $close-font-weight: $font-weight-bold !default; $close-color: $black !default; $close-text-shadow: 0 1px 0 $white !default; + // Code $code-font-size: 87.5% !default; @@ -974,5 +983,6 @@ $pre-scrollable-max-height: 340px !default; // Printing + $print-page-size: a3 !default; $print-body-min-width: map-get($grid-breakpoints, "lg") !default;