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
6dee7d5a
Commit
6dee7d5a
authored
May 10, 2013
by
Mark Otto
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7845 from aricketson/3.0.0-wip
Fix component margin and padding values to use @line-height-computed
parents
231318e7
94cc3335
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
9 deletions
+9
-9
less/accordion.less
less/accordion.less
+1
-1
less/breadcrumbs.less
less/breadcrumbs.less
+1
-1
less/code.less
less/code.less
+3
-3
less/mixins.less
less/mixins.less
+1
-1
less/pager.less
less/pager.less
+1
-1
less/pagination.less
less/pagination.less
+1
-1
less/tables.less
less/tables.less
+1
-1
No files found.
less/accordion.less
View file @
6dee7d5a
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
// Parent container
// Parent container
.accordion {
.accordion {
margin-bottom: @line-height-
base
;
margin-bottom: @line-height-
computed
;
}
}
// Group == heading + body
// Group == heading + body
...
...
less/breadcrumbs.less
View file @
6dee7d5a
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
.breadcrumb {
.breadcrumb {
padding: 8px 15px;
padding: 8px 15px;
margin: 0 0 @line-height-
base
;
margin: 0 0 @line-height-
computed
;
list-style: none;
list-style: none;
background-color: #f5f5f5;
background-color: #f5f5f5;
border-radius: @border-radius-base;
border-radius: @border-radius-base;
...
...
less/code.less
View file @
6dee7d5a
...
@@ -25,8 +25,8 @@ code {
...
@@ -25,8 +25,8 @@ code {
// Blocks of code
// Blocks of code
pre {
pre {
display: block;
display: block;
padding: ((@line-height-
base
- 1) / 2);
padding: ((@line-height-
computed
- 1) / 2);
margin: 0 0 (@line-height-
base
/ 2);
margin: 0 0 (@line-height-
computed
/ 2);
font-size: (@font-size-base - 1); // 14px to 13px
font-size: (@font-size-base - 1); // 14px to 13px
line-height: @line-height-base;
line-height: @line-height-base;
word-break: break-all;
word-break: break-all;
...
@@ -40,7 +40,7 @@ pre {
...
@@ -40,7 +40,7 @@ pre {
// Make prettyprint styles more spaced out for readability
// Make prettyprint styles more spaced out for readability
&.prettyprint {
&.prettyprint {
margin-bottom: @line-height-
base
;
margin-bottom: @line-height-
computed
;
}
}
// Account for some code outputs that place code tags in pre tags
// Account for some code outputs that place code tags in pre tags
...
...
less/mixins.less
View file @
6dee7d5a
...
@@ -340,7 +340,7 @@
...
@@ -340,7 +340,7 @@
// Dividers (basically an hr) within dropdowns and nav lists
// Dividers (basically an hr) within dropdowns and nav lists
.nav-divider(@top: #e5e5e5, @bottom: #fff) {
.nav-divider(@top: #e5e5e5, @bottom: #fff) {
height: 2px; // 1px for background, one for border
height: 2px; // 1px for background, one for border
margin: ((@line-height-
base
/ 2) - 1) 0;
margin: ((@line-height-
computed
/ 2) - 1) 0;
overflow: hidden;
overflow: hidden;
background-color: @top;
background-color: @top;
border-bottom: 1px solid @bottom;
border-bottom: 1px solid @bottom;
...
...
less/pager.less
View file @
6dee7d5a
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
.pager {
.pager {
margin: @line-height-
base
0;
margin: @line-height-
computed
0;
list-style: none;
list-style: none;
text-align: center;
text-align: center;
.clearfix();
.clearfix();
...
...
less/pagination.less
View file @
6dee7d5a
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
// --------------------------------------------------
// --------------------------------------------------
.pagination {
.pagination {
display: inline-block;
display: inline-block;
margin: @line-height-
base
0;
margin: @line-height-
computed
0;
border-radius: @border-radius-base;
border-radius: @border-radius-base;
}
}
.pagination > li {
.pagination > li {
...
...
less/tables.less
View file @
6dee7d5a
...
@@ -17,7 +17,7 @@ th {
...
@@ -17,7 +17,7 @@ th {
.table {
.table {
width: 100%;
width: 100%;
margin-bottom: @line-height-
base
;
margin-bottom: @line-height-
computed
;
// Cells
// Cells
thead > tr > th,
thead > tr > th,
tbody > tr > th,
tbody > tr > th,
...
...
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