Skip to content

Commit aba694c

Browse files
thomas-mcdonaldthomas-mcdonald
committed
Merge branch 'wndxlori-master'
2 parents 2a7c21d + c750442 commit aba694c

35 files changed

+260
-141
lines changed

‎vendor/assets/javascripts/bootstrap-affix.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* bootstrap-affix.js v2.1.0
2+
* bootstrap-affix.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#affix
44
* ==========================================================
55
* Copyright 2012 Twitter, Inc.

‎vendor/assets/javascripts/bootstrap-alert.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* bootstrap-alert.js v2.1.0
2+
* bootstrap-alert.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#alerts
44
* ==========================================================
55
* Copyright 2012 Twitter, Inc.

‎vendor/assets/javascripts/bootstrap-button.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ============================================================
2-
* bootstrap-button.js v2.1.0
2+
* bootstrap-button.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#buttons
44
* ============================================================
55
* Copyright 2012 Twitter, Inc.
@@ -51,7 +51,7 @@
5151
}
5252

5353
Button.prototype.toggle = function () {
54-
var $parent = this.$element.parent('[data-toggle="buttons-radio"]')
54+
var $parent = this.$element.closest('[data-toggle="buttons-radio"]')
5555

5656
$parent && $parent
5757
.find('.active')

‎vendor/assets/javascripts/bootstrap-carousel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* bootstrap-carousel.js v2.1.0
2+
* bootstrap-carousel.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#carousel
44
* ==========================================================
55
* Copyright 2012 Twitter, Inc.

‎vendor/assets/javascripts/bootstrap-collapse.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* =============================================================
2-
* bootstrap-collapse.js v2.1.0
2+
* bootstrap-collapse.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#collapse
44
* =============================================================
55
* Copyright 2012 Twitter, Inc.

‎vendor/assets/javascripts/bootstrap-dropdown.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ============================================================
2-
* bootstrap-dropdown.js v2.1.0
2+
* bootstrap-dropdown.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
44
* ============================================================
55
* Copyright 2012 Twitter, Inc.
@@ -110,7 +110,7 @@
110110

111111
if (!selector) {
112112
selector = $this.attr('href')
113-
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
113+
selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
114114
}
115115

116116
$parent = $(selector)

‎vendor/assets/javascripts/bootstrap-modal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* =========================================================
2-
* bootstrap-modal.js v2.1.0
2+
* bootstrap-modal.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#modals
44
* =========================================================
55
* Copyright 2012 Twitter, Inc.

‎vendor/assets/javascripts/bootstrap-popover.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ===========================================================
2-
* bootstrap-popover.js v2.1.0
2+
* bootstrap-popover.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#popovers
44
* ===========================================================
55
* Copyright 2012 Twitter, Inc.

‎vendor/assets/javascripts/bootstrap-scrollspy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* =============================================================
2-
* bootstrap-scrollspy.js v2.1.0
2+
* bootstrap-scrollspy.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
44
* =============================================================
55
* Copyright 2012 Twitter, Inc.

‎vendor/assets/javascripts/bootstrap-tab.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ========================================================
2-
* bootstrap-tab.js v2.1.0
2+
* bootstrap-tab.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#tabs
44
* ========================================================
55
* Copyright 2012 Twitter, Inc.

‎vendor/assets/javascripts/bootstrap-tooltip.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ===========================================================
2-
* bootstrap-tooltip.js v2.1.0
2+
* bootstrap-tooltip.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#tooltips
44
* Inspired by the original jQuery.tipsy by Jason Frame
55
* ===========================================================

‎vendor/assets/javascripts/bootstrap-transition.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ===================================================
2-
* bootstrap-transition.js v2.1.0
2+
* bootstrap-transition.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#transitions
44
* ===================================================
55
* Copyright 2012 Twitter, Inc.

‎vendor/assets/javascripts/bootstrap-typeahead.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* =============================================================
2-
* bootstrap-typeahead.js v2.1.0
2+
* bootstrap-typeahead.js v2.1.1
33
* http://twitter.github.com/bootstrap/javascript.html#typeahead
44
* =============================================================
55
* Copyright 2012 Twitter, Inc.
@@ -174,7 +174,7 @@
174174
.on('keypress', $.proxy(this.keypress, this))
175175
.on('keyup', $.proxy(this.keyup, this))
176176

177-
if ($.browser.webkit || $.browser.msie) {
177+
if ($.browser.chrome || $.browser.webkit || $.browser.msie) {
178178
this.$element.on('keydown', $.proxy(this.keydown, this))
179179
}
180180

‎vendor/assets/stylesheets/bootstrap/_button-groups.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
.btn-group {
88
position: relative;
99
font-size: 0; // remove as part 1 of font-size inline-block hack
10+
vertical-align: middle; // match .btn alignment given font-size hack above
1011
white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
1112
@include ie7-restore-left-whitespace();
1213
}

‎vendor/assets/stylesheets/bootstrap/_buttons.scss

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,21 +96,36 @@
9696
.btn-mini {
9797
padding: 2px 6px;
9898
font-size: $baseFontSize - 3px;
99-
line-height: $baseLineHeight - 4px;
99+
line-height: $baseLineHeight - 3px;
100100
}
101101

102+
102103
// Block button
104+
// -------------------------
105+
103106
.btn-block {
104107
display: block;
105108
width: 100%;
106109
padding-left: 0;
107110
padding-right: 0;
108111
@include box-sizing(border-box);
109112
}
113+
114+
// Vertically space out multiple block buttons
110115
.btn-block + .btn-block {
111116
margin-top: 5px;
112117
}
113118

119+
// Specificity overrides
120+
input[type="submit"],
121+
input[type="reset"],
122+
input[type="button"] {
123+
&.btn-block {
124+
width: 100%;
125+
}
126+
}
127+
128+
114129

115130
// Alternate buttons
116131
// --------------------------------------------------
@@ -193,7 +208,8 @@ input[type="submit"].btn {
193208

194209
// Make a button look and behave like a link
195210
.btn-link,
196-
.btn-link:active {
211+
.btn-link:active,
212+
.btn-link[disabled] {
197213
background-color: transparent;
198214
background-image: none;
199215
@include box-shadow(none);
@@ -209,3 +225,7 @@ input[type="submit"].btn {
209225
text-decoration: underline;
210226
background-color: transparent;
211227
}
228+
.btn-link[disabled]:hover {
229+
color: $grayDark;
230+
text-decoration: none;
231+
}

‎vendor/assets/stylesheets/bootstrap/_component-animations.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
position: relative;
1616
height: 0;
1717
overflow: hidden;
18-
overflow: visible \9;
1918
@include transition(height .35s ease);
2019
&.in {
2120
height: auto;

‎vendor/assets/stylesheets/bootstrap/_dropdowns.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
*border-right-width: 2px;
5656
*border-bottom-width: 2px;
5757
@include border-radius(6px);
58-
@include box-shadow(0 5px 10px rgba(0,0,0,.2));
58+
@include box-shadow(#{0 5px 10px rgba(0,0,0,.2)});
5959
-webkit-background-clip: padding-box;
6060
-moz-background-clip: padding;
6161
background-clip: padding-box;
@@ -148,7 +148,7 @@
148148
.caret {
149149
border-top: 0;
150150
border-bottom: 4px solid $black;
151-
content: "\2191";
151+
content: "";
152152
}
153153
// Different positioning for bottom up menu
154154
.dropdown-menu {
@@ -207,4 +207,4 @@
207207
.typeahead {
208208
margin-top: 2px; // give it some space to breathe
209209
@include border-radius(4px);
210-
}
210+
}

‎vendor/assets/stylesheets/bootstrap/_forms.scss

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,9 @@ input[type="color"],
9191
// Reset appearance properties for textual inputs and textarea
9292
// Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
9393
input,
94-
textarea {
95-
width: 210px;
94+
textarea,
95+
.uneditable-input {
96+
width: 206px; // plus 12px padding and 2px border
9697
}
9798
// Reset height since textareas have rows
9899
textarea {
@@ -117,7 +118,7 @@ input[type="color"],
117118
.uneditable-input {
118119
background-color: $inputBackground;
119120
border: 1px solid $inputBorder;
120-
@include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
121+
@include box-shadow(#{inset 0 1px 1px rgba(0,0,0,.075)});
121122
@include transition(#{border linear .2s, box-shadow linear .2s});
122123

123124
// Focus state
@@ -161,7 +162,7 @@ input[type="file"] {
161162
// Make select elements obey height by applying a border
162163
select {
163164
width: 220px; // default input width + 10px of padding that doesn't get applied
164-
border: 1px solid #bbb;
165+
border: 1px solid $inputBorder;
165166
background-color: $inputBackground; // Chrome on Linux and Mobile Safari need background-color
166167
}
167168

@@ -189,7 +190,7 @@ input[type="checkbox"]:focus {
189190
color: $grayLight;
190191
background-color: darken($inputBackground, 1%);
191192
border-color: $inputBorder;
192-
@include box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
193+
@include box-shadow(#{inset 0 1px 2px rgba(0,0,0,.025)});
193194
cursor: not-allowed;
194195
}
195196

@@ -209,7 +210,7 @@ input[type="checkbox"]:focus {
209210
// Placeholder
210211
// -------------------------
211212

212-
// Placeholder text gets special styles; can't be bundled together though for some reason
213+
// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn’t understand a selector
213214
input,
214215
textarea {
215216
@include placeholder();
@@ -349,6 +350,10 @@ input[type="checkbox"][readonly] {
349350
.control-group.success {
350351
@include formFieldState($successText, $successText, $successBackground);
351352
}
353+
// Success
354+
.control-group.info {
355+
@include formFieldState($infoText, $infoText, $infoBackground);
356+
}
352357

353358
// HTML5 invalid states
354359
// Shares styles with the .control-group.error above
@@ -359,7 +364,7 @@ select:focus:required:invalid {
359364
border-color: #ee5f5b;
360365
&:focus {
361366
border-color: darken(#ee5f5b, 10%);
362-
@include box-shadow(0 0 6px lighten(#ee5f5b, 20%));
367+
@include box-shadow(#{0 0 6px lighten(#ee5f5b, 20%)});
363368
}
364369
}
365370

@@ -441,7 +446,6 @@ select:focus:required:invalid {
441446
}
442447
.add-on,
443448
.btn {
444-
margin-left: -1px;
445449
vertical-align: top;
446450
@include border-radius(0);
447451
}
@@ -466,6 +470,10 @@ select:focus:required:invalid {
466470
.uneditable-input {
467471
@include border-radius($inputBorderRadius 0 0 $inputBorderRadius);
468472
}
473+
.add-on,
474+
.btn {
475+
margin-left: -1px;
476+
}
469477
.add-on:last-child,
470478
.btn:last-child {
471479
@include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
@@ -510,16 +518,16 @@ input.search-query {
510518
@include border-radius(0); // Override due to specificity
511519
}
512520
.form-search .input-append .search-query {
513-
@include border-radius(14px 0 0 14px)
521+
@include border-radius(14px 0 0 14px);
514522
}
515523
.form-search .input-append .btn {
516-
@include border-radius(0 14px 14px 0)
524+
@include border-radius(0 14px 14px 0);
517525
}
518526
.form-search .input-prepend .search-query {
519-
@include border-radius(0 14px 14px 0)
527+
@include border-radius(0 14px 14px 0);
520528
}
521529
.form-search .input-prepend .btn {
522-
@include border-radius(14px 0 0 14px)
530+
@include border-radius(14px 0 0 14px);
523531
}
524532

525533

@@ -607,7 +615,7 @@ legend + .control-group {
607615
// Float the labels left
608616
.control-label {
609617
float: left;
610-
width: 140px;
618+
width: $horizontalComponentOffset - 20;
611619
padding-top: 5px;
612620
text-align: right;
613621
}
@@ -617,19 +625,26 @@ legend + .control-group {
617625
// don't inherit the margin of the parent, in this case .controls
618626
*display: inline-block;
619627
*padding-left: 20px;
620-
margin-left: 160px;
628+
margin-left: $horizontalComponentOffset;
621629
*margin-left: 0;
622630
&:first-child {
623-
*padding-left: 160px;
631+
*padding-left: $horizontalComponentOffset;
624632
}
625633
}
626634
// Remove bottom margin on block level help text since that's accounted for on .control-group
627635
.help-block {
628-
margin-top: $baseLineHeight / 2;
629636
margin-bottom: 0;
630637
}
638+
// And apply it only to .help-block instances that follow a form control
639+
input,
640+
select,
641+
textarea {
642+
+ .help-block {
643+
margin-top: $baseLineHeight / 2;
644+
}
645+
}
631646
// Move over buttons in .form-actions to align with .controls
632647
.form-actions {
633-
padding-left: 160px;
648+
padding-left: $horizontalComponentOffset;
634649
}
635-
}
650+
}

0 commit comments

Comments
 (0)