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
10e74a94
Commit
10e74a94
authored
11 years ago
by
Chris Rebert
Browse files
Options
Download
Email Patches
Plain Diff
improve compliance with LESS's strictMath
parent
25ec09f0
1 merge request
!11807
improve compliance with LESS's strictMath
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
less/type.less
+1
-1
less/type.less
less/variables.less
+10
-10
less/variables.less
with
11 additions
and
11 deletions
+11
-11
less/type.less
+
1
-
1
View file @
10e74a94
...
...
@@ -61,7 +61,7 @@ p {
.lead {
margin-bottom: @line-height-computed;
font-size: floor(@font-size-base * 1.15);
font-size: floor(
(
@font-size-base * 1.15)
)
;
font-weight: 200;
line-height: 1.4;
...
...
This diff is collapsed.
Click to expand it.
less/variables.less
+
10
-
10
View file @
10e74a94
...
...
@@ -45,18 +45,18 @@
@font-family-base: @font-family-sans-serif;
@font-size-base: 14px;
@font-size-large: ceil(@font-size-base * 1.25); // ~18px
@font-size-small: ceil(@font-size-base * 0.85); // ~12px
@font-size-large: ceil(
(
@font-size-base * 1.25)
)
; // ~18px
@font-size-small: ceil(
(
@font-size-base * 0.85)
)
; // ~12px
@font-size-h1: floor(@font-size-base * 2.6); // ~36px
@font-size-h2: floor(@font-size-base * 2.15); // ~30px
@font-size-h3: ceil(@font-size-base * 1.7); // ~24px
@font-size-h4: ceil(@font-size-base * 1.25); // ~18px
@font-size-h1: floor(
(
@font-size-base * 2.6)
)
; // ~36px
@font-size-h2: floor(
(
@font-size-base * 2.15)
)
; // ~30px
@font-size-h3: ceil(
(
@font-size-base * 1.7)
)
; // ~24px
@font-size-h4: ceil(
(
@font-size-base * 1.25)
)
; // ~18px
@font-size-h5: @font-size-base;
@font-size-h6: ceil(@font-size-base * 0.85); // ~12px
@font-size-h6: ceil(
(
@font-size-base * 0.85)
)
; // ~12px
@line-height-base: 1.428571429; // 20/14
@line-height-computed: floor(@font-size-base * @line-height-base); // ~20px
@line-height-computed: floor(
(
@font-size-base * @line-height-base)
)
; // ~20px
@headings-font-family: inherit;
@headings-font-weight: 500;
...
...
@@ -263,7 +263,7 @@
@navbar-height: 50px;
@navbar-margin-bottom: @line-height-computed;
@navbar-border-radius: @border-radius-base;
@navbar-padding-horizontal: floor(@grid-gutter-width / 2);
@navbar-padding-horizontal: floor(
(
@grid-gutter-width / 2)
)
;
@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
@navbar-default-color: #777;
...
...
@@ -374,7 +374,7 @@
@jumbotron-color: inherit;
@jumbotron-bg: @gray-lighter;
@jumbotron-heading-color: inherit;
@jumbotron-font-size: ceil(@font-size-base * 1.5);
@jumbotron-font-size: ceil(
(
@font-size-base * 1.5)
)
;
// Form states and alerts
...
...
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