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
0ffd369a
Commit
0ffd369a
authored
8 years ago
by
Mark Otto
Committed by
Mark Otto
8 years ago
Browse files
Options
Download
Email Patches
Plain Diff
clarify usage of base font-size so we know what's up
parent
57d3a25f
9 merge requests
!28721
Hot test
,
!27561
Adds font-weight-medium to font weight classes
,
!22391
V4 dev
,
!22143
Fix selectable disabled toggle radio buttons
,
!22598
test
,
!25326
Adjust examples
,
!23995
Add back cursor: pointer for .btn-link
,
!23178
Spinner
,
!17021
v4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
scss/_close.scss
+1
-1
scss/_close.scss
scss/_dropdown.scss
+1
-1
scss/_dropdown.scss
scss/_input-group.scss
+1
-1
scss/_input-group.scss
scss/_popover.scss
+1
-1
scss/_popover.scss
scss/_variables.scss
+1
-0
scss/_variables.scss
with
5 additions
and
4 deletions
+5
-4
scss/_close.scss
+
1
-
1
View file @
0ffd369a
.close
{
float
:
right
;
font-size
:
(
$font-size
-base
*
1
.5
)
;
font-size
:
$
close-
font-size
;
font-weight
:
$close-font-weight
;
line-height
:
1
;
color
:
$close-color
;
...
...
This diff is collapsed.
Click to expand it.
scss/_dropdown.scss
+
1
-
1
View file @
0ffd369a
...
...
@@ -44,7 +44,7 @@
min-width
:
$dropdown-min-width
;
padding
:
$dropdown-padding-y
0
;
margin
:
$dropdown-margin-top
0
0
;
// override default ul
font-size
:
$font-size-base
;
font-size
:
$font-size-base
;
// Redeclare because nesting can cause inheritance issues
color
:
$body-color
;
text-align
:
left
;
// Ensures proper alignment if parent has it changed (e.g., modal footer)
list-style
:
none
;
...
...
This diff is collapsed.
Click to expand it.
scss/_input-group.scss
+
1
-
1
View file @
0ffd369a
...
...
@@ -69,7 +69,7 @@
.input-group-addon
{
padding
:
$input-padding-y
$input-padding-x
;
margin-bottom
:
0
;
// Allow use of <label> elements by overriding our default margin-bottom
font-size
:
$font-size-base
;
font-size
:
$font-size-base
;
// Match inputs
font-weight
:
$font-weight-normal
;
line-height
:
$input-line-height
;
color
:
$input-color
;
...
...
This diff is collapsed.
Click to expand it.
scss/_popover.scss
+
1
-
1
View file @
0ffd369a
...
...
@@ -130,7 +130,7 @@
// Offset the popover to account for the popover arrow
.popover-title
{
padding
:
$popover-title-padding-y
$popover-title-padding-x
;
margin
:
0
;
//
r
eset he
ading margin
margin
-bottom
:
0
;
//
R
eset
t
he
default from Reboot
font-size
:
$font-size-base
;
background-color
:
$popover-title-bg
;
border-bottom
:
$popover-border-width
solid
darken
(
$popover-title-bg
,
5%
);
...
...
This diff is collapsed.
Click to expand it.
scss/_variables.scss
+
1
-
0
View file @
0ffd369a
...
...
@@ -938,6 +938,7 @@ $carousel-transition: transform .6s ease-in-out !default;
// Close
$close-font-size
:
$font-size-base
*
1
.5
!
default
;
$close-font-weight
:
$font-weight-bold
!
default
;
$close-color
:
$black
!
default
;
$close-text-shadow
:
0
1px
0
$white
!
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