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
5088f027
Commit
5088f027
authored
6 years ago
by
Andres Galante
Committed by
XhmikosR
6 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Add font weight options for form controls and custom select (#27343)
parent
a86aef0a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
scss/_custom-forms.scss
+2
-0
scss/_custom-forms.scss
scss/_forms.scss
+1
-0
scss/_forms.scss
scss/_variables.scss
+3
-0
scss/_variables.scss
with
6 additions
and
0 deletions
+6
-0
scss/_custom-forms.scss
+
2
-
0
View file @
5088f027
...
@@ -166,6 +166,7 @@
...
@@ -166,6 +166,7 @@
width
:
100%
;
width
:
100%
;
height
:
$custom-select-height
;
height
:
$custom-select-height
;
padding
:
$custom-select-padding-y
(
$custom-select-padding-x
+
$custom-select-indicator-padding
)
$custom-select-padding-y
$custom-select-padding-x
;
padding
:
$custom-select-padding-y
(
$custom-select-padding-x
+
$custom-select-indicator-padding
)
$custom-select-padding-y
$custom-select-padding-x
;
font-weight
:
$custom-select-font-weight
;
line-height
:
$custom-select-line-height
;
line-height
:
$custom-select-line-height
;
color
:
$custom-select-color
;
color
:
$custom-select-color
;
vertical-align
:
middle
;
vertical-align
:
middle
;
...
@@ -279,6 +280,7 @@
...
@@ -279,6 +280,7 @@
z-index
:
1
;
z-index
:
1
;
height
:
$custom-file-height
;
height
:
$custom-file-height
;
padding
:
$custom-file-padding-y
$custom-file-padding-x
;
padding
:
$custom-file-padding-y
$custom-file-padding-x
;
font-weight
:
$custom-file-font-weight
;
line-height
:
$custom-file-line-height
;
line-height
:
$custom-file-line-height
;
color
:
$custom-file-color
;
color
:
$custom-file-color
;
background-color
:
$custom-file-bg
;
background-color
:
$custom-file-bg
;
...
...
This diff is collapsed.
Click to expand it.
scss/_forms.scss
+
1
-
0
View file @
5088f027
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
height
:
$input-height
;
height
:
$input-height
;
padding
:
$input-padding-y
$input-padding-x
;
padding
:
$input-padding-y
$input-padding-x
;
font-size
:
$font-size-base
;
font-size
:
$font-size-base
;
font-weight
:
$input-font-weight
;
line-height
:
$input-line-height
;
line-height
:
$input-line-height
;
color
:
$input-color
;
color
:
$input-color
;
background-color
:
$input-bg
;
background-color
:
$input-bg
;
...
...
This diff is collapsed.
Click to expand it.
scss/_variables.scss
+
3
-
0
View file @
5088f027
...
@@ -426,6 +426,7 @@ $label-margin-bottom: .5rem !default;
...
@@ -426,6 +426,7 @@ $label-margin-bottom: .5rem !default;
$input-padding-y
:
$input-btn-padding-y
!
default
;
$input-padding-y
:
$input-btn-padding-y
!
default
;
$input-padding-x
:
$input-btn-padding-x
!
default
;
$input-padding-x
:
$input-btn-padding-x
!
default
;
$input-font-size
:
$input-btn-font-size
!
default
;
$input-font-size
:
$input-btn-font-size
!
default
;
$input-font-weight
:
$font-weight-base
!
default
;
$input-line-height
:
$input-btn-line-height
!
default
;
$input-line-height
:
$input-btn-line-height
!
default
;
$input-padding-y-sm
:
$input-btn-padding-y-sm
!
default
;
$input-padding-y-sm
:
$input-btn-padding-y-sm
!
default
;
...
@@ -526,6 +527,7 @@ $custom-select-padding-y: .375rem !default;
...
@@ -526,6 +527,7 @@ $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-font-weight
:
$input-font-weight
!
default
;
$custom-select-line-height
:
$input-line-height
!
default
;
$custom-select-line-height
:
$input-line-height
!
default
;
$custom-select-color
:
$input-color
!
default
;
$custom-select-color
:
$input-color
!
default
;
$custom-select-disabled-color
:
$gray-600
!
default
;
$custom-select-disabled-color
:
$gray-600
!
default
;
...
@@ -582,6 +584,7 @@ $custom-file-disabled-bg: $input-disabled-bg !default;
...
@@ -582,6 +584,7 @@ $custom-file-disabled-bg: $input-disabled-bg !default;
$custom-file-padding-y
:
$input-padding-y
!
default
;
$custom-file-padding-y
:
$input-padding-y
!
default
;
$custom-file-padding-x
:
$input-padding-x
!
default
;
$custom-file-padding-x
:
$input-padding-x
!
default
;
$custom-file-line-height
:
$input-line-height
!
default
;
$custom-file-line-height
:
$input-line-height
!
default
;
$custom-file-font-weight
:
$input-font-weight
!
default
;
$custom-file-color
:
$input-color
!
default
;
$custom-file-color
:
$input-color
!
default
;
$custom-file-bg
:
$input-bg
!
default
;
$custom-file-bg
:
$input-bg
!
default
;
$custom-file-border-width
:
$input-border-width
!
default
;
$custom-file-border-width
:
$input-border-width
!
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