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
747e108e
Commit
747e108e
authored
11 years ago
by
Mark Otto
Browse files
Options
Download
Plain Diff
Merge pull request #7670 from DarDar/3.0.0-wip
Use @font-size-... variables instead of hardcoded font-size in px
parents
af4a33f8
9cd3a927
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
docs/assets/css/bootstrap.css
+8
-8
docs/assets/css/bootstrap.css
less/badges.less
+1
-1
less/badges.less
less/close.less
+2
-2
less/close.less
less/jumbotron.less
+2
-2
less/jumbotron.less
less/navbar.less
+1
-1
less/navbar.less
less/navs.less
+1
-1
less/navs.less
less/popovers.less
+1
-1
less/popovers.less
less/progress-bars.less
+1
-1
less/progress-bars.less
less/tooltip.less
+1
-1
less/tooltip.less
with
18 additions
and
18 deletions
+18
-18
docs/assets/css/bootstrap.css
+
8
-
8
View file @
747e108e
...
@@ -3196,9 +3196,9 @@ a.list-group-item.active .list-group-item-text {
...
@@ -3196,9 +3196,9 @@ a.list-group-item.active .list-group-item-text {
.close
{
.close
{
float
:
right
;
float
:
right
;
font-size
:
2
0
px
;
font-size
:
2
1
px
;
font-weight
:
bold
;
font-weight
:
bold
;
line-height
:
20px
;
line-height
:
1
;
color
:
#000
;
color
:
#000
;
text-shadow
:
0
1px
0
#ffffff
;
text-shadow
:
0
1px
0
#ffffff
;
opacity
:
0.2
;
opacity
:
0.2
;
...
@@ -3386,7 +3386,7 @@ button.close {
...
@@ -3386,7 +3386,7 @@ button.close {
.nav-header
{
.nav-header
{
display
:
block
;
display
:
block
;
padding
:
3px
15px
;
padding
:
3px
15px
;
font-size
:
1
1
px
;
font-size
:
1
0.5
px
;
font-weight
:
bold
;
font-weight
:
bold
;
line-height
:
20px
;
line-height
:
20px
;
color
:
#999999
;
color
:
#999999
;
...
@@ -3580,7 +3580,7 @@ button.close {
...
@@ -3580,7 +3580,7 @@ button.close {
padding
:
15px
;
padding
:
15px
;
margin-right
:
auto
;
margin-right
:
auto
;
margin-left
:
auto
;
margin-left
:
auto
;
font-size
:
1
8
px
;
font-size
:
1
7.5
px
;
font-weight
:
500
;
font-weight
:
500
;
line-height
:
20px
;
line-height
:
20px
;
color
:
#777777
;
color
:
#777777
;
...
@@ -4312,7 +4312,7 @@ button.close {
...
@@ -4312,7 +4312,7 @@ button.close {
position
:
absolute
;
position
:
absolute
;
z-index
:
1030
;
z-index
:
1030
;
display
:
block
;
display
:
block
;
font-size
:
1
1
px
;
font-size
:
1
0.5
px
;
line-height
:
1.4
;
line-height
:
1.4
;
opacity
:
0
;
opacity
:
0
;
filter
:
alpha
(
opacity
=
0
);
filter
:
alpha
(
opacity
=
0
);
...
@@ -4759,7 +4759,7 @@ a.thumbnail:focus {
...
@@ -4759,7 +4759,7 @@ a.thumbnail:focus {
display
:
inline-block
;
display
:
inline-block
;
min-width
:
10px
;
min-width
:
10px
;
padding
:
3px
7px
;
padding
:
3px
7px
;
font-size
:
1
2
px
;
font-size
:
1
1.9
px
;
font-weight
:
bold
;
font-weight
:
bold
;
line-height
:
1
;
line-height
:
1
;
color
:
#fff
;
color
:
#fff
;
...
@@ -4859,7 +4859,7 @@ a.list-group-item.active > .badge,
...
@@ -4859,7 +4859,7 @@ a.list-group-item.active > .badge,
float
:
left
;
float
:
left
;
width
:
0
;
width
:
0
;
height
:
100%
;
height
:
100%
;
font-size
:
1
2
px
;
font-size
:
1
1.9
px
;
color
:
#fff
;
color
:
#fff
;
text-align
:
center
;
text-align
:
center
;
text-shadow
:
0
-1px
0
rgba
(
0
,
0
,
0
,
0.25
);
text-shadow
:
0
-1px
0
rgba
(
0
,
0
,
0
,
0.25
);
...
@@ -5173,7 +5173,7 @@ a.list-group-item.active > .badge,
...
@@ -5173,7 +5173,7 @@ a.list-group-item.active > .badge,
border-radius
:
6px
;
border-radius
:
6px
;
}
}
.jumbotron
h1
{
.jumbotron
h1
{
font-size
:
6
0
px
;
font-size
:
6
3
px
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
less/badges.less
+
1
-
1
View file @
747e108e
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
display: inline-block;
display: inline-block;
min-width: 10px;
min-width: 10px;
padding: 3px 7px;
padding: 3px 7px;
font-size:
12px
;
font-size:
@font-size-small
;
font-weight: bold;
font-weight: bold;
color: #fff;
color: #fff;
line-height: 1;
line-height: 1;
...
...
This diff is collapsed.
Click to expand it.
less/close.less
+
2
-
2
View file @
747e108e
...
@@ -5,9 +5,9 @@
...
@@ -5,9 +5,9 @@
.close {
.close {
float: right;
float: right;
font-size:
20px
;
font-size:
(@font-size-base * 1.5)
;
font-weight: bold;
font-weight: bold;
line-height:
@line-height-base
;
line-height:
1
;
color: #000;
color: #000;
text-shadow: 0 1px 0 rgba(255,255,255,1);
text-shadow: 0 1px 0 rgba(255,255,255,1);
.opacity(.2);
.opacity(.2);
...
...
This diff is collapsed.
Click to expand it.
less/jumbotron.less
+
2
-
2
View file @
747e108e
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
.jumbotron {
.jumbotron {
padding: 30px;
padding: 30px;
margin-bottom: 30px;
margin-bottom: 30px;
font-size:
21px
;
font-size:
(@font-size-base * 1.5)
;
font-weight: 200;
font-weight: 200;
line-height: (@line-height-base * 1.5);
line-height: (@line-height-base * 1.5);
color: @jumbotron-lead-color;
color: @jumbotron-lead-color;
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
border-radius: @border-radius-large; // Only round corners at higher resolutions
border-radius: @border-radius-large; // Only round corners at higher resolutions
h1 {
h1 {
font-size:
60px
;
font-size:
(@font-size-base * 4.5)
;
}
}
}
}
}
}
This diff is collapsed.
Click to expand it.
less/navbar.less
+
1
-
1
View file @
747e108e
...
@@ -83,7 +83,7 @@
...
@@ -83,7 +83,7 @@
margin-left: auto;
margin-left: auto;
margin-right: auto;
margin-right: auto;
padding: 15px;
padding: 15px;
font-size:
18px
;
font-size:
@font-size-large
;
font-weight: 500;
font-weight: 500;
line-height: @line-height-base;
line-height: @line-height-base;
color: @navbar-brand-color;
color: @navbar-brand-color;
...
...
This diff is collapsed.
Click to expand it.
less/navs.less
+
1
-
1
View file @
747e108e
...
@@ -183,7 +183,7 @@
...
@@ -183,7 +183,7 @@
.nav-header {
.nav-header {
display: block;
display: block;
padding: 3px 15px;
padding: 3px 15px;
font-size:
11px
;
font-size:
@font-size-mini
;
font-weight: bold;
font-weight: bold;
line-height: @line-height-base;
line-height: @line-height-base;
color: @gray-light;
color: @gray-light;
...
...
This diff is collapsed.
Click to expand it.
less/popovers.less
+
1
-
1
View file @
747e108e
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
.popover-title {
.popover-title {
margin: 0; // reset heading margin
margin: 0; // reset heading margin
padding: 8px 14px;
padding: 8px 14px;
font-size:
14px
;
font-size:
@font-size-base
;
font-weight: normal;
font-weight: normal;
line-height: 18px;
line-height: 18px;
background-color: @popover-title-bg;
background-color: @popover-title-bg;
...
...
This diff is collapsed.
Click to expand it.
less/progress-bars.less
+
1
-
1
View file @
747e108e
...
@@ -56,7 +56,7 @@
...
@@ -56,7 +56,7 @@
float: left;
float: left;
width: 0%;
width: 0%;
height: 100%;
height: 100%;
font-size:
12px
;
font-size:
@font-size-small
;
color: #fff;
color: #fff;
text-align: center;
text-align: center;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
...
...
This diff is collapsed.
Click to expand it.
less/tooltip.less
+
1
-
1
View file @
747e108e
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
z-index: @zindex-tooltip;
z-index: @zindex-tooltip;
display: block;
display: block;
visibility: visible;
visibility: visible;
font-size:
11px
;
font-size:
@font-size-mini
;
line-height: 1.4;
line-height: 1.4;
.opacity(0);
.opacity(0);
...
...
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