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
8b41cb13
Commit
8b41cb13
authored
6 years ago
by
Martijn Cuppens
Committed by
XhmikosR
6 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Optional btn & input font sizes (#28068)
parent
2ee8eced
1 merge request
!28721
Hot test
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
scss/_buttons.scss
+1
-0
scss/_buttons.scss
scss/_custom-forms.scss
+2
-0
scss/_custom-forms.scss
scss/_forms.scss
+1
-0
scss/_forms.scss
scss/_variables.scss
+5
-0
scss/_variables.scss
with
9 additions
and
0 deletions
+9
-0
scss/_buttons.scss
+
1
-
0
View file @
8b41cb13
...
...
@@ -6,6 +6,7 @@
.btn
{
display
:
inline-block
;
font-family
:
$btn-font-family
;
font-weight
:
$btn-font-weight
;
color
:
$body-color
;
text-align
:
center
;
...
...
This diff is collapsed.
Click to expand it.
scss/_custom-forms.scss
+
2
-
0
View file @
8b41cb13
...
...
@@ -214,6 +214,7 @@
width
:
100%
;
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
;
font-family
:
$custom-select-font-family
;
font-size
:
$custom-select-font-size
;
font-weight
:
$custom-select-font-weight
;
line-height
:
$custom-select-line-height
;
...
...
@@ -329,6 +330,7 @@
z-index
:
1
;
height
:
$custom-file-height
;
padding
:
$custom-file-padding-y
$custom-file-padding-x
;
font-family
:
$custom-file-font-family
;
font-weight
:
$custom-file-font-weight
;
line-height
:
$custom-file-line-height
;
color
:
$custom-file-color
;
...
...
This diff is collapsed.
Click to expand it.
scss/_forms.scss
+
1
-
0
View file @
8b41cb13
...
...
@@ -9,6 +9,7 @@
width
:
100%
;
height
:
$input-height
;
padding
:
$input-padding-y
$input-padding-x
;
font-family
:
$input-font-family
;
font-size
:
$input-font-size
;
font-weight
:
$input-font-weight
;
line-height
:
$input-line-height
;
...
...
This diff is collapsed.
Click to expand it.
scss/_variables.scss
+
5
-
0
View file @
8b41cb13
...
...
@@ -381,6 +381,7 @@ $table-border-level: -6 !default;
$input-btn-padding-y
:
.375rem
!
default
;
$input-btn-padding-x
:
.75rem
!
default
;
$input-btn-font-family
:
null
!
default
;
$input-btn-font-size
:
$font-size-base
!
default
;
$input-btn-line-height
:
$line-height-base
!
default
;
...
...
@@ -407,6 +408,7 @@ $input-btn-border-width: $border-width !default;
$btn-padding-y
:
$input-btn-padding-y
!
default
;
$btn-padding-x
:
$input-btn-padding-x
!
default
;
$btn-font-family
:
$input-btn-font-family
!
default
;
$btn-font-size
:
$input-btn-font-size
!
default
;
$btn-line-height
:
$input-btn-line-height
!
default
;
...
...
@@ -447,6 +449,7 @@ $label-margin-bottom: .5rem !default;
$input-padding-y
:
$input-btn-padding-y
!
default
;
$input-padding-x
:
$input-btn-padding-x
!
default
;
$input-font-family
:
$input-btn-font-family
!
default
;
$input-font-size
:
$input-btn-font-size
!
default
;
$input-font-weight
:
$font-weight-base
!
default
;
$input-line-height
:
$input-btn-line-height
!
default
;
...
...
@@ -559,6 +562,7 @@ $custom-switch-indicator-size: calc(#{$custom-control-indicator
$custom-select-padding-y
:
$input-padding-y
!
default
;
$custom-select-padding-x
:
$input-padding-x
!
default
;
$custom-select-font-family
:
$input-font-family
!
default
;
$custom-select-font-size
:
$input-font-size
!
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
...
...
@@ -623,6 +627,7 @@ $custom-file-disabled-bg: $input-disabled-bg !default;
$custom-file-padding-y
:
$input-padding-y
!
default
;
$custom-file-padding-x
:
$input-padding-x
!
default
;
$custom-file-line-height
:
$input-line-height
!
default
;
$custom-file-font-family
:
$input-font-family
!
default
;
$custom-file-font-weight
:
$input-font-weight
!
default
;
$custom-file-color
:
$input-color
!
default
;
$custom-file-bg
:
$input-bg
!
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