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
139e8923
Commit
139e8923
authored
6 years ago
by
Mark Otto
Committed by
Mark Otto
6 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Simplify custom file inner height for generated browse button
parent
7c53a8a1
3 merge requests
!28721
Hot test
,
!27561
Adds font-weight-medium to font weight classes
,
!26470
Active class
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scss/_custom-forms.scss
+1
-1
scss/_custom-forms.scss
scss/_variables.scss
+1
-0
scss/_variables.scss
with
2 additions
and
1 deletion
+2
-1
scss/_custom-forms.scss
+
1
-
1
View file @
139e8923
...
@@ -286,7 +286,7 @@
...
@@ -286,7 +286,7 @@
bottom
:
0
;
bottom
:
0
;
z-index
:
3
;
z-index
:
3
;
display
:
block
;
display
:
block
;
height
:
calc
(
#{
$custom-file-height
}
-
#{
$custom-file-border-width
}
*
2
)
;
height
:
$custom-file-height
-inner
;
padding
:
$custom-file-padding-y
$custom-file-padding-x
;
padding
:
$custom-file-padding-y
$custom-file-padding-x
;
line-height
:
$custom-file-line-height
;
line-height
:
$custom-file-line-height
;
color
:
$custom-file-button-color
;
color
:
$custom-file-button-color
;
...
...
This diff is collapsed.
Click to expand it.
scss/_variables.scss
+
1
-
0
View file @
139e8923
...
@@ -526,6 +526,7 @@ $custom-range-thumb-focus-box-shadow: 0 0 0 1px $body-bg, $input-btn-focus-box-s
...
@@ -526,6 +526,7 @@ $custom-range-thumb-focus-box-shadow: 0 0 0 1px $body-bg, $input-btn-focus-box-s
$custom-range-thumb-active-bg
:
lighten
(
$component-active-bg
,
35%
)
!
default
;
$custom-range-thumb-active-bg
:
lighten
(
$component-active-bg
,
35%
)
!
default
;
$custom-file-height
:
$input-height
!
default
;
$custom-file-height
:
$input-height
!
default
;
$custom-file-height-inner
:
$input-height-inner
!
default
;
$custom-file-focus-border-color
:
$input-focus-border-color
!
default
;
$custom-file-focus-border-color
:
$input-focus-border-color
!
default
;
$custom-file-focus-box-shadow
:
$input-btn-focus-box-shadow
!
default
;
$custom-file-focus-box-shadow
:
$input-btn-focus-box-shadow
!
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