rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-18 10:52:19 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #15606 from tagliala/trim-whitespaces

Browse Source 
Trim whitespaces
This commit is contained in:
Mark Otto 2015-01-19 15:13:16 -08:00
commit b6c0007f21
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
less/alerts.less
View File

@ -18,7 +18,7 @@
// Specified for the h4 to prevent conflicts of changing @headings-color // Specified for the h4 to prevent conflicts of changing @headings-color
color: inherit; color: inherit;
} }
// Provide class for links that match alerts // Provide class for links that match alerts
.alert-link { .alert-link {
font-weight: @alert-link-font-weight; font-weight: @alert-link-font-weight;
@ -29,7 +29,7 @@
> ul { > ul {
margin-bottom: 0; margin-bottom: 0;
} }
> p + p { > p + p {
margin-top: 5px; margin-top: 5px;
} }

8
less/badges.less
View File

@ -28,7 +28,7 @@
position: relative; position: relative;
top: -1px; top: -1px;
} }
.btn-xs & { .btn-xs & {
top: 0; top: 0;
padding: 1px 5px; padding: 1px 5px;
@ -50,15 +50,15 @@
color: @badge-active-color; color: @badge-active-color;
background-color: @badge-active-bg; background-color: @badge-active-bg;
} }
.list-group-item > & { .list-group-item > & {
float: right; float: right;
} }
.list-group-item > & + & { .list-group-item > & + & {
margin-right: 5px; margin-right: 5px;
} }
.nav-pills > li > a > & { .nav-pills > li > a > & {
margin-left: 3px; margin-left: 3px;
} }

2
less/jumbotron.less
View File

@ -13,7 +13,7 @@
.h1 { .h1 {
color: @jumbotron-heading-color; color: @jumbotron-heading-color;
} }
p { p {
margin-bottom: (@jumbotron-padding / 2); margin-bottom: (@jumbotron-padding / 2);
font-size: @jumbotron-font-size; font-size: @jumbotron-font-size;