Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
747e108e
Commit
747e108e
authored
May 03, 2013
by
Mark Otto
Browse files
Options
Browse Files
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
with
18 additions
and
18 deletions
+18
-18
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+8
-8
less/badges.less
less/badges.less
+1
-1
less/close.less
less/close.less
+2
-2
less/jumbotron.less
less/jumbotron.less
+2
-2
less/navbar.less
less/navbar.less
+1
-1
less/navs.less
less/navs.less
+1
-1
less/popovers.less
less/popovers.less
+1
-1
less/progress-bars.less
less/progress-bars.less
+1
-1
less/tooltip.less
less/tooltip.less
+1
-1
No files found.
docs/assets/css/bootstrap.css
View file @
747e108e
...
...
@@ -3196,9 +3196,9 @@ a.list-group-item.active .list-group-item-text {
.close
{
float
:
right
;
font-size
:
2
0
px
;
font-size
:
2
1
px
;
font-weight
:
bold
;
line-height
:
20px
;
line-height
:
1
;
color
:
#000
;
text-shadow
:
0
1px
0
#ffffff
;
opacity
:
0.2
;
...
...
@@ -3386,7 +3386,7 @@ button.close {
.nav-header
{
display
:
block
;
padding
:
3px
15px
;
font-size
:
1
1
px
;
font-size
:
1
0.5
px
;
font-weight
:
bold
;
line-height
:
20px
;
color
:
#999999
;
...
...
@@ -3580,7 +3580,7 @@ button.close {
padding
:
15px
;
margin-right
:
auto
;
margin-left
:
auto
;
font-size
:
1
8
px
;
font-size
:
1
7.5
px
;
font-weight
:
500
;
line-height
:
20px
;
color
:
#777777
;
...
...
@@ -4312,7 +4312,7 @@ button.close {
position
:
absolute
;
z-index
:
1030
;
display
:
block
;
font-size
:
1
1
px
;
font-size
:
1
0.5
px
;
line-height
:
1.4
;
opacity
:
0
;
filter
:
alpha
(
opacity
=
0
);
...
...
@@ -4759,7 +4759,7 @@ a.thumbnail:focus {
display
:
inline-block
;
min-width
:
10px
;
padding
:
3px
7px
;
font-size
:
1
2
px
;
font-size
:
1
1.9
px
;
font-weight
:
bold
;
line-height
:
1
;
color
:
#fff
;
...
...
@@ -4859,7 +4859,7 @@ a.list-group-item.active > .badge,
float
:
left
;
width
:
0
;
height
:
100%
;
font-size
:
1
2
px
;
font-size
:
1
1.9
px
;
color
:
#fff
;
text-align
:
center
;
text-shadow
:
0
-1px
0
rgba
(
0
,
0
,
0
,
0.25
);
...
...
@@ -5173,7 +5173,7 @@ a.list-group-item.active > .badge,
border-radius
:
6px
;
}
.jumbotron
h1
{
font-size
:
6
0
px
;
font-size
:
6
3
px
;
}
}
...
...
less/badges.less
View file @
747e108e
...
...
@@ -8,7 +8,7 @@
display: inline-block;
min-width: 10px;
padding: 3px 7px;
font-size:
12px
;
font-size:
@font-size-small
;
font-weight: bold;
color: #fff;
line-height: 1;
...
...
less/close.less
View file @
747e108e
...
...
@@ -5,9 +5,9 @@
.close {
float: right;
font-size:
20px
;
font-size:
(@font-size-base * 1.5)
;
font-weight: bold;
line-height:
@line-height-base
;
line-height:
1
;
color: #000;
text-shadow: 0 1px 0 rgba(255,255,255,1);
.opacity(.2);
...
...
less/jumbotron.less
View file @
747e108e
...
...
@@ -6,7 +6,7 @@
.jumbotron {
padding: 30px;
margin-bottom: 30px;
font-size:
21px
;
font-size:
(@font-size-base * 1.5)
;
font-weight: 200;
line-height: (@line-height-base * 1.5);
color: @jumbotron-lead-color;
...
...
@@ -26,7 +26,7 @@
border-radius: @border-radius-large; // Only round corners at higher resolutions
h1 {
font-size:
60px
;
font-size:
(@font-size-base * 4.5)
;
}
}
}
less/navbar.less
View file @
747e108e
...
...
@@ -83,7 +83,7 @@
margin-left: auto;
margin-right: auto;
padding: 15px;
font-size:
18px
;
font-size:
@font-size-large
;
font-weight: 500;
line-height: @line-height-base;
color: @navbar-brand-color;
...
...
less/navs.less
View file @
747e108e
...
...
@@ -183,7 +183,7 @@
.nav-header {
display: block;
padding: 3px 15px;
font-size:
11px
;
font-size:
@font-size-mini
;
font-weight: bold;
line-height: @line-height-base;
color: @gray-light;
...
...
less/popovers.less
View file @
747e108e
...
...
@@ -34,7 +34,7 @@
.popover-title {
margin: 0; // reset heading margin
padding: 8px 14px;
font-size:
14px
;
font-size:
@font-size-base
;
font-weight: normal;
line-height: 18px;
background-color: @popover-title-bg;
...
...
less/progress-bars.less
View file @
747e108e
...
...
@@ -56,7 +56,7 @@
float: left;
width: 0%;
height: 100%;
font-size:
12px
;
font-size:
@font-size-small
;
color: #fff;
text-align: center;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
...
...
less/tooltip.less
View file @
747e108e
...
...
@@ -9,7 +9,7 @@
z-index: @zindex-tooltip;
display: block;
visibility: visible;
font-size:
11px
;
font-size:
@font-size-mini
;
line-height: 1.4;
.opacity(0);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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