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
0bc39aa3
Commit
0bc39aa3
authored
7 years ago
by
Mark Otto
Committed by
GitHub
7 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Use empty Sass map and merge into it for easier customization of color maps (#23260)
parent
cd22eb1d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
scss/_variables.scss
+9
-6
scss/_variables.scss
with
9 additions
and
6 deletions
+9
-6
scss/_variables.scss
+
9
-
6
View file @
0bc39aa3
...
...
@@ -61,7 +61,8 @@ $gray-800: #343a40 !default;
$gray-900
:
#212529
!
default
;
$black
:
#000
!
default
;
$grays
:
(
$grays
:
()
!
default
;
$grays
:
map-merge
((
100
:
$gray-100
,
200
:
$gray-200
,
300
:
$gray-300
,
...
...
@@ -71,7 +72,7 @@ $grays: (
700
:
$gray-700
,
800
:
$gray-800
,
900
:
$gray-900
)
!
default
;
)
,
$grays
)
;
$blue
:
#007bff
!
default
;
$indigo
:
#6610f2
!
default
;
...
...
@@ -84,7 +85,8 @@ $green: #28a745 !default;
$teal
:
#20c997
!
default
;
$cyan
:
#17a2b8
!
default
;
$colors
:
(
$colors
:
()
!
default
;
$colors
:
map-merge
((
blue
:
$blue
,
indigo
:
$indigo
,
purple
:
$purple
,
...
...
@@ -98,9 +100,10 @@ $colors: (
white
:
$white
,
gray
:
$gray-600
,
gray-dark
:
$gray-800
)
!
default
;
)
,
$colors
)
;
$theme-colors
:
(
$theme-colors
:
()
!
default
;
$theme-colors
:
map-merge
((
primary
:
$blue
,
secondary
:
$gray-600
,
success
:
$green
,
...
...
@@ -109,7 +112,7 @@ $theme-colors: (
danger
:
$red
,
light
:
$gray-100
,
dark
:
$gray-800
)
!
default
;
)
,
$theme-colors
)
;
// Set a specific jump point for requesting color jumps
$theme-color-interval
:
8%
!
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