kotovalexarian-likes-github/twbs--bootstrap-sass
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap-sass.git synced 2022-11-09 12:27:02 -05:00
Code Releases Activity

converter: fix multiparameter @include

Browse source
This commit is contained in:
Gleb Mazovetskiy 2013-07-30 18:06:31 +02:00
parent 5398ae9f54
commit 9fdd6cf529
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tasks/converter.rb
View file

@ -142,7 +142,7 @@ private
if scope != ''
scope = scope.scan(/[\w-]+/).join('-') + '-'
end
"#{matches.first}@include #{scope}#{matches.last}"
"#{matches.first}@include #{scope}#{matches.last.tr(';', ',')}"
end
end

3
vendor/assets/javascripts/bootstrap.js vendored
View file

@ -5,9 +5,8 @@
//= require bootstrap/collapse
//= require bootstrap/dropdown
//= require bootstrap/modal
//= require bootstrap/popover
//= require bootstrap/scrollspy
//= require bootstrap/tab
//= require bootstrap/tooltip
// Popover depends on tooltip and must be included after it:
//= require bootstrap/popover
//= require bootstrap/transition

4
vendor/assets/stylesheets/bootstrap/_carousel.scss vendored
View file

@ -80,13 +80,13 @@
// Set gradients for backgrounds
&.left {
@include gradient-horizontal($start-color: rgba(0,0,0,.5); $end-color: rgba(0,0,0,.0001));
@include gradient-horizontal($start-color: rgba(0,0,0,.5), $end-color: rgba(0,0,0,.0001));
background-color: transparent;
}
&.right {
left: auto;
right: 0;
@include gradient-horizontal($start-color: rgba(0,0,0,.0001); $end-color: rgba(0,0,0,.5));
@include gradient-horizontal($start-color: rgba(0,0,0,.0001), $end-color: rgba(0,0,0,.5));
background-color: transparent;
}

4
vendor/assets/stylesheets/bootstrap/_dropdowns.scss vendored
View file

@ -67,7 +67,7 @@
&:focus {
text-decoration: none;
color: $dropdown-link-hover-color;
@include gradient-vertical($start-color: $dropdown-link-hover-bg; $end-color: darken($dropdown-link-hover-bg, 5%));
@include gradient-vertical($start-color: $dropdown-link-hover-bg, $end-color: darken($dropdown-link-hover-bg, 5%));
}
}
@ -80,7 +80,7 @@
color: $dropdown-link-active-color;
text-decoration: none;
outline: 0;
@include gradient-vertical($start-color: $dropdown-link-active-bg; $end-color: darken($dropdown-link-active-bg, 5%));
@include gradient-vertical($start-color: $dropdown-link-active-bg, $end-color: darken($dropdown-link-active-bg, 5%));
}
}