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

Merge branch 'bootstrap-2.3.2' of git://github.com/mojavelinux/bootstrap-sass

Browse source
This commit is contained in:
Thomas McDonald 2013-06-01 00:21:28 +01:00
commit 8b5b2124a4
21 changed files with 67 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,5 +1,9 @@
# Changelog
## 2.3.2.0
* Update to Bootstrap 2.3.2 - *Dan Allen*
## 2.3.1.3
* Find the correct Sprockets context for the `image_path` function - *Tristan Harward, Gleb Mazovetskiy*

2
bootstrap-sass.gemspec
View file

@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = "bootstrap-sass"
s.version = '2.3.1.3'
s.version = '2.3.2.0'
s.authors = ["Thomas McDonald"]
s.email = 'tom@conceptcoding.co.uk'
s.summary = "Twitter's Bootstrap, converted to Sass and ready to drop into Rails or Compass"

2
update-bootstrap.sh
View file

@ -19,7 +19,7 @@ rm -r $ROOT/stylesheets/bootstrap/tests
patch -f vendor/assets/stylesheets/bootstrap/_variables.scss < asseturl.patch
# Patch paths in bootstrap.scss and responsive.scss
sed -i .bak 's_@import \"_@import \"bootstrap/_g' $ROOT/stylesheets/bootstrap/{bootstrap,responsive}.scss
sed -i.bak 's_@import \"_@import \"bootstrap/_g' $ROOT/stylesheets/bootstrap/{bootstrap,responsive}.scss
rm $ROOT/stylesheets/bootstrap/*.bak
rm -rf $TMP

2
vendor/assets/javascripts/bootstrap-affix.js vendored
View file

@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-affix.js v2.3.1
* bootstrap-affix.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.

2
vendor/assets/javascripts/bootstrap-alert.js vendored
View file

@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-alert.js v2.3.1
* bootstrap-alert.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.

2
vendor/assets/javascripts/bootstrap-button.js vendored
View file

@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-button.js v2.3.1
* bootstrap-button.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.

2
vendor/assets/javascripts/bootstrap-carousel.js vendored
View file

@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-carousel.js v2.3.1
* bootstrap-carousel.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.

2
vendor/assets/javascripts/bootstrap-collapse.js vendored
View file

@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-collapse.js v2.3.1
* bootstrap-collapse.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.

8
vendor/assets/javascripts/bootstrap-dropdown.js vendored
View file

@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-dropdown.js v2.3.1
* bootstrap-dropdown.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
@ -52,6 +52,10 @@
clearMenus()
if (!isActive) {
if ('ontouchstart' in document.documentElement) {
// if mobile we we use a backdrop because click events don't delegate
$('<div class="dropdown-backdrop"/>').insertBefore($(this)).on('click', clearMenus)
}
$parent.toggleClass('open')
}
@ -104,6 +108,7 @@
}
function clearMenus() {
$('.dropdown-backdrop').remove()
$(toggle).each(function () {
getParent($(this)).removeClass('open')
})
@ -158,7 +163,6 @@
$(document)
.on('click.dropdown.data-api', clearMenus)
.on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
.on('click.dropdown-menu', function (e) { e.stopPropagation() })
.on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)

2
vendor/assets/javascripts/bootstrap-modal.js vendored
View file

@ -1,5 +1,5 @@
/* =========================================================
* bootstrap-modal.js v2.3.1
* bootstrap-modal.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.

2
vendor/assets/javascripts/bootstrap-popover.js vendored
View file

@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-popover.js v2.3.1
* bootstrap-popover.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.

2
vendor/assets/javascripts/bootstrap-scrollspy.js vendored
View file

@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-scrollspy.js v2.3.1
* bootstrap-scrollspy.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.

2
vendor/assets/javascripts/bootstrap-tab.js vendored
View file

@ -1,5 +1,5 @@
/* ========================================================
* bootstrap-tab.js v2.3.1
* bootstrap-tab.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.

2
vendor/assets/javascripts/bootstrap-tooltip.js vendored
View file

@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-tooltip.js v2.3.1
* bootstrap-tooltip.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================

2
vendor/assets/javascripts/bootstrap-transition.js vendored
View file

@ -1,5 +1,5 @@
/* ===================================================
* bootstrap-transition.js v2.3.1
* bootstrap-transition.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.

2
vendor/assets/javascripts/bootstrap-typeahead.js vendored
View file

@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-typeahead.js v2.3.1
* bootstrap-typeahead.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.

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

@ -135,6 +135,17 @@
}
}
// Backdrop to catch body clicks on mobile, etc.
// ---------------------------
.dropdown-backdrop {
position: fixed;
left: 0;
right: 0;
bottom: 0;
top: 0;
z-index: $zindexDropdown - 10;
}
// Right aligned dropdowns
// ---------------------------
.pull-right > .dropdown-menu {

44
vendor/assets/stylesheets/bootstrap/_mixins.scss vendored
View file

@ -436,6 +436,17 @@
background-image: -o-linear-gradient($deg, $startColor, $endColor); // Opera 11.10
background-image: linear-gradient($deg, $startColor, $endColor); // Standard, IE10
}
@mixin gradient-horizontal-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f) {
background-color: mix($midColor, $endColor, 80%);
background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from($startColor), color-stop($colorStop, $midColor), to($endColor));
background-image: -webkit-linear-gradient(left, $startColor, $midColor $colorStop, $endColor);
background-image: -moz-linear-gradient(left, $startColor, $midColor $colorStop, $endColor);
background-image: -o-linear-gradient(left, $startColor, $midColor $colorStop, $endColor);
background-image: linear-gradient(to right, $startColor, $midColor $colorStop, $endColor);
background-repeat: no-repeat;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback
}
@mixin gradient-vertical-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f) {
background-color: mix($midColor, $endColor, 80%);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), color-stop($colorStop, $midColor), to($endColor));
@ -578,16 +589,14 @@
}
@mixin grid-core-span-x($gridColumns, $gridColumnWidth, $gridGutterWidth) {
@while $gridColumns > 0 {
.span#{$gridColumns} { @include grid-core-span($gridColumns, $gridColumnWidth, $gridGutterWidth)}
$gridColumns: $gridColumns - 1;
@for $i from 1 through $gridColumns {
.span#{$i} { @include grid-core-span($i, $gridColumnWidth, $gridGutterWidth); }
}
}
@mixin grid-core-offset-x($gridColumns, $gridColumnWidth, $gridGutterWidth) {
@while $gridColumns > 0 {
.offset#{$gridColumns} { @include grid-core-offset($gridColumns, $gridColumnWidth, $gridGutterWidth); }
$gridColumns: $gridColumns - 1;
@for $i from 1 through $gridColumns {
.offset#{$i} { @include grid-core-offset($i, $gridColumnWidth, $gridGutterWidth); }
}
}
@ -627,17 +636,15 @@
}
@mixin grid-fluid-span-x($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
@while $gridColumns > 0 {
.span#{$gridColumns} { @include grid-fluid-span($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth); }
$gridColumns: $gridColumns - 1;
@for $i from 1 through $gridColumns {
.span#{$i} { @include grid-fluid-span($i, $fluidGridColumnWidth, $fluidGridGutterWidth); }
}
}
@mixin grid-fluid-offset-x($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
@while $gridColumns > 0 {
.offset#{$gridColumns} { @include grid-fluid-offset($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth); }
.offset#{$gridColumns}:first-child { @include grid-fluid-offset-first-child($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth); }
$gridColumns: $gridColumns - 1;
@for $i from 1 through $gridColumns {
.offset#{$i} { @include grid-fluid-offset($i, $fluidGridColumnWidth, $fluidGridGutterWidth); }
.offset#{$i}:first-child { @include grid-fluid-offset-first-child($i, $fluidGridColumnWidth, $fluidGridGutterWidth); }
}
}
@ -675,13 +682,12 @@
}
@mixin grid-input-span-x($gridColumns, $gridColumnWidth, $gridGutterWidth) {
@while $gridColumns > 0 {
input.span#{$gridColumns},
textarea.span#{$gridColumns},
.uneditable-input.span#{$gridColumns} {
@include grid-input-span($gridColumns, $gridColumnWidth, $gridGutterWidth);
@for $i from 1 through $gridColumns {
input.span#{$i},
textarea.span#{$i},
.uneditable-input.span#{$i} {
@include grid-input-span($i, $gridColumnWidth, $gridGutterWidth);
}
$gridColumns: $gridColumns - 1;
}
}

6
vendor/assets/stylesheets/bootstrap/_variables.scss vendored
View file

@ -62,9 +62,9 @@ $headingsColor: inherit !default; // empty to use BS default, $textColor
// -------------------------
// Based on 14px font-size and 20px line-height
$fontSizeLarge: $baseFontSize * 1.25 !default; // ~18px
$fontSizeSmall: $baseFontSize * 0.85 !default; // ~12px
$fontSizeMini: $baseFontSize * 0.75 !default; // ~11px
$fontSizeLarge: $baseFontSize * 1.25; // ~18px
$fontSizeSmall: $baseFontSize * 0.85; // ~12px
$fontSizeMini: $baseFontSize * 0.75; // ~11px
$paddingLarge: 11px 19px !default; // 44px
$paddingSmall: 2px 10px !default; // 26px

2
vendor/assets/stylesheets/bootstrap/bootstrap.scss vendored
View file

@ -1,5 +1,5 @@
/*!
* Bootstrap v2.3.1
* Bootstrap v2.3.2
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0

2
vendor/assets/stylesheets/bootstrap/responsive.scss vendored
View file

@ -1,5 +1,5 @@
/*!
* Bootstrap Responsive v2.3.1
* Bootstrap Responsive v2.3.2
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0