mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-30 00:29:52 +02:00
Code Issues Releases Wiki Activity

Update styles for Ruby Sass compat

Browse Source
This commit is contained in:
Gleb Mazovetskiy
2014-12-16 20:29:47 +00:00
parent 0d96695f5e
commit c0c16edc41
6 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scss/_mixins.scss
View File

@@ -57,3 +57,4 @@
// @import "mixins/navbar-align";
@import "mixins/grid-framework";
@import "mixins/grid";
@import "mixins/pulls";

4
scss/_navbar.scss
View File

@@ -199,10 +199,10 @@
@include media-sm {
.navbar-left {
@extend .pull-left;
@include pull-left();
}
.navbar-right {
@extend .pull-right;
@include pull-right();
margin-right: -$navbar-padding-horizontal;
~ .navbar-right {

2
scss/_type.scss
View File

@@ -116,7 +116,7 @@ ol {
// Inline turns list items into inline-block
.list-inline {
@extend list-unstyled();
@extend .list-unstyled;
margin-left: -5px;
> li {

5
scss/_utilities.scss
View File

@@ -10,11 +10,12 @@
.center-block {
@include center-block();
}
.pull-right {
float: right !important;
@include pull-right();
}
.pull-left {
float: left !important;
@include pull-left();
}

6
scss/mixins/_pulls.scss Normal file
View File

@@ -0,0 +1,6 @@
@mixin pull-left {
float: left !important;
}
@mixin pull-right {
float: right !important;
}