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
c0c16edc
Commit
c0c16edc
authored
Dec 16, 2014
by
Gleb Mazovetskiy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update styles for Ruby Sass compat
parent
0d96695f
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
6 deletions
+14
-6
docs/getting-started/compiling.md
docs/getting-started/compiling.md
+1
-1
scss/_mixins.scss
scss/_mixins.scss
+1
-0
scss/_navbar.scss
scss/_navbar.scss
+2
-2
scss/_type.scss
scss/_type.scss
+1
-1
scss/_utilities.scss
scss/_utilities.scss
+3
-2
scss/mixins/_pulls.scss
scss/mixins/_pulls.scss
+6
-0
No files found.
docs/getting-started/compiling.md
View file @
c0c16edc
...
@@ -41,7 +41,7 @@ This is a convenience method for watching just Sass files and automatically buil
...
@@ -41,7 +41,7 @@ This is a convenience method for watching just Sass files and automatically buil
### Use another Sass compiler
### Use another Sass compiler
Bootstrap is compiled with
[
libsass
][
libsass
]
by default.
Bootstrap is compiled with
[
libsass
][
libsass
]
by default.
Use another compiler by setting
`TWBS_SASS`
environment variable to:
Use another compiler by setting
the
`TWBS_SASS`
environment variable to:
*
`sass`
to use
[
Ruby Sass
][
ruby-sass
]
via
[
grunt-contrib-sass
][
grunt-contrib-sass
]
.
*
`sass`
to use
[
Ruby Sass
][
ruby-sass
]
via
[
grunt-contrib-sass
][
grunt-contrib-sass
]
.
*
`libsass`
(default) to use
[
libsass
][
libsass
]
via
[
grunt-sass
][
grunt-sass
]
.
*
`libsass`
(default) to use
[
libsass
][
libsass
]
via
[
grunt-sass
][
grunt-sass
]
.
...
...
scss/_mixins.scss
View file @
c0c16edc
...
@@ -57,3 +57,4 @@
...
@@ -57,3 +57,4 @@
// @import "mixins/navbar-align";
// @import "mixins/navbar-align";
@import
"mixins/grid-framework"
;
@import
"mixins/grid-framework"
;
@import
"mixins/grid"
;
@import
"mixins/grid"
;
@import
"mixins/pulls"
;
scss/_navbar.scss
View file @
c0c16edc
...
@@ -199,10 +199,10 @@
...
@@ -199,10 +199,10 @@
@include
media-sm
{
@include
media-sm
{
.navbar-left
{
.navbar-left
{
@
extend
.pull-left
;
@
include
pull-left
()
;
}
}
.navbar-right
{
.navbar-right
{
@
extend
.pull-right
;
@
include
pull-right
()
;
margin-right
:
-
$navbar-padding-horizontal
;
margin-right
:
-
$navbar-padding-horizontal
;
~
.navbar-right
{
~
.navbar-right
{
...
...
scss/_type.scss
View file @
c0c16edc
...
@@ -116,7 +116,7 @@ ol {
...
@@ -116,7 +116,7 @@ ol {
// Inline turns list items into inline-block
// Inline turns list items into inline-block
.list-inline
{
.list-inline
{
@extend
list-unstyled
()
;
@extend
.list-unstyled
;
margin-left
:
-5px
;
margin-left
:
-5px
;
>
li
{
>
li
{
...
...
scss/_utilities.scss
View file @
c0c16edc
...
@@ -10,11 +10,12 @@
...
@@ -10,11 +10,12 @@
.center-block
{
.center-block
{
@include
center-block
();
@include
center-block
();
}
}
.pull-right
{
.pull-right
{
float
:
right
!
important
;
@include
pull-right
()
;
}
}
.pull-left
{
.pull-left
{
float
:
left
!
important
;
@include
pull-left
()
;
}
}
...
...
scss/mixins/_pulls.scss
0 → 100644
View file @
c0c16edc
@mixin
pull-left
{
float
:
left
!
important
;
}
@mixin
pull-right
{
float
:
right
!
important
;
}
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