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
af871d57
Commit
af871d57
authored
Sep 22, 2012
by
Mark Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes #5216: calculate heading sizes via math rather than fixed pixel amounts
parent
c3ea9556
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
26 deletions
+31
-26
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+14
-14
less/type.less
less/type.less
+17
-12
No files found.
docs/assets/css/bootstrap.css
View file @
af871d57
...
...
@@ -655,7 +655,7 @@ h6 {
margin
:
10px
0
;
font-family
:
inherit
;
font-weight
:
bold
;
line-height
:
1
;
line-height
:
20px
;
color
:
inherit
;
text-rendering
:
optimizelegibility
;
}
...
...
@@ -671,42 +671,42 @@ h6 small {
color
:
#999999
;
}
h1
{
font-size
:
36px
;
h1
,
h2
,
h3
{
line-height
:
40px
;
}
h1
{
font-size
:
38.5px
;
}
h2
{
font-size
:
30px
;
line-height
:
40px
;
font-size
:
31.5px
;
}
h3
{
font-size
:
24px
;
line-height
:
40px
;
font-size
:
24.5px
;
}
h4
{
font-size
:
18px
;
line-height
:
20px
;
font-size
:
17.5px
;
}
h5
{
font-size
:
14px
;
line-height
:
20px
;
}
h6
{
font-size
:
12px
;
line-height
:
20px
;
font-size
:
11.9px
;
}
h1
small
{
font-size
:
24px
;
font-size
:
24
.5
px
;
}
h2
small
{
font-size
:
1
8
px
;
font-size
:
1
7.5
px
;
}
h3
small
{
...
...
less/type.less
View file @
af871d57
...
...
@@ -57,7 +57,7 @@ h1, h2, h3, h4, h5, h6 {
margin: (@baseLineHeight / 2) 0;
font-family: @headingsFontFamily;
font-weight: @headingsFontWeight;
line-height:
1
;
line-height:
@baseLineHeight
;
color: @headingsColor;
text-rendering: optimizelegibility; // Fix the character spacing for headings
small {
...
...
@@ -66,17 +66,22 @@ h1, h2, h3, h4, h5, h6 {
color: @grayLight;
}
}
h1 { font-size: 36px; line-height: 40px; }
h2 { font-size: 30px; line-height: 40px; }
h3 { font-size: 24px; line-height: 40px; }
h4 { font-size: 18px; line-height: 20px; }
h5 { font-size: 14px; line-height: 20px; }
h6 { font-size: 12px; line-height: 20px; }
h1 small { font-size: 24px; }
h2 small { font-size: 18px; }
h3 small { font-size: 14px; }
h4 small { font-size: 14px; }
h1,
h2,
h3 { line-height: @baseLineHeight * 2; }
h1 { font-size: @baseFontSize * 2.75; } // ~38px
h2 { font-size: @baseFontSize * 2.25; } // ~32px
h3 { font-size: @baseFontSize * 1.75; } // ~24px
h4 { font-size: @baseFontSize * 1.25; } // ~18px
h5 { font-size: @baseFontSize; }
h6 { font-size: @baseFontSize * .85; } // ~12px
h1 small { font-size: @baseFontSize * 1.75; } // ~24px
h2 small { font-size: @baseFontSize * 1.25; } // ~18px
h3 small { font-size: @baseFontSize; }
h4 small { font-size: @baseFontSize; }
// Page header
...
...
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