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
991cbe74
Commit
991cbe74
authored
7 years ago
by
Jesse Mandel
Committed by
XhmikosR
7 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Update colors in _data and theming.md to match _variables.scss (#24355)
parent
c8ee8509
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
v4.0.0
v4.0.0-beta.3
v4.0.0-beta.2
7 merge requests
!28721
Hot test
,
!27561
Adds font-weight-medium to font weight classes
,
!25494
web pack
,
!25326
Adjust examples
,
!24390
1
,
!23207
#22402 : modal: new autofocus & keyboardBtnNav options
,
!17021
v4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
_data/colors.yml
+12
-12
_data/colors.yml
_data/grays.yml
+8
-8
_data/grays.yml
_data/theme-colors.yml
+1
-1
_data/theme-colors.yml
docs/4.0/getting-started/theming.md
+6
-4
docs/4.0/getting-started/theming.md
with
27 additions
and
25 deletions
+27
-25
_data/colors.yml
+
12
-
12
View file @
991cbe74
-
name
:
blue
-
name
:
blue
hex
:
"
#007
a
ff"
hex
:
"
#007
b
ff"
-
name
:
indigo
-
name
:
indigo
hex
:
"
#
2b29bb
"
hex
:
"
#
6610f2
"
-
name
:
purple
-
name
:
purple
hex
:
"
#
882ae0
"
hex
:
"
#
6f42c1
"
-
name
:
pink
-
name
:
pink
hex
:
"
#
f14095
"
hex
:
"
#
e83e8c
"
-
name
:
red
-
name
:
red
hex
:
"
#
ea0242
"
hex
:
"
#
dc3545
"
-
name
:
orange
-
name
:
orange
hex
:
"
#f
f8d00
"
hex
:
"
#f
d7e14
"
-
name
:
yellow
-
name
:
yellow
hex
:
"
#ff
ec00
"
hex
:
"
#ff
c107
"
-
name
:
green
-
name
:
green
hex
:
"
#
34da36
"
hex
:
"
#
28a745
"
-
name
:
teal
-
name
:
teal
hex
:
"
#
1dde8e
"
hex
:
"
#
20c997
"
-
name
:
cyan
-
name
:
cyan
hex
:
"
#
08eff3
"
hex
:
"
#
17a2b8
"
-
name
:
white
-
name
:
white
hex
:
"
#fff"
hex
:
"
#fff"
-
name
:
gray
-
name
:
gray
hex
:
"
#
464a4c
"
hex
:
"
#
868e96
"
-
name
:
gray-dark
-
name
:
gray-dark
hex
:
"
#
292b2c
"
hex
:
"
#
343a40
"
This diff is collapsed.
Click to expand it.
_data/grays.yml
+
8
-
8
View file @
991cbe74
-
name
:
100
-
name
:
100
hex
:
"
#f8f9fa"
hex
:
"
#f8f9fa"
-
name
:
200
-
name
:
200
hex
:
"
#e
bed
ef"
hex
:
"
#e
9ec
ef"
-
name
:
300
-
name
:
300
hex
:
"
#
ced3d8
"
hex
:
"
#
dee2e6
"
-
name
:
400
-
name
:
400
hex
:
"
#
abb3bd
"
hex
:
"
#
ced4da
"
-
name
:
500
-
name
:
500
hex
:
"
#
7c8a99
"
hex
:
"
#
adb5bd
"
-
name
:
600
-
name
:
600
hex
:
"
#
55626f
"
hex
:
"
#
868e96
"
-
name
:
700
-
name
:
700
hex
:
"
#4
a5560
"
hex
:
"
#4
95057
"
-
name
:
800
-
name
:
800
hex
:
"
#3
84048
"
hex
:
"
#3
43a40
"
-
name
:
900
-
name
:
900
hex
:
"
#
13161
9"
hex
:
"
#
21252
9"
This diff is collapsed.
Click to expand it.
_data/theme-colors.yml
+
1
-
1
View file @
991cbe74
-
name
:
primary
-
name
:
primary
hex
:
"
#007
a
ff"
hex
:
"
#007
b
ff"
-
name
:
secondary
-
name
:
secondary
hex
:
"
#868e96"
hex
:
"
#868e96"
-
name
:
success
-
name
:
success
...
...
This diff is collapsed.
Click to expand it.
docs/4.0/getting-started/theming.md
+
6
-
4
View file @
991cbe74
...
@@ -228,17 +228,19 @@ Within `_variables.scss`, you'll find our color variables and Sass map. Here's a
...
@@ -228,17 +228,19 @@ Within `_variables.scss`, you'll find our color variables and Sass map. Here's a
{% highlight scss %}
{% highlight scss %}
$colors: (
$colors: (
"blue": $blue,
"indigo": $indigo,
"purple": $purple,
"pink": $pink,
"red": $red,
"red": $red,
"orange": $orange,
"orange": $orange,
"yellow": $yellow,
"yellow": $yellow,
"green": $green,
"green": $green,
"teal": $teal,
"teal": $teal,
"blue": $blue,
"cyan": $cyan,
"pink": $pink,
"purple": $purple,
"white": $white,
"white": $white,
"gray": $gray-600,
"gray": $gray-600,
"gray-dark": $gray-
9
00
"gray-dark": $gray-
8
00
) !default;
) !default;
{% endhighlight %}
{% endhighlight %}
...
...
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