bootstrap-sass-rails 3.0.0.3 → 3.0.3.0
Sign up to get free protection for your applications and to get access to all the features.
- data/README.md +20 -0
- data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.eot +0 -0
- data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.svg +200 -199
- data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.ttf +0 -0
- data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.woff +0 -0
- data/app/assets/javascripts/twitter/bootstrap/affix.js +4 -4
- data/app/assets/javascripts/twitter/bootstrap/alert.js +3 -3
- data/app/assets/javascripts/twitter/bootstrap/button.js +13 -7
- data/app/assets/javascripts/twitter/bootstrap/carousel.js +8 -8
- data/app/assets/javascripts/twitter/bootstrap/collapse.js +4 -4
- data/app/assets/javascripts/twitter/bootstrap/dropdown.js +8 -8
- data/app/assets/javascripts/twitter/bootstrap/modal.js +4 -4
- data/app/assets/javascripts/twitter/bootstrap/popover.js +4 -4
- data/app/assets/javascripts/twitter/bootstrap/scrollspy.js +5 -5
- data/app/assets/javascripts/twitter/bootstrap/tab.js +5 -5
- data/app/assets/javascripts/twitter/bootstrap/tooltip.js +4 -4
- data/app/assets/javascripts/twitter/bootstrap/transition.js +3 -3
- data/app/assets/stylesheets/twitter/bootstrap/_alerts.scss +1 -1
- data/app/assets/stylesheets/twitter/bootstrap/_badges.scss +6 -6
- data/app/assets/stylesheets/twitter/bootstrap/_breadcrumbs.scss +2 -2
- data/app/assets/stylesheets/twitter/bootstrap/_button-groups.scss +12 -33
- data/app/assets/stylesheets/twitter/bootstrap/_buttons.scss +4 -9
- data/app/assets/stylesheets/twitter/bootstrap/_carousel.scss +33 -10
- data/app/assets/stylesheets/twitter/bootstrap/_close.scss +1 -0
- data/app/assets/stylesheets/twitter/bootstrap/_code.scss +5 -8
- data/app/assets/stylesheets/twitter/bootstrap/_dropdowns.scss +3 -9
- data/app/assets/stylesheets/twitter/bootstrap/_forms.scss +33 -10
- data/app/assets/stylesheets/twitter/bootstrap/_glyphicons.scss +15 -10
- data/app/assets/stylesheets/twitter/bootstrap/_grid.scss +36 -304
- data/app/assets/stylesheets/twitter/bootstrap/_input-groups.scss +10 -1
- data/app/assets/stylesheets/twitter/bootstrap/_jumbotron.scss +10 -4
- data/app/assets/stylesheets/twitter/bootstrap/_labels.scss +6 -0
- data/app/assets/stylesheets/twitter/bootstrap/_list-group.scss +14 -15
- data/app/assets/stylesheets/twitter/bootstrap/_mixins.scss +176 -65
- data/app/assets/stylesheets/twitter/bootstrap/_modals.scss +5 -21
- data/app/assets/stylesheets/twitter/bootstrap/_navbar.scss +49 -58
- data/app/assets/stylesheets/twitter/bootstrap/_navs.scss +43 -30
- data/app/assets/stylesheets/twitter/bootstrap/_normalize.scss +16 -6
- data/app/assets/stylesheets/twitter/bootstrap/_pagination.scss +2 -0
- data/app/assets/stylesheets/twitter/bootstrap/_panels.scss +41 -7
- data/app/assets/stylesheets/twitter/bootstrap/_print.scss +6 -1
- data/app/assets/stylesheets/twitter/bootstrap/_progress-bars.scss +4 -19
- data/app/assets/stylesheets/twitter/bootstrap/_responsive-utilities.scss +37 -48
- data/app/assets/stylesheets/twitter/bootstrap/_scaffolding.scss +1 -12
- data/app/assets/stylesheets/twitter/bootstrap/_tables.scss +45 -50
- data/app/assets/stylesheets/twitter/bootstrap/_theme.scss +26 -11
- data/app/assets/stylesheets/twitter/bootstrap/_thumbnails.scss +22 -15
- data/app/assets/stylesheets/twitter/bootstrap/_tooltip.scss +8 -8
- data/app/assets/stylesheets/twitter/bootstrap/_type.scss +105 -62
- data/app/assets/stylesheets/twitter/bootstrap/_utilities.scss +15 -1
- data/app/assets/stylesheets/twitter/bootstrap/_variables.scss +69 -47
- data/app/assets/stylesheets/twitter/bootstrap.css.scss +0 -10
- data/lib/bootstrap/sass/rails/engine.rb +9 -1
- data/lib/bootstrap/sass/rails/version.rb +1 -1
- data/lib/generators/bootstrap/customize_generator.rb +37 -0
- data/lib/generators/bootstrap/templates/USAGE +23 -0
- data/lib/generators/bootstrap/templates/bootstrap-custom.css.scss +18 -0
- data/lib/generators/bootstrap/templates/bootstrap-custom.js +3 -0
- data/test/cases/less_to_sass_spec.rb +1 -1
- data/test/cases/usage_css_spec.rb +0 -3
- metadata +27 -5
- checksums.yaml +0 -15
Binary file
|
Binary file
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: affix.js v3.0.
|
3
|
-
* http://
|
2
|
+
* Bootstrap: affix.js v3.0.3
|
3
|
+
* http://getbootstrap.com/javascript/#affix
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright
|
5
|
+
* Copyright 2013 Twitter, Inc.
|
6
6
|
*
|
7
7
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
8
8
|
* you may not use this file except in compliance with the License.
|
@@ -123,4 +123,4 @@
|
|
123
123
|
})
|
124
124
|
})
|
125
125
|
|
126
|
-
}(
|
126
|
+
}(jQuery);
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: alert.js v3.0.
|
3
|
-
* http://
|
2
|
+
* Bootstrap: alert.js v3.0.3
|
3
|
+
* http://getbootstrap.com/javascript/#alerts
|
4
4
|
* ========================================================================
|
5
5
|
* Copyright 2013 Twitter, Inc.
|
6
6
|
*
|
@@ -95,4 +95,4 @@
|
|
95
95
|
|
96
96
|
$(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
|
97
97
|
|
98
|
-
}(
|
98
|
+
}(jQuery);
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: button.js v3.0.
|
3
|
-
* http://
|
2
|
+
* Bootstrap: button.js v3.0.3
|
3
|
+
* http://getbootstrap.com/javascript/#buttons
|
4
4
|
* ========================================================================
|
5
5
|
* Copyright 2013 Twitter, Inc.
|
6
6
|
*
|
@@ -54,15 +54,21 @@
|
|
54
54
|
|
55
55
|
Button.prototype.toggle = function () {
|
56
56
|
var $parent = this.$element.closest('[data-toggle="buttons"]')
|
57
|
+
var changed = true
|
57
58
|
|
58
59
|
if ($parent.length) {
|
59
60
|
var $input = this.$element.find('input')
|
60
|
-
|
61
|
-
|
62
|
-
|
61
|
+
if ($input.prop('type') === 'radio') {
|
62
|
+
// see if clicking on current one
|
63
|
+
if ($input.prop('checked') && this.$element.hasClass('active'))
|
64
|
+
changed = false
|
65
|
+
else
|
66
|
+
$parent.find('.active').removeClass('active')
|
67
|
+
}
|
68
|
+
if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
|
63
69
|
}
|
64
70
|
|
65
|
-
this.$element.toggleClass('active')
|
71
|
+
if (changed) this.$element.toggleClass('active')
|
66
72
|
}
|
67
73
|
|
68
74
|
|
@@ -106,4 +112,4 @@
|
|
106
112
|
e.preventDefault()
|
107
113
|
})
|
108
114
|
|
109
|
-
}(
|
115
|
+
}(jQuery);
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: carousel.js v3.0.
|
3
|
-
* http://
|
2
|
+
* Bootstrap: carousel.js v3.0.3
|
3
|
+
* http://getbootstrap.com/javascript/#carousel
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright
|
5
|
+
* Copyright 2013 Twitter, Inc.
|
6
6
|
*
|
7
7
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
8
8
|
* you may not use this file except in compliance with the License.
|
@@ -69,7 +69,7 @@
|
|
69
69
|
|
70
70
|
if (pos > (this.$items.length - 1) || pos < 0) return
|
71
71
|
|
72
|
-
if (this.sliding) return this.$element.one('slid', function () { that.to(pos) })
|
72
|
+
if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) })
|
73
73
|
if (activeIndex == pos) return this.pause().cycle()
|
74
74
|
|
75
75
|
return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
|
@@ -121,7 +121,7 @@
|
|
121
121
|
|
122
122
|
if (this.$indicators.length) {
|
123
123
|
this.$indicators.find('.active').removeClass('active')
|
124
|
-
this.$element.one('slid', function () {
|
124
|
+
this.$element.one('slid.bs.carousel', function () {
|
125
125
|
var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
|
126
126
|
$nextIndicator && $nextIndicator.addClass('active')
|
127
127
|
})
|
@@ -139,7 +139,7 @@
|
|
139
139
|
$next.removeClass([type, direction].join(' ')).addClass('active')
|
140
140
|
$active.removeClass(['active', direction].join(' '))
|
141
141
|
that.sliding = false
|
142
|
-
setTimeout(function () { that.$element.trigger('slid') }, 0)
|
142
|
+
setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
|
143
143
|
})
|
144
144
|
.emulateTransitionEnd(600)
|
145
145
|
} else {
|
@@ -148,7 +148,7 @@
|
|
148
148
|
$active.removeClass('active')
|
149
149
|
$next.addClass('active')
|
150
150
|
this.sliding = false
|
151
|
-
this.$element.trigger('slid')
|
151
|
+
this.$element.trigger('slid.bs.carousel')
|
152
152
|
}
|
153
153
|
|
154
154
|
isCycling && this.cycle()
|
@@ -214,4 +214,4 @@
|
|
214
214
|
})
|
215
215
|
})
|
216
216
|
|
217
|
-
}(
|
217
|
+
}(jQuery);
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: collapse.js v3.0.
|
3
|
-
* http://
|
2
|
+
* Bootstrap: collapse.js v3.0.3
|
3
|
+
* http://getbootstrap.com/javascript/#collapse
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright
|
5
|
+
* Copyright 2013 Twitter, Inc.
|
6
6
|
*
|
7
7
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
8
8
|
* you may not use this file except in compliance with the License.
|
@@ -176,4 +176,4 @@
|
|
176
176
|
$target.collapse(option)
|
177
177
|
})
|
178
178
|
|
179
|
-
}(
|
179
|
+
}(jQuery);
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: dropdown.js v3.0.
|
3
|
-
* http://
|
2
|
+
* Bootstrap: dropdown.js v3.0.3
|
3
|
+
* http://getbootstrap.com/javascript/#dropdowns
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright
|
5
|
+
* Copyright 2013 Twitter, Inc.
|
6
6
|
*
|
7
7
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
8
8
|
* you may not use this file except in compliance with the License.
|
@@ -26,7 +26,7 @@
|
|
26
26
|
var backdrop = '.dropdown-backdrop'
|
27
27
|
var toggle = '[data-toggle=dropdown]'
|
28
28
|
var Dropdown = function (element) {
|
29
|
-
|
29
|
+
$(element).on('click.bs.dropdown', this.toggle)
|
30
30
|
}
|
31
31
|
|
32
32
|
Dropdown.prototype.toggle = function (e) {
|
@@ -41,7 +41,7 @@
|
|
41
41
|
|
42
42
|
if (!isActive) {
|
43
43
|
if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
|
44
|
-
// if mobile we
|
44
|
+
// if mobile we use a backdrop because click events don't delegate
|
45
45
|
$('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
|
46
46
|
}
|
47
47
|
|
@@ -123,9 +123,9 @@
|
|
123
123
|
$.fn.dropdown = function (option) {
|
124
124
|
return this.each(function () {
|
125
125
|
var $this = $(this)
|
126
|
-
var data = $this.data('dropdown')
|
126
|
+
var data = $this.data('bs.dropdown')
|
127
127
|
|
128
|
-
if (!data) $this.data('dropdown', (data = new Dropdown(this)))
|
128
|
+
if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
|
129
129
|
if (typeof option == 'string') data[option].call($this)
|
130
130
|
})
|
131
131
|
}
|
@@ -151,4 +151,4 @@
|
|
151
151
|
.on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
|
152
152
|
.on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
|
153
153
|
|
154
|
-
}(
|
154
|
+
}(jQuery);
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: modal.js v3.0.
|
3
|
-
* http://
|
2
|
+
* Bootstrap: modal.js v3.0.3
|
3
|
+
* http://getbootstrap.com/javascript/#modals
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright
|
5
|
+
* Copyright 2013 Twitter, Inc.
|
6
6
|
*
|
7
7
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
8
8
|
* you may not use this file except in compliance with the License.
|
@@ -243,4 +243,4 @@
|
|
243
243
|
.on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
|
244
244
|
.on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
|
245
245
|
|
246
|
-
}(
|
246
|
+
}(jQuery);
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: popover.js v3.0.
|
3
|
-
* http://
|
2
|
+
* Bootstrap: popover.js v3.0.3
|
3
|
+
* http://getbootstrap.com/javascript/#popovers
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright
|
5
|
+
* Copyright 2013 Twitter, Inc.
|
6
6
|
*
|
7
7
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
8
8
|
* you may not use this file except in compliance with the License.
|
@@ -114,4 +114,4 @@
|
|
114
114
|
return this
|
115
115
|
}
|
116
116
|
|
117
|
-
}(
|
117
|
+
}(jQuery);
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: scrollspy.js v3.0.
|
3
|
-
* http://
|
2
|
+
* Bootstrap: scrollspy.js v3.0.3
|
3
|
+
* http://getbootstrap.com/javascript/#scrollspy
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright
|
5
|
+
* Copyright 2013 Twitter, Inc.
|
6
6
|
*
|
7
7
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
8
8
|
* you may not use this file except in compliance with the License.
|
@@ -113,7 +113,7 @@
|
|
113
113
|
.addClass('active')
|
114
114
|
}
|
115
115
|
|
116
|
-
active.trigger('activate')
|
116
|
+
active.trigger('activate.bs.scrollspy')
|
117
117
|
}
|
118
118
|
|
119
119
|
|
@@ -155,4 +155,4 @@
|
|
155
155
|
})
|
156
156
|
})
|
157
157
|
|
158
|
-
}(
|
158
|
+
}(jQuery);
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: tab.js v3.0.
|
3
|
-
* http://
|
2
|
+
* Bootstrap: tab.js v3.0.3
|
3
|
+
* http://getbootstrap.com/javascript/#tabs
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright
|
5
|
+
* Copyright 2013 Twitter, Inc.
|
6
6
|
*
|
7
7
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
8
8
|
* you may not use this file except in compliance with the License.
|
@@ -30,7 +30,7 @@
|
|
30
30
|
Tab.prototype.show = function () {
|
31
31
|
var $this = this.element
|
32
32
|
var $ul = $this.closest('ul:not(.dropdown-menu)')
|
33
|
-
var selector = $this.
|
33
|
+
var selector = $this.data('target')
|
34
34
|
|
35
35
|
if (!selector) {
|
36
36
|
selector = $this.attr('href')
|
@@ -132,4 +132,4 @@
|
|
132
132
|
$(this).tab('show')
|
133
133
|
})
|
134
134
|
|
135
|
-
}(
|
135
|
+
}(jQuery);
|
@@ -1,9 +1,9 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: tooltip.js v3.0.
|
3
|
-
* http://
|
2
|
+
* Bootstrap: tooltip.js v3.0.3
|
3
|
+
* http://getbootstrap.com/javascript/#tooltip
|
4
4
|
* Inspired by the original jQuery.tipsy by Jason Frame
|
5
5
|
* ========================================================================
|
6
|
-
* Copyright
|
6
|
+
* Copyright 2013 Twitter, Inc.
|
7
7
|
*
|
8
8
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
9
9
|
* you may not use this file except in compliance with the License.
|
@@ -383,4 +383,4 @@
|
|
383
383
|
return this
|
384
384
|
}
|
385
385
|
|
386
|
-
}(
|
386
|
+
}(jQuery);
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: transition.js v3.0.
|
3
|
-
* http://
|
2
|
+
* Bootstrap: transition.js v3.0.3
|
3
|
+
* http://getbootstrap.com/javascript/#transitions
|
4
4
|
* ========================================================================
|
5
5
|
* Copyright 2013 Twitter, Inc.
|
6
6
|
*
|
@@ -53,4 +53,4 @@
|
|
53
53
|
$.support.transition = transitionEnd()
|
54
54
|
})
|
55
55
|
|
56
|
-
}(
|
56
|
+
}(jQuery);
|
@@ -15,7 +15,7 @@
|
|
15
15
|
// Headings for larger alerts
|
16
16
|
h4 {
|
17
17
|
margin-top: 0;
|
18
|
-
// Specified for the h4 to prevent conflicts of changing $
|
18
|
+
// Specified for the h4 to prevent conflicts of changing $headings-color
|
19
19
|
color: inherit;
|
20
20
|
}
|
21
21
|
// Provide class for links that match alerts
|
@@ -22,6 +22,12 @@
|
|
22
22
|
&:empty {
|
23
23
|
display: none;
|
24
24
|
}
|
25
|
+
|
26
|
+
// Quick fix for badges in buttons
|
27
|
+
.btn & {
|
28
|
+
position: relative;
|
29
|
+
top: -1px;
|
30
|
+
}
|
25
31
|
}
|
26
32
|
|
27
33
|
// Hover state, but only for links
|
@@ -34,12 +40,6 @@ a.badge {
|
|
34
40
|
}
|
35
41
|
}
|
36
42
|
|
37
|
-
// Quick fix for labels/badges in buttons
|
38
|
-
.btn .badge {
|
39
|
-
position: relative;
|
40
|
-
top: -1px;
|
41
|
-
}
|
42
|
-
|
43
43
|
// Account for counters in navs
|
44
44
|
a.list-group-item.active > .badge,
|
45
45
|
.nav-pills > .active > a > .badge {
|
@@ -11,8 +11,8 @@
|
|
11
11
|
border-radius: $border-radius-base;
|
12
12
|
> li {
|
13
13
|
display: inline-block;
|
14
|
-
|
15
|
-
content: "
|
14
|
+
+ li:before {
|
15
|
+
content: "#{$breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
|
16
16
|
padding: 0 5px;
|
17
17
|
color: $breadcrumb-color;
|
18
18
|
}
|
@@ -2,37 +2,6 @@
|
|
2
2
|
// Button groups
|
3
3
|
// --------------------------------------------------
|
4
4
|
|
5
|
-
// Button carets
|
6
|
-
//
|
7
|
-
// Match the button text color to the arrow/caret for indicating dropdown-ness.
|
8
|
-
|
9
|
-
.caret {
|
10
|
-
.btn-default & {
|
11
|
-
border-top-color: $btn-default-color;
|
12
|
-
}
|
13
|
-
.btn-primary &,
|
14
|
-
.btn-success &,
|
15
|
-
.btn-warning &,
|
16
|
-
.btn-danger &,
|
17
|
-
.btn-info & {
|
18
|
-
border-top-color: #fff;
|
19
|
-
}
|
20
|
-
}
|
21
|
-
.dropup {
|
22
|
-
& .btn-default .caret {
|
23
|
-
border-bottom-color: $btn-default-color;
|
24
|
-
}
|
25
|
-
.btn-primary,
|
26
|
-
.btn-success,
|
27
|
-
.btn-warning,
|
28
|
-
.btn-danger,
|
29
|
-
.btn-info {
|
30
|
-
.caret {
|
31
|
-
border-bottom-color: #fff;
|
32
|
-
}
|
33
|
-
}
|
34
|
-
}
|
35
|
-
|
36
5
|
// Make the div behave like a button
|
37
6
|
.btn-group,
|
38
7
|
.btn-group-vertical {
|
@@ -150,6 +119,11 @@
|
|
150
119
|
// Remove the gradient and set the same inset shadow as the :active state
|
151
120
|
.btn-group.open .dropdown-toggle {
|
152
121
|
@include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
|
122
|
+
|
123
|
+
// Show no shadow for `.btn-link` since it has no other button styles.
|
124
|
+
&.btn-link {
|
125
|
+
@include box-shadow(none);
|
126
|
+
}
|
153
127
|
}
|
154
128
|
|
155
129
|
|
@@ -173,7 +147,8 @@
|
|
173
147
|
|
174
148
|
.btn-group-vertical {
|
175
149
|
> .btn,
|
176
|
-
> .btn-group
|
150
|
+
> .btn-group,
|
151
|
+
> .btn-group > .btn {
|
177
152
|
display: block;
|
178
153
|
float: none;
|
179
154
|
width: 100%;
|
@@ -233,11 +208,15 @@
|
|
233
208
|
width: 100%;
|
234
209
|
table-layout: fixed;
|
235
210
|
border-collapse: separate;
|
236
|
-
.btn
|
211
|
+
> .btn,
|
212
|
+
> .btn-group {
|
237
213
|
float: none;
|
238
214
|
display: table-cell;
|
239
215
|
width: 1%;
|
240
216
|
}
|
217
|
+
> .btn-group .btn {
|
218
|
+
width: 100%;
|
219
|
+
}
|
241
220
|
}
|
242
221
|
|
243
222
|
|
@@ -6,20 +6,17 @@
|
|
6
6
|
// Base styles
|
7
7
|
// --------------------------------------------------
|
8
8
|
|
9
|
-
// Core styles
|
10
9
|
.btn {
|
11
10
|
display: inline-block;
|
12
|
-
padding: $padding-base-vertical $padding-base-horizontal;
|
13
11
|
margin-bottom: 0; // For input.btn
|
14
|
-
font-size: $font-size-base;
|
15
12
|
font-weight: $btn-font-weight;
|
16
|
-
line-height: $line-height-base;
|
17
13
|
text-align: center;
|
18
14
|
vertical-align: middle;
|
19
15
|
cursor: pointer;
|
16
|
+
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
|
20
17
|
border: 1px solid transparent;
|
21
|
-
border-radius: $border-radius-base;
|
22
18
|
white-space: nowrap;
|
19
|
+
@include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base);
|
23
20
|
@include user-select(none);
|
24
21
|
|
25
22
|
&:focus {
|
@@ -47,7 +44,6 @@
|
|
47
44
|
@include opacity(.65);
|
48
45
|
@include box-shadow(none);
|
49
46
|
}
|
50
|
-
|
51
47
|
}
|
52
48
|
|
53
49
|
|
@@ -125,13 +121,12 @@
|
|
125
121
|
// line-height: ensure even-numbered height of button next to large input
|
126
122
|
@include button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
|
127
123
|
}
|
128
|
-
.btn-sm
|
129
|
-
.btn-xs {
|
124
|
+
.btn-sm {
|
130
125
|
// line-height: ensure proper height of button next to small input
|
131
126
|
@include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
|
132
127
|
}
|
133
128
|
.btn-xs {
|
134
|
-
padding
|
129
|
+
@include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $border-radius-small);
|
135
130
|
}
|
136
131
|
|
137
132
|
|
@@ -75,7 +75,7 @@
|
|
75
75
|
color: $carousel-control-color;
|
76
76
|
text-align: center;
|
77
77
|
text-shadow: $carousel-text-shadow;
|
78
|
-
// We can't have this transition here because
|
78
|
+
// We can't have this transition here because WebKit cancels the carousel
|
79
79
|
// animation if you trip this while in the middle of another animation.
|
80
80
|
|
81
81
|
// Set gradients for backgrounds
|
@@ -91,6 +91,7 @@
|
|
91
91
|
// Hover/focus state
|
92
92
|
&:hover,
|
93
93
|
&:focus {
|
94
|
+
outline: none;
|
94
95
|
color: $carousel-control-color;
|
95
96
|
text-decoration: none;
|
96
97
|
@include opacity(.9);
|
@@ -103,11 +104,18 @@
|
|
103
104
|
.glyphicon-chevron-right {
|
104
105
|
position: absolute;
|
105
106
|
top: 50%;
|
106
|
-
left: 50%;
|
107
107
|
z-index: 5;
|
108
108
|
display: inline-block;
|
109
109
|
}
|
110
110
|
.icon-prev,
|
111
|
+
.glyphicon-chevron-left {
|
112
|
+
left: 50%;
|
113
|
+
}
|
114
|
+
.icon-next,
|
115
|
+
.glyphicon-chevron-right {
|
116
|
+
right: 50%;
|
117
|
+
}
|
118
|
+
.icon-prev,
|
111
119
|
.icon-next {
|
112
120
|
width: 20px;
|
113
121
|
height: 20px;
|
@@ -153,6 +161,17 @@
|
|
153
161
|
border: 1px solid $carousel-indicator-border-color;
|
154
162
|
border-radius: 10px;
|
155
163
|
cursor: pointer;
|
164
|
+
|
165
|
+
// IE8-9 hack for event handling
|
166
|
+
//
|
167
|
+
// Internet Explorer 8-9 does not support clicks on elements without a set
|
168
|
+
// `background-color`. We cannot use `filter` since that's not viewed as a
|
169
|
+
// background color by the browser. Thus, a hack is needed.
|
170
|
+
//
|
171
|
+
// For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we
|
172
|
+
// set alpha transparency for the best results possible.
|
173
|
+
background-color: #000 \9; // IE8
|
174
|
+
background-color: rgba(0,0,0,0); // IE9
|
156
175
|
}
|
157
176
|
.active {
|
158
177
|
margin: 0;
|
@@ -183,16 +202,20 @@
|
|
183
202
|
|
184
203
|
|
185
204
|
// Scale up controls for tablets and up
|
186
|
-
@media screen and (min-width: $screen-
|
205
|
+
@media screen and (min-width: $screen-sm-min) {
|
187
206
|
|
188
207
|
// Scale up the controls a smidge
|
189
|
-
.carousel-control
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
208
|
+
.carousel-control {
|
209
|
+
.glyphicons-chevron-left,
|
210
|
+
.glyphicons-chevron-right,
|
211
|
+
.icon-prev,
|
212
|
+
.icon-next {
|
213
|
+
width: 30px;
|
214
|
+
height: 30px;
|
215
|
+
margin-top: -15px;
|
216
|
+
margin-left: -15px;
|
217
|
+
font-size: 30px;
|
218
|
+
}
|
196
219
|
}
|
197
220
|
|
198
221
|
// Show and left align the captions
|
@@ -1,11 +1,13 @@
|
|
1
1
|
//
|
2
|
-
// Code (inline and
|
2
|
+
// Code (inline and block)
|
3
3
|
// --------------------------------------------------
|
4
4
|
|
5
5
|
|
6
6
|
// Inline and block code styles
|
7
7
|
code,
|
8
|
-
|
8
|
+
kbd,
|
9
|
+
pre,
|
10
|
+
samp {
|
9
11
|
font-family: $font-family-monospace;
|
10
12
|
}
|
11
13
|
|
@@ -33,11 +35,6 @@ pre {
|
|
33
35
|
border: 1px solid $pre-border-color;
|
34
36
|
border-radius: $border-radius-base;
|
35
37
|
|
36
|
-
// Make prettyprint styles more spaced out for readability
|
37
|
-
&.prettyprint {
|
38
|
-
margin-bottom: $line-height-computed;
|
39
|
-
}
|
40
|
-
|
41
38
|
// Account for some code outputs that place code tags in pre tags
|
42
39
|
code {
|
43
40
|
padding: 0;
|
@@ -45,7 +42,7 @@ pre {
|
|
45
42
|
color: inherit;
|
46
43
|
white-space: pre-wrap;
|
47
44
|
background-color: transparent;
|
48
|
-
border: 0;
|
45
|
+
border-radius: 0;
|
49
46
|
}
|
50
47
|
}
|
51
48
|
|
@@ -10,13 +10,9 @@
|
|
10
10
|
height: 0;
|
11
11
|
margin-left: 2px;
|
12
12
|
vertical-align: middle;
|
13
|
-
border-top: $caret-width-base solid
|
13
|
+
border-top: $caret-width-base solid;
|
14
14
|
border-right: $caret-width-base solid transparent;
|
15
15
|
border-left: $caret-width-base solid transparent;
|
16
|
-
// Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once fixed,
|
17
|
-
// we can just straight up remove this.
|
18
|
-
border-bottom: 0 dotted;
|
19
|
-
content: "";
|
20
16
|
}
|
21
17
|
|
22
18
|
// The dropdown wrapper (div)
|
@@ -164,10 +160,8 @@
|
|
164
160
|
.navbar-fixed-bottom .dropdown {
|
165
161
|
// Reverse the caret
|
166
162
|
.caret {
|
167
|
-
|
168
|
-
|
169
|
-
border-top: 0 dotted;
|
170
|
-
border-bottom: 4px solid $dropdown-caret-color;
|
163
|
+
border-top: 0;
|
164
|
+
border-bottom: $caret-width-base solid;
|
171
165
|
content: "";
|
172
166
|
}
|
173
167
|
// Different positioning for bottom up menu
|