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
70ad98d3
Commit
70ad98d3
authored
6 years ago
by
Robert
Committed by
Mark Otto
6 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Fix custom-select font size/padding (#26585)
fixes
#26476
parent
6233ea37
2 merge requests
!28721
Hot test
,
!27561
Adds font-weight-medium to font weight classes
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scss/_custom-forms.scss
+6
-4
scss/_custom-forms.scss
scss/_variables.scss
+6
-2
scss/_variables.scss
with
12 additions
and
6 deletions
+12
-6
scss/_custom-forms.scss
+
6
-
4
View file @
70ad98d3
...
...
@@ -220,15 +220,17 @@
.custom-select-sm
{
height
:
$custom-select-height-sm
;
padding-top
:
$custom-select-padding-y
;
padding-bottom
:
$custom-select-padding-y
;
padding-top
:
$custom-select-padding-y-sm
;
padding-bottom
:
$custom-select-padding-y-sm
;
padding-left
:
$custom-select-padding-x-sm
;
font-size
:
$custom-select-font-size-sm
;
}
.custom-select-lg
{
height
:
$custom-select-height-lg
;
padding-top
:
$custom-select-padding-y
;
padding-bottom
:
$custom-select-padding-y
;
padding-top
:
$custom-select-padding-y-lg
;
padding-bottom
:
$custom-select-padding-y-lg
;
padding-left
:
$custom-select-padding-x-lg
;
font-size
:
$custom-select-font-size-lg
;
}
...
...
This diff is collapsed.
Click to expand it.
scss/_variables.scss
+
6
-
2
View file @
70ad98d3
...
...
@@ -526,10 +526,14 @@ $custom-select-focus-border-color: $input-focus-border-color !default;
$custom-select-focus-width
:
$input-btn-focus-width
!
default
;
$custom-select-focus-box-shadow
:
0
0
0
$custom-select-focus-width
rgba
(
$custom-select-focus-border-color
,
.5
)
!
default
;
$custom-select-font-size-sm
:
75%
!
default
;
$custom-select-padding-y-sm
:
$input-btn-padding-y-sm
!
default
;
$custom-select-padding-x-sm
:
$input-btn-padding-x-sm
!
default
;
$custom-select-font-size-sm
:
$font-size-sm
!
default
;
$custom-select-height-sm
:
$input-height-sm
!
default
;
$custom-select-font-size-lg
:
125%
!
default
;
$custom-select-padding-y-lg
:
$input-btn-padding-y-lg
!
default
;
$custom-select-padding-x-lg
:
$input-btn-padding-x-lg
!
default
;
$custom-select-font-size-lg
:
$font-size-lg
!
default
;
$custom-select-height-lg
:
$input-height-lg
!
default
;
$custom-range-track-width
:
100%
!
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