Skip to content

Commit 9162c01

Browse files
mjonuschatmjonuschat
committed
Merge branch 'release/3.0.1.0'
* release/3.0.1.0: Bump version to 3.0.1.0 Bump minimum calculation precision Cleanup _mixins.scss Update to twbs 3.0.1 Integrate changes up to twbs/bootstrap@f811c1b
2 parents 6f342d7 + 892b7f1 commit 9162c01

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+909
-870
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ gemfiles/*.lock
33
.bundle/
44
log/*.log
55
pkg/
6+
tmp/
67
test/dummy/db/*.sqlite3
78
test/dummy/log/*.log
89
test/dummy/tmp/

‎app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.eot

6.07 KB
Binary file not shown.

‎app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.svg

Lines changed: 200 additions & 199 deletions
Loading

‎app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.ttf

11.4 KB
Binary file not shown.

‎app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.woff

6.68 KB
Binary file not shown.

‎app/assets/javascripts/twitter/bootstrap/affix.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* ========================================================================
22
* Bootstrap: affix.js v3.0.0
3-
* http://twbs.github.com/bootstrap/javascript.html#affix
3+
* http://getbootstrap.com/javascript/#affix
44
* ========================================================================
5-
* Copyright 2012 Twitter, Inc.
5+
* Copyright 2013 Twitter, Inc.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

‎app/assets/javascripts/twitter/bootstrap/alert.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* ========================================================================
22
* Bootstrap: alert.js v3.0.0
3-
* http://twbs.github.com/bootstrap/javascript.html#alerts
3+
* http://getbootstrap.com/javascript/#alerts
44
* ========================================================================
55
* Copyright 2013 Twitter, Inc.
66
*

‎app/assets/javascripts/twitter/bootstrap/button.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* ========================================================================
22
* Bootstrap: button.js v3.0.0
3-
* http://twbs.github.com/bootstrap/javascript.html#buttons
3+
* http://getbootstrap.com/javascript/#buttons
44
* ========================================================================
55
* Copyright 2013 Twitter, Inc.
66
*

‎app/assets/javascripts/twitter/bootstrap/carousel.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* ========================================================================
22
* Bootstrap: carousel.js v3.0.0
3-
* http://twbs.github.com/bootstrap/javascript.html#carousel
3+
* http://getbootstrap.com/javascript/#carousel
44
* ========================================================================
5-
* Copyright 2012 Twitter, Inc.
5+
* Copyright 2013 Twitter, Inc.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

‎app/assets/javascripts/twitter/bootstrap/collapse.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* ========================================================================
22
* Bootstrap: collapse.js v3.0.0
3-
* http://twbs.github.com/bootstrap/javascript.html#collapse
3+
* http://getbootstrap.com/javascript/#collapse
44
* ========================================================================
5-
* Copyright 2012 Twitter, Inc.
5+
* Copyright 2013 Twitter, Inc.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

‎app/assets/javascripts/twitter/bootstrap/dropdown.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* ========================================================================
22
* Bootstrap: dropdown.js v3.0.0
3-
* http://twbs.github.com/bootstrap/javascript.html#dropdowns
3+
* http://getbootstrap.com/javascript/#dropdowns
44
* ========================================================================
5-
* Copyright 2012 Twitter, Inc.
5+
* Copyright 2013 Twitter, Inc.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

‎app/assets/javascripts/twitter/bootstrap/modal.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* ========================================================================
22
* Bootstrap: modal.js v3.0.0
3-
* http://twbs.github.com/bootstrap/javascript.html#modals
3+
* http://getbootstrap.com/javascript/#modals
44
* ========================================================================
5-
* Copyright 2012 Twitter, Inc.
5+
* Copyright 2013 Twitter, Inc.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

‎app/assets/javascripts/twitter/bootstrap/popover.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* ========================================================================
22
* Bootstrap: popover.js v3.0.0
3-
* http://twbs.github.com/bootstrap/javascript.html#popovers
3+
* http://getbootstrap.com/javascript/#popovers
44
* ========================================================================
5-
* Copyright 2012 Twitter, Inc.
5+
* Copyright 2013 Twitter, Inc.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

‎app/assets/javascripts/twitter/bootstrap/scrollspy.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* ========================================================================
22
* Bootstrap: scrollspy.js v3.0.0
3-
* http://twbs.github.com/bootstrap/javascript.html#scrollspy
3+
* http://getbootstrap.com/javascript/#scrollspy
44
* ========================================================================
5-
* Copyright 2012 Twitter, Inc.
5+
* Copyright 2013 Twitter, Inc.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.

‎app/assets/javascripts/twitter/bootstrap/tab.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* ========================================================================
22
* Bootstrap: tab.js v3.0.0
3-
* http://twbs.github.com/bootstrap/javascript.html#tabs
3+
* http://getbootstrap.com/javascript/#tabs
44
* ========================================================================
5-
* Copyright 2012 Twitter, Inc.
5+
* Copyright 2013 Twitter, Inc.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
3030
Tab.prototype.show = function () {
3131
var $this = this.element
3232
var $ul = $this.closest('ul:not(.dropdown-menu)')
33-
var selector = $this.attr('data-target')
33+
var selector = $this.data('target')
3434

3535
if (!selector) {
3636
selector = $this.attr('href')

‎app/assets/javascripts/twitter/bootstrap/tooltip.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* ========================================================================
22
* Bootstrap: tooltip.js v3.0.0
3-
* http://twbs.github.com/bootstrap/javascript.html#tooltip
3+
* http://getbootstrap.com/javascript/#tooltip
44
* Inspired by the original jQuery.tipsy by Jason Frame
55
* ========================================================================
6-
* Copyright 2012 Twitter, Inc.
6+
* Copyright 2013 Twitter, Inc.
77
*
88
* Licensed under the Apache License, Version 2.0 (the "License");
99
* you may not use this file except in compliance with the License.

‎app/assets/javascripts/twitter/bootstrap/transition.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* ========================================================================
22
* Bootstrap: transition.js v3.0.0
3-
* http://twbs.github.com/bootstrap/javascript.html#transitions
3+
* http://getbootstrap.com/javascript/#transitions
44
* ========================================================================
55
* Copyright 2013 Twitter, Inc.
66
*

‎app/assets/stylesheets/twitter/bootstrap.css.scss

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
/*!
2-
* Bootstrap v3.0.0
3-
*
4-
* Copyright 2013 Twitter, Inc
5-
* Licensed under the Apache License v2.0
6-
* http://www.apache.org/licenses/LICENSE-2.0
7-
*
8-
* Designed and built with all the love in the world by @mdo and @fat.
9-
*/
10-
111
// Core variables and mixins
122
@import "twitter/bootstrap/variables";
133
@import "twitter/bootstrap/mixins";

‎app/assets/stylesheets/twitter/bootstrap/_alerts.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// Headings for larger alerts
1616
h4 {
1717
margin-top: 0;
18-
// Specified for the h4 to prevent conflicts of changing $headingsColor
18+
// Specified for the h4 to prevent conflicts of changing $headings-color
1919
color: inherit;
2020
}
2121
// Provide class for links that match alerts

‎app/assets/stylesheets/twitter/bootstrap/_breadcrumbs.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
border-radius: $border-radius-base;
1212
> li {
1313
display: inline-block;
14-
&+li:before {
15-
content: "/\00a0"; // Unicode space added since inline-block means non-collapsing white-space
14+
+ li:before {
15+
content: "#{$breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
1616
padding: 0 5px;
1717
color: $breadcrumb-color;
1818
}

‎app/assets/stylesheets/twitter/bootstrap/_button-groups.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}
2020
}
2121
.dropup {
22-
& .btn-default .caret {
22+
.btn-default .caret {
2323
border-bottom-color: $btn-default-color;
2424
}
2525
.btn-primary,
@@ -150,6 +150,11 @@
150150
// Remove the gradient and set the same inset shadow as the :active state
151151
.btn-group.open .dropdown-toggle {
152152
@include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
153+
154+
// Show no shadow for `.btn-link` since it has no other button styles.
155+
&.btn-link {
156+
@include box-shadow(none);
157+
}
153158
}
154159

155160

‎app/assets/stylesheets/twitter/bootstrap/_buttons.scss

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,15 @@
99
// Core styles
1010
.btn {
1111
display: inline-block;
12-
padding: $padding-base-vertical $padding-base-horizontal;
1312
margin-bottom: 0; // For input.btn
14-
font-size: $font-size-base;
1513
font-weight: $btn-font-weight;
16-
line-height: $line-height-base;
1714
text-align: center;
1815
vertical-align: middle;
1916
cursor: pointer;
17+
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
2018
border: 1px solid transparent;
21-
border-radius: $border-radius-base;
2219
white-space: nowrap;
20+
@include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base);
2321
@include user-select(none);
2422

2523
&:focus {

‎app/assets/stylesheets/twitter/bootstrap/_carousel.scss

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
color: $carousel-control-color;
7676
text-align: center;
7777
text-shadow: $carousel-text-shadow;
78-
// We can't have this transition here because webkit cancels the carousel
78+
// We can't have this transition here because WebKit cancels the carousel
7979
// animation if you trip this while in the middle of another animation.
8080

8181
// Set gradients for backgrounds
@@ -103,11 +103,18 @@
103103
.glyphicon-chevron-right {
104104
position: absolute;
105105
top: 50%;
106-
left: 50%;
107106
z-index: 5;
108107
display: inline-block;
109108
}
110109
.icon-prev,
110+
.glyphicon-chevron-left {
111+
left: 50%;
112+
}
113+
.icon-next,
114+
.glyphicon-chevron-right {
115+
right: 50%;
116+
}
117+
.icon-prev,
111118
.icon-next {
112119
width: 20px;
113120
height: 20px;
@@ -153,6 +160,17 @@
153160
border: 1px solid $carousel-indicator-border-color;
154161
border-radius: 10px;
155162
cursor: pointer;
163+
164+
// IE8-9 hack for event handling
165+
//
166+
// Internet Explorer 8-9 does not support clicks on elements without a set
167+
// `background-color`. We cannot use `filter` since that's not viewed as a
168+
// background color by the browser. Thus, a hack is needed.
169+
//
170+
// For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we
171+
// set alpha transparency for the best results possible.
172+
background-color: #000 \9; // IE8
173+
background-color: rgba(0,0,0,0); // IE9
156174
}
157175
.active {
158176
margin: 0;
@@ -183,16 +201,20 @@
183201

184202

185203
// Scale up controls for tablets and up
186-
@media screen and (min-width: $screen-tablet) {
204+
@media screen and (min-width: $screen-sm-min) {
187205

188206
// Scale up the controls a smidge
189-
.carousel-control .icon-prev,
190-
.carousel-control .icon-next {
191-
width: 30px;
192-
height: 30px;
193-
margin-top: -15px;
194-
margin-left: -15px;
195-
font-size: 30px;
207+
.carousel-control {
208+
.glyphicons-chevron-left,
209+
.glyphicons-chevron-right,
210+
.icon-prev,
211+
.icon-next {
212+
width: 30px;
213+
height: 30px;
214+
margin-top: -15px;
215+
margin-left: -15px;
216+
font-size: 30px;
217+
}
196218
}
197219

198220
// Show and left align the captions

‎app/assets/stylesheets/twitter/bootstrap/_code.scss

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
//
2-
// Code (inline and blocK)
2+
// Code (inline and block)
33
// --------------------------------------------------
44

55

66
// Inline and block code styles
77
code,
8-
pre {
8+
kbd,
9+
pre,
10+
samp {
911
font-family: $font-family-monospace;
1012
}
1113

@@ -33,19 +35,14 @@ pre {
3335
border: 1px solid $pre-border-color;
3436
border-radius: $border-radius-base;
3537

36-
// Make prettyprint styles more spaced out for readability
37-
&.prettyprint {
38-
margin-bottom: $line-height-computed;
39-
}
40-
4138
// Account for some code outputs that place code tags in pre tags
4239
code {
4340
padding: 0;
4441
font-size: inherit;
4542
color: inherit;
4643
white-space: pre-wrap;
4744
background-color: transparent;
48-
border: 0;
45+
border-radius: 0;
4946
}
5047
}
5148

‎app/assets/stylesheets/twitter/bootstrap/_dropdowns.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
// Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once fixed,
1717
// we can just straight up remove this.
1818
border-bottom: 0 dotted;
19-
content: "";
2019
}
2120

2221
// The dropdown wrapper (div)
@@ -167,7 +166,7 @@
167166
// Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once this
168167
// gets fixed, restore `border-top: 0;`.
169168
border-top: 0 dotted;
170-
border-bottom: 4px solid $dropdown-caret-color;
169+
border-bottom: $caret-width-base solid $dropdown-caret-color;
171170
content: "";
172171
}
173172
// Different positioning for bottom up menu

0 commit comments

Comments
 (0)