Skip to content
GitLab
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
dec3ea6a
Unverified
Commit
dec3ea6a
authored
5 years ago
by
Catalin Zalog
Committed by
GitHub
5 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Order sizes variables (#30479)
parent
9496cb60
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
scss/_variables.scss
+9
-9
scss/_variables.scss
with
9 additions
and
9 deletions
+9
-9
scss/_variables.scss
+
9
-
9
View file @
dec3ea6a
...
...
@@ -320,13 +320,13 @@ $border-width: 1px !default;
$border-color
:
$gray-300
!
default
;
$border-radius
:
.25rem
!
default
;
$border-radius-lg
:
.3rem
!
default
;
$border-radius-sm
:
.2rem
!
default
;
$border-radius-lg
:
.3rem
!
default
;
$rounded-pill
:
50rem
!
default
;
$box-shadow-sm
:
0
.125rem
.25rem
rgba
(
$black
,
.075
)
!
default
;
$box-shadow
:
0
.5rem
1rem
rgba
(
$black
,
.15
)
!
default
;
$box-shadow-sm
:
0
.125rem
.25rem
rgba
(
$black
,
.075
)
!
default
;
$box-shadow-lg
:
0
1rem
3rem
rgba
(
$black
,
.175
)
!
default
;
$box-shadow-inset
:
inset
0
1px
2px
rgba
(
$black
,
.075
)
!
default
;
...
...
@@ -374,8 +374,8 @@ $font-family-base: $font-family-sans-serif !default;
// $font-size-base effects the font size of the body text
$font-size-root
:
null
!
default
;
$font-size-base
:
1rem
!
default
;
// Assumes the browser default, typically `16px`
$font-size-lg
:
$font-size-base
*
1
.25
!
default
;
$font-size-sm
:
$font-size-base
*
.875
!
default
;
$font-size-lg
:
$font-size-base
*
1
.25
!
default
;
$font-weight-lighter
:
lighter
!
default
;
$font-weight-light
:
300
!
default
;
...
...
@@ -386,8 +386,8 @@ $font-weight-bolder: bolder !default;
$font-weight-base
:
$font-weight-normal
!
default
;
$line-height-base
:
1
.5
!
default
;
$line-height-lg
:
2
!
default
;
$line-height-sm
:
1
.25
!
default
;
$line-height-lg
:
2
!
default
;
$h1-font-size
:
$font-size-base
*
2
.5
!
default
;
$h2-font-size
:
$font-size-base
*
2
!
default
;
...
...
@@ -549,8 +549,8 @@ $btn-block-spacing-y: .5rem !default;
// Allows for customizing button radius independently from global border radius
$btn-border-radius
:
$border-radius
!
default
;
$btn-border-radius-lg
:
$border-radius-lg
!
default
;
$btn-border-radius-sm
:
$border-radius-sm
!
default
;
$btn-border-radius-lg
:
$border-radius-lg
!
default
;
$btn-transition
:
color
.15s
ease-in-out
,
background-color
.15s
ease-in-out
,
border-color
.15s
ease-in-out
,
box-shadow
.15s
ease-in-out
!
default
;
...
...
@@ -584,8 +584,8 @@ $input-border-width: $input-btn-border-width !default;
$input-box-shadow
:
$box-shadow-inset
!
default
;
$input-border-radius
:
$border-radius
!
default
;
$input-border-radius-lg
:
$border-radius-lg
!
default
;
$input-border-radius-sm
:
$border-radius-sm
!
default
;
$input-border-radius-lg
:
$border-radius-lg
!
default
;
$input-focus-bg
:
$input-bg
!
default
;
$input-focus-border-color
:
lighten
(
$component-active-bg
,
25%
)
!
default
;
...
...
@@ -1055,10 +1055,10 @@ $modal-header-padding-y: 1rem !default;
$modal-header-padding-x
:
1rem
!
default
;
$modal-header-padding
:
$modal-header-padding-y
$modal-header-padding-x
!
default
;
// Keep this for backwards compatibility
$modal-xl
:
1140px
!
default
;
$modal-lg
:
800px
!
default
;
$modal-md
:
500px
!
default
;
$modal-sm
:
300px
!
default
;
$modal-md
:
500px
!
default
;
$modal-lg
:
800px
!
default
;
$modal-xl
:
1140px
!
default
;
$modal-fade-transform
:
translate
(
0
,
-50px
)
!
default
;
$modal-show-transform
:
none
!
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