Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
2ccb5492
Commit
2ccb5492
authored
7 years ago
by
Catalin Zalog
Committed by
XhmikosR
7 years ago
Browse files
Options
Download
Email Patches
Plain Diff
style: align some vars (#25785)
parent
817b80d5
main
cleanup-floating-forms
cssvar-function
dependabot/npm_and_yarn/stylelint-and-stylelint-config-twbs-bootstrap-15.3.0
extend-snippets
feat/data-target
floating-always-visible
floating-labels-icons
fod-main-banner
form-controls-with-icons
github/fork/719media/patch-13
github/fork/719media/patch-14
github/fork/719media/patch-9
github/fork/ChellyAhmed/fix-typo-reboot.md
github/fork/ChellyAhmed/offcanvas-scroll-back
github/fork/CtrlAltLilith/main
github/fork/Elysiome/offcanvas-optional-window-resizing
github/fork/JanSargsyan/main
github/fork/LunicLynx/support-different-line-height-for-buttons
github/fork/Psixodelik/main
github/fork/Ronid1/ronid1/offcanvas_static_backdrop
github/fork/RyanBerliner/tooltip-accessibility
github/fork/SantiagoPVazquez/Feature-default-border-bottom-to-dropdown-item
github/fork/Sir-Genius/utils
github/fork/Sumit-Singh-8/main
github/fork/Viktor-VERA2020/offcanvas-slide
github/fork/Zivangu9/input-group-for-form-control-plaintext
github/fork/alpadev/alpadev/call-dispose-on-component-reinstantiation
github/fork/astagi/fix/tree-shake-modules
github/fork/compnerd/dark-accordion-icon
github/fork/derSascha/dropdown-dont-close-on-input-click
github/fork/dev-ph1l/main
github/fork/donquixote/issue-33861-utl-mixin
github/fork/florianlacreuse/mixin-make-row-gutter-y
github/fork/gregorw/main
github/fork/iteggmbh/transitionend-dispose-race
github/fork/jdelStrother/patch-1
github/fork/jonnysp/form-floating
github/fork/jonnysp/independent-offcanvas
github/fork/jonnysp/theme-dark-on-card-and-modal-fix
github/fork/josefdlange/floating-label-placeholder-opacity
github/fork/julien-deramond/enhance-change-version.js
github/fork/julien-deramond/main-jd-fix-offset-content
github/fork/julien-deramond/main-jd-issue-with-utitlies
github/fork/julien-deramond/main-xmr-pa11y-ci-jd-add-hideElements
github/fork/kyletsang/fix-tooltip-padding
github/fork/lacutah/CheckboxCenteringDocumentation
github/fork/lekoala/patch-3
github/fork/louismaximepiton/main-kld-lmp-collapse-proposal
github/fork/louismaximepiton/main-lmp-card-inner-border-radius-fix
github/fork/louismaximepiton/main-lmp-carousel-multiple-images
github/fork/louismaximepiton/main-lmp-css-var-init
github/fork/louismaximepiton/main-lmp-disabled-floating-label-fix
github/fork/louismaximepiton/main-lmp-input-range-fix
github/fork/louismaximepiton/main-lmp-shift-color
github/fork/louismaximepiton/main-lmp-table-active-tr-fix
github/fork/maciek-szn/switch
github/fork/michael-roth/feature/19964-multiple-tab-targets
github/fork/mistic100/dom-utils
github/fork/nkdas91/accordion
github/fork/nstungcom/fix-missing-modal-open-class
github/fork/oraliahdz/animation-utilities
github/fork/pine3ree/patch-7
github/fork/pouwerkerk/unindent-scss-docs-shortcode
github/fork/smares/smares-no-scolling-on-modal-close
github/fork/tgm-git/patch-1
gs-forms
gs-toasts-with-animated-progress-bar
gs/add-history-helper
gs/change-version-dir-on-docs
gs/data-must-set-onlu-one-instance
gs/docs/fix-drop-down-error
gs/event-handler-2
gs/make-docs-js-build
gs/make-simple-attribute-toggler
gs/popover-fix-doc
gs/provide-steConfig-method
gs/scrollspy-smoothscroll-option-use-browser-history
gs/streamline-jqueryInterface
gs/support-drop-down-in-navbar
gs/test-js-generic-trigger
gs/try-web-components
gs/tweak-collapse-js-selector
gs/use-event-handler-in-cocmponent
gs/use-rollup-replace-for-version
jo-docs-thanks-page
jo-ssr-friendly
logical-props-spacing-utils
main-fod-disabled-form-check-label
main-fod-nested-accordion
main-fod-simpler-table-structure
main-fod-table-separator
main-fod-utilities-contrast
main-jd-abbr-title
main-jd-add-chips
main-jd-add-doc-for-sass-custom-colors
main-jd-add-enable-host-to-handle-web-components
main-jd-browserstack-fine-tune
main-jd-browserstack-updates
main-jd-docs-consistent-usage-of-css-sections-step-2
main-jd-fix-docs-headers-in-white
main-jd-fix-highlight-docs-border-radius
main-jd-fix-placeholder-color-background-params-for-img-markup
main-jd-glossary-experiment
main-jd-postcss-drop-empty-css-vars
main-jd-proto-doc-astro
main-jd-skip-navigation-component
main-jd-stackblitz-for-examples
main-jd-upgrade-browserlistrc
main-jd-use-host
main-lmp-dark-theme-customization
main-lmp-handle-scroll-target
main-lmp-tab-fix
main-mc-opensearch
main-xmr-bundlewatch-action
main-xmr-eslint-plugin-compat
main-xmr-hugo-docs-vendor
main-xmr-hugo-rm-ver
main-xmr-linkinator-prod
main-xmr-min-mangle
main-xmr-pa11y-ci
more-darkmode-examples
nested-dropdowns
patrickhlauke-issue37428
patrickhlauke-use-of-color-tweaks
pr/34102
pr/37590
previous-next-docs-links
sticky-thead
utilities-functions-mixin
v4-dev
v4-dev-dropdown-hide-method
v530-dev
v6-postcss-custom-media
v6-spinner-dots
v6/gs/use-floating-ui-in-place-of-popper
xmr/dev
xmr/docs-png
xmr/docs-svgs
xmr/hugo-reorg-files
xmr/js-2
xmr/markdownlint
xmr/prepare-530-alpha2
xmr/xo
v5.3.0-alpha1
v5.2.3
v5.2.2
v5.2.1
v5.2.0
v5.2.0-beta1
v5.1.3
v5.1.2
v5.1.1
v5.1.0
v5.0.2
v5.0.1
v5.0.0
v5.0.0-beta3
v5.0.0-beta2
v5.0.0-beta1
v5.0.0-alpha3
v5.0.0-alpha2
v5.0.0-alpha1
v4.6.2
v4.6.1
v4.6.0
v4.5.3
v4.5.2
v4.5.1
v4.5.0
v4.4.1
v4.4.0
v4.3.1
v4.3.0
v4.2.1
v4.2.0
v4.1.3
v4.1.2
v4.1.1
v4.1.0
3 merge requests
!28721
Hot test
,
!27561
Adds font-weight-medium to font weight classes
,
!17021
v4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
scss/_variables.scss
+38
-38
scss/_variables.scss
with
38 additions
and
38 deletions
+38
-38
scss/_variables.scss
+
38
-
38
View file @
2ccb5492
...
@@ -88,11 +88,11 @@ $theme-colors: map-merge((
...
@@ -88,11 +88,11 @@ $theme-colors: map-merge((
$theme-color-interval
:
8%
!
default
;
$theme-color-interval
:
8%
!
default
;
// The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255.
// The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255.
$yiq-contrasted-threshold
:
150
!
default
;
$yiq-contrasted-threshold
:
150
!
default
;
// Customize the light and dark text colors for use in our YIQ color contrast function.
// Customize the light and dark text colors for use in our YIQ color contrast function.
$yiq-text-dark
:
$gray-900
!
default
;
$yiq-text-dark
:
$gray-900
!
default
;
$yiq-text-light
:
$white
!
default
;
$yiq-text-light
:
$white
!
default
;
// Options
// Options
//
//
...
@@ -456,7 +456,7 @@ $custom-control-indicator-bg-size: 50% 50% !default;
...
@@ -456,7 +456,7 @@ $custom-control-indicator-bg-size: 50% 50% !default;
$custom-control-indicator-box-shadow
:
inset
0
.25rem
.25rem
rgba
(
$black
,
.1
)
!
default
;
$custom-control-indicator-box-shadow
:
inset
0
.25rem
.25rem
rgba
(
$black
,
.1
)
!
default
;
$custom-control-indicator-disabled-bg
:
$gray-200
!
default
;
$custom-control-indicator-disabled-bg
:
$gray-200
!
default
;
$custom-control-label-disabled-color
:
$gray-600
!
default
;
$custom-control-label-disabled-color
:
$gray-600
!
default
;
$custom-control-indicator-checked-color
:
$component-active-color
!
default
;
$custom-control-indicator-checked-color
:
$component-active-color
!
default
;
$custom-control-indicator-checked-bg
:
$component-active-bg
!
default
;
$custom-control-indicator-checked-bg
:
$component-active-bg
!
default
;
...
@@ -472,16 +472,16 @@ $custom-control-indicator-active-box-shadow: none !default;
...
@@ -472,16 +472,16 @@ $custom-control-indicator-active-box-shadow: none !default;
$custom-checkbox-indicator-border-radius
:
$border-radius
!
default
;
$custom-checkbox-indicator-border-radius
:
$border-radius
!
default
;
$custom-checkbox-indicator-icon-checked
:
str-replace
(
url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='
#{
$custom-control-indicator-checked-color
}
' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E")
,
"#"
,
"%23"
)
!
default
;
$custom-checkbox-indicator-icon-checked
:
str-replace
(
url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='
#{
$custom-control-indicator-checked-color
}
' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E")
,
"#"
,
"%23"
)
!
default
;
$custom-checkbox-indicator-indeterminate-bg
:
$component-active-bg
!
default
;
$custom-checkbox-indicator-indeterminate-bg
:
$component-active-bg
!
default
;
$custom-checkbox-indicator-indeterminate-color
:
$custom-control-indicator-checked-color
!
default
;
$custom-checkbox-indicator-indeterminate-color
:
$custom-control-indicator-checked-color
!
default
;
$custom-checkbox-indicator-icon-indeterminate
:
str-replace
(
url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='
#{
$custom-checkbox-indicator-indeterminate-color
}
' d='M0 2h4'/%3E%3C/svg%3E")
,
"#"
,
"%23"
)
!
default
;
$custom-checkbox-indicator-icon-indeterminate
:
str-replace
(
url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='
#{
$custom-checkbox-indicator-indeterminate-color
}
' d='M0 2h4'/%3E%3C/svg%3E")
,
"#"
,
"%23"
)
!
default
;
$custom-checkbox-indicator-indeterminate-box-shadow
:
none
!
default
;
$custom-checkbox-indicator-indeterminate-box-shadow
:
none
!
default
;
$custom-radio-indicator-border-radius
:
50%
!
default
;
$custom-radio-indicator-border-radius
:
50%
!
default
;
$custom-radio-indicator-icon-checked
:
str-replace
(
url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='
#{
$custom-control-indicator-checked-color
}
'/%3E%3C/svg%3E")
,
"#"
,
"%23"
)
!
default
;
$custom-radio-indicator-icon-checked
:
str-replace
(
url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='
#{
$custom-control-indicator-checked-color
}
'/%3E%3C/svg%3E")
,
"#"
,
"%23"
)
!
default
;
$custom-select-padding-y
:
.375rem
!
default
;
$custom-select-padding-y
:
.375rem
!
default
;
$custom-select-padding-x
:
.75rem
!
default
;
$custom-select-padding-x
:
.75rem
!
default
;
$custom-select-height
:
$input-height
!
default
;
$custom-select-height
:
$input-height
!
default
;
$custom-select-indicator-padding
:
1rem
!
default
;
// Extra padding to account for the presence of the background-image based indicator
$custom-select-indicator-padding
:
1rem
!
default
;
// Extra padding to account for the presence of the background-image based indicator
$custom-select-line-height
:
$input-btn-line-height
!
default
;
$custom-select-line-height
:
$input-btn-line-height
!
default
;
...
@@ -701,19 +701,19 @@ $card-columns-margin: $card-spacer-y !default;
...
@@ -701,19 +701,19 @@ $card-columns-margin: $card-spacer-y !default;
// Tooltips
// Tooltips
$tooltip-font-size
:
$font-size-sm
!
default
;
$tooltip-font-size
:
$font-size-sm
!
default
;
$tooltip-max-width
:
200px
!
default
;
$tooltip-max-width
:
200px
!
default
;
$tooltip-color
:
$white
!
default
;
$tooltip-color
:
$white
!
default
;
$tooltip-bg
:
$black
!
default
;
$tooltip-bg
:
$black
!
default
;
$tooltip-border-radius
:
$border-radius
!
default
;
$tooltip-border-radius
:
$border-radius
!
default
;
$tooltip-opacity
:
.9
!
default
;
$tooltip-opacity
:
.9
!
default
;
$tooltip-padding-y
:
.25rem
!
default
;
$tooltip-padding-y
:
.25rem
!
default
;
$tooltip-padding-x
:
.5rem
!
default
;
$tooltip-padding-x
:
.5rem
!
default
;
$tooltip-margin
:
0
!
default
;
$tooltip-margin
:
0
!
default
;
$tooltip-arrow-width
:
.8rem
!
default
;
$tooltip-arrow-width
:
.8rem
!
default
;
$tooltip-arrow-height
:
.4rem
!
default
;
$tooltip-arrow-height
:
.4rem
!
default
;
$tooltip-arrow-color
:
$tooltip-bg
!
default
;
$tooltip-arrow-color
:
$tooltip-bg
!
default
;
// Popovers
// Popovers
...
@@ -759,27 +759,27 @@ $badge-pill-border-radius: 10rem !default;
...
@@ -759,27 +759,27 @@ $badge-pill-border-radius: 10rem !default;
// Modals
// Modals
// Padding applied to the modal body
// Padding applied to the modal body
$modal-inner-padding
:
1rem
!
default
;
$modal-inner-padding
:
1rem
!
default
;
$modal-dialog-margin
:
.5rem
!
default
;
$modal-dialog-margin
:
.5rem
!
default
;
$modal-dialog-margin-y-sm-up
:
1
.75rem
!
default
;
$modal-dialog-margin-y-sm-up
:
1
.75rem
!
default
;
$modal-title-line-height
:
$line-height-base
!
default
;
$modal-title-line-height
:
$line-height-base
!
default
;
$modal-content-bg
:
$white
!
default
;
$modal-content-bg
:
$white
!
default
;
$modal-content-border-color
:
rgba
(
$black
,
.2
)
!
default
;
$modal-content-border-color
:
rgba
(
$black
,
.2
)
!
default
;
$modal-content-border-width
:
$border-width
!
default
;
$modal-content-border-width
:
$border-width
!
default
;
$modal-content-border-radius
:
$border-radius-lg
!
default
;
$modal-content-border-radius
:
$border-radius-lg
!
default
;
$modal-content-box-shadow-xs
:
0
.25rem
.5rem
rgba
(
$black
,
.5
)
!
default
;
$modal-content-box-shadow-xs
:
0
.25rem
.5rem
rgba
(
$black
,
.5
)
!
default
;
$modal-content-box-shadow-sm-up
:
0
.5rem
1rem
rgba
(
$black
,
.5
)
!
default
;
$modal-content-box-shadow-sm-up
:
0
.5rem
1rem
rgba
(
$black
,
.5
)
!
default
;
$modal-backdrop-bg
:
$black
!
default
;
$modal-backdrop-bg
:
$black
!
default
;
$modal-backdrop-opacity
:
.5
!
default
;
$modal-backdrop-opacity
:
.5
!
default
;
$modal-header-border-color
:
$gray-200
!
default
;
$modal-header-border-color
:
$gray-200
!
default
;
$modal-footer-border-color
:
$modal-header-border-color
!
default
;
$modal-footer-border-color
:
$modal-header-border-color
!
default
;
$modal-header-border-width
:
$modal-content-border-width
!
default
;
$modal-header-border-width
:
$modal-content-border-width
!
default
;
$modal-footer-border-width
:
$modal-header-border-width
!
default
;
$modal-footer-border-width
:
$modal-header-border-width
!
default
;
$modal-header-padding
:
1rem
!
default
;
$modal-header-padding
:
1rem
!
default
;
$modal-lg
:
800px
!
default
;
$modal-lg
:
800px
!
default
;
$modal-md
:
500px
!
default
;
$modal-md
:
500px
!
default
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets