anjlab-bootstrap-rails 2.1.0.5 → 2.1.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (35) hide show
  1. data/lib/bootstrap-rails/version.rb +1 -1
  2. data/vendor/assets/javascripts/twitter/bootstrap/affix.js +1 -1
  3. data/vendor/assets/javascripts/twitter/bootstrap/alert.js +1 -1
  4. data/vendor/assets/javascripts/twitter/bootstrap/button.js +2 -2
  5. data/vendor/assets/javascripts/twitter/bootstrap/carousel.js +1 -1
  6. data/vendor/assets/javascripts/twitter/bootstrap/collapse.js +1 -1
  7. data/vendor/assets/javascripts/twitter/bootstrap/dropdown.js +3 -3
  8. data/vendor/assets/javascripts/twitter/bootstrap/modal.js +1 -1
  9. data/vendor/assets/javascripts/twitter/bootstrap/popover.js +1 -1
  10. data/vendor/assets/javascripts/twitter/bootstrap/scrollspy.js +1 -1
  11. data/vendor/assets/javascripts/twitter/bootstrap/tab.js +1 -1
  12. data/vendor/assets/javascripts/twitter/bootstrap/tooltip.js +1 -1
  13. data/vendor/assets/javascripts/twitter/bootstrap/transition.js +1 -1
  14. data/vendor/assets/javascripts/twitter/bootstrap/typeahead.js +2 -2
  15. data/vendor/frameworks/twitter/bootstrap/bootstrap.scss +1 -1
  16. data/vendor/frameworks/twitter/bootstrap/button-groups.scss +1 -0
  17. data/vendor/frameworks/twitter/bootstrap/buttons.scss +22 -2
  18. data/vendor/frameworks/twitter/bootstrap/component-animations.scss +0 -1
  19. data/vendor/frameworks/twitter/bootstrap/dropdowns.scss +2 -2
  20. data/vendor/frameworks/twitter/bootstrap/forms.scss +29 -14
  21. data/vendor/frameworks/twitter/bootstrap/mixins.scss +27 -14
  22. data/vendor/frameworks/twitter/bootstrap/modals.scss +3 -2
  23. data/vendor/frameworks/twitter/bootstrap/navbar.scss +18 -12
  24. data/vendor/frameworks/twitter/bootstrap/pager.scss +6 -3
  25. data/vendor/frameworks/twitter/bootstrap/pagination.scss +16 -16
  26. data/vendor/frameworks/twitter/bootstrap/reset.scss +5 -2
  27. data/vendor/frameworks/twitter/bootstrap/responsive-767px-max.scss +13 -6
  28. data/vendor/frameworks/twitter/bootstrap/responsive-navbar.scss +11 -0
  29. data/vendor/frameworks/twitter/bootstrap/responsive.scss +1 -1
  30. data/vendor/frameworks/twitter/bootstrap/scaffolding.scss +5 -4
  31. data/vendor/frameworks/twitter/bootstrap/sprites.scss +9 -3
  32. data/vendor/frameworks/twitter/bootstrap/tables.scss +25 -5
  33. data/vendor/frameworks/twitter/bootstrap/type.scss +18 -3
  34. data/vendor/frameworks/twitter/bootstrap/variables.scss +11 -9
  35. metadata +4 -4
@@ -1,5 +1,5 @@
1
1
  module Bootstrap
2
2
  module Rails
3
- VERSION = "2.1.0.5"
3
+ VERSION = "2.1.1.0"
4
4
  end
5
5
  end
@@ -1,5 +1,5 @@
1
1
  /* ==========================================================
2
- * bootstrap-affix.js v2.1.0
2
+ * bootstrap-affix.js v2.1.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#affix
4
4
  * ==========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
1
1
  /* ==========================================================
2
- * bootstrap-alert.js v2.1.0
2
+ * bootstrap-alert.js v2.1.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#alerts
4
4
  * ==========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
1
1
  /* ============================================================
2
- * bootstrap-button.js v2.1.0
2
+ * bootstrap-button.js v2.1.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#buttons
4
4
  * ============================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -51,7 +51,7 @@
51
51
  }
52
52
 
53
53
  Button.prototype.toggle = function () {
54
- var $parent = this.$element.parent('[data-toggle="buttons-radio"]')
54
+ var $parent = this.$element.closest('[data-toggle="buttons-radio"]')
55
55
 
56
56
  $parent && $parent
57
57
  .find('.active')
@@ -1,5 +1,5 @@
1
1
  /* ==========================================================
2
- * bootstrap-carousel.js v2.1.0
2
+ * bootstrap-carousel.js v2.1.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#carousel
4
4
  * ==========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
1
1
  /* =============================================================
2
- * bootstrap-collapse.js v2.1.0
2
+ * bootstrap-collapse.js v2.1.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#collapse
4
4
  * =============================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
1
1
  /* ============================================================
2
- * bootstrap-dropdown.js v2.1.0
2
+ * bootstrap-dropdown.js v2.1.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#dropdowns
4
4
  * ============================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -110,7 +110,7 @@
110
110
 
111
111
  if (!selector) {
112
112
  selector = $this.attr('href')
113
- selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
113
+ selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
114
114
  }
115
115
 
116
116
  $parent = $(selector)
@@ -142,7 +142,7 @@
142
142
  $('html')
143
143
  .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
144
144
  $('body')
145
- .on('click.dropdown touchstart.dropdown.data-api', '.dropdown', function (e) { e.stopPropagation() })
145
+ .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
146
146
  .on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
147
147
  .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
148
148
  })
@@ -1,5 +1,5 @@
1
1
  /* =========================================================
2
- * bootstrap-modal.js v2.1.0
2
+ * bootstrap-modal.js v2.1.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#modals
4
4
  * =========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
1
1
  /* ===========================================================
2
- * bootstrap-popover.js v2.1.0
2
+ * bootstrap-popover.js v2.1.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#popovers
4
4
  * ===========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
1
1
  /* =============================================================
2
- * bootstrap-scrollspy.js v2.1.0
2
+ * bootstrap-scrollspy.js v2.1.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#scrollspy
4
4
  * =============================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
1
1
  /* ========================================================
2
- * bootstrap-tab.js v2.1.0
2
+ * bootstrap-tab.js v2.1.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#tabs
4
4
  * ========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
1
1
  /* ===========================================================
2
- * bootstrap-tooltip.js v2.1.0
2
+ * bootstrap-tooltip.js v2.1.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#tooltips
4
4
  * Inspired by the original jQuery.tipsy by Jason Frame
5
5
  * ===========================================================
@@ -1,5 +1,5 @@
1
1
  /* ===================================================
2
- * bootstrap-transition.js v2.1.0
2
+ * bootstrap-transition.js v2.1.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#transitions
4
4
  * ===================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
1
1
  /* =============================================================
2
- * bootstrap-typeahead.js v2.1.0
2
+ * bootstrap-typeahead.js v2.1.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#typeahead
4
4
  * =============================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -174,7 +174,7 @@
174
174
  .on('keypress', $.proxy(this.keypress, this))
175
175
  .on('keyup', $.proxy(this.keyup, this))
176
176
 
177
- if ($.browser.webkit || $.browser.msie) {
177
+ if ($.browser.chrome || $.browser.webkit || $.browser.msie) {
178
178
  this.$element.on('keydown', $.proxy(this.keydown, this))
179
179
  }
180
180
 
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap v2.1.0
2
+ * Bootstrap v2.1.1
3
3
  *
4
4
  * Copyright 2012 Twitter, Inc
5
5
  * Licensed under the Apache License v2.0
@@ -7,6 +7,7 @@
7
7
  .btn-group {
8
8
  position: relative;
9
9
  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
10
11
  white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
11
12
  @include ie7-restore-left-whitespace();
12
13
  }
@@ -96,10 +96,13 @@
96
96
  .btn-mini {
97
97
  padding: 2px 6px;
98
98
  font-size: $baseFontSize - 3px;
99
- line-height: $baseLineHeight - 4px;
99
+ line-height: $baseLineHeight - 3px;
100
100
  }
101
101
 
102
+
102
103
  // Block button
104
+ // -------------------------
105
+
103
106
  .btn-block {
104
107
  display: block;
105
108
  width: 100%;
@@ -107,10 +110,22 @@
107
110
  padding-right: 0;
108
111
  @include box-sizing(border-box);
109
112
  }
113
+
114
+ // Vertically space out multiple block buttons
110
115
  .btn-block + .btn-block {
111
116
  margin-top: 5px;
112
117
  }
113
118
 
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
+
114
129
 
115
130
  // Alternate buttons
116
131
  // --------------------------------------------------
@@ -193,7 +208,8 @@ input[type="submit"].btn {
193
208
 
194
209
  // Make a button look and behave like a link
195
210
  .btn-link,
196
- .btn-link:active {
211
+ .btn-link:active,
212
+ .btn-link[disabled] {
197
213
  background-color: transparent;
198
214
  background-image: none;
199
215
  @include box-shadow(none);
@@ -209,3 +225,7 @@ input[type="submit"].btn {
209
225
  text-decoration: underline;
210
226
  background-color: transparent;
211
227
  }
228
+ .btn-link[disabled]:hover {
229
+ color: $grayDark;
230
+ text-decoration: none;
231
+ }
@@ -15,7 +15,6 @@
15
15
  position: relative;
16
16
  height: 0;
17
17
  overflow: hidden;
18
- overflow: visible \9;
19
18
  @include transition(height .35s ease);
20
19
  &.in {
21
20
  height: auto;
@@ -148,7 +148,7 @@
148
148
  .caret {
149
149
  border-top: 0;
150
150
  border-bottom: 4px solid $black;
151
- content: "\2191";
151
+ content: "";
152
152
  }
153
153
  // Different positioning for bottom up menu
154
154
  .dropdown-menu {
@@ -172,7 +172,7 @@
172
172
  -moz-border-radius: 0 6px 6px 6px;
173
173
  border-radius: 0 6px 6px 6px;
174
174
  }
175
- .dropdown-submenu:hover .dropdown-menu {
175
+ .dropdown-submenu:hover > .dropdown-menu {
176
176
  display: block;
177
177
  }
178
178
 
@@ -91,8 +91,9 @@ input[type="color"],
91
91
  // Reset appearance properties for textual inputs and textarea
92
92
  // Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
93
93
  input,
94
- textarea {
95
- width: 210px;
94
+ textarea,
95
+ .uneditable-input {
96
+ width: 206px; // plus 12px padding and 2px border
96
97
  }
97
98
  // Reset height since textareas have rows
98
99
  textarea {
@@ -161,7 +162,7 @@ input[type="file"] {
161
162
  // Make select elements obey height by applying a border
162
163
  select {
163
164
  width: 220px; // default input width + 10px of padding that doesn't get applied
164
- border: 1px solid #bbb;
165
+ border: 1px solid $inputBorder;
165
166
  background-color: $inputBackground; // Chrome on Linux and Mobile Safari need background-color
166
167
  }
167
168
 
@@ -209,7 +210,7 @@ input[type="checkbox"]:focus {
209
210
  // Placeholder
210
211
  // -------------------------
211
212
 
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
213
214
  input,
214
215
  textarea {
215
216
  @include placeholder();
@@ -349,6 +350,10 @@ input[type="checkbox"][readonly] {
349
350
  .control-group.success {
350
351
  @include form-field-state($successText, $successText, $successBackground);
351
352
  }
353
+ // Success
354
+ .control-group.info {
355
+ @include form-field-state($infoText, $infoText, $infoBackground);
356
+ }
352
357
 
353
358
  // HTML5 invalid states
354
359
  // Shares styles with the .control-group.error above
@@ -441,7 +446,6 @@ select:focus:required:invalid {
441
446
  }
442
447
  .add-on,
443
448
  .btn {
444
- margin-left: -1px;
445
449
  vertical-align: top;
446
450
  @include border-radius(0);
447
451
  }
@@ -466,6 +470,10 @@ select:focus:required:invalid {
466
470
  .uneditable-input {
467
471
  @include border-radius($inputBorderRadius 0 0 $inputBorderRadius);
468
472
  }
473
+ .add-on,
474
+ .btn {
475
+ margin-left: -1px;
476
+ }
469
477
  .add-on:last-child,
470
478
  .btn:last-child {
471
479
  @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
@@ -510,16 +518,16 @@ input.search-query {
510
518
  @include border-radius(0); // Override due to specificity
511
519
  }
512
520
  .form-search .input-append .search-query {
513
- @include border-radius(14px 0 0 14px)
521
+ @include border-radius(14px 0 0 14px);
514
522
  }
515
523
  .form-search .input-append .btn {
516
- @include border-radius(0 14px 14px 0)
524
+ @include border-radius(0 14px 14px 0);
517
525
  }
518
526
  .form-search .input-prepend .search-query {
519
- @include border-radius(0 14px 14px 0)
527
+ @include border-radius(0 14px 14px 0);
520
528
  }
521
529
  .form-search .input-prepend .btn {
522
- @include border-radius(14px 0 0 14px)
530
+ @include border-radius(14px 0 0 14px);
523
531
  }
524
532
 
525
533
 
@@ -607,7 +615,7 @@ legend + .control-group {
607
615
  // Float the labels left
608
616
  .control-label {
609
617
  float: left;
610
- width: 140px;
618
+ width: $horizontalComponentOffset - 20;
611
619
  padding-top: 5px;
612
620
  text-align: right;
613
621
  }
@@ -617,19 +625,26 @@ legend + .control-group {
617
625
  // don't inherit the margin of the parent, in this case .controls
618
626
  *display: inline-block;
619
627
  *padding-left: 20px;
620
- margin-left: 160px;
628
+ margin-left: $horizontalComponentOffset;
621
629
  *margin-left: 0;
622
630
  &:first-child {
623
- *padding-left: 160px;
631
+ *padding-left: $horizontalComponentOffset;
624
632
  }
625
633
  }
626
634
  // Remove bottom margin on block level help text since that's accounted for on .control-group
627
635
  .help-block {
628
- margin-top: $baseLineHeight / 2;
629
636
  margin-bottom: 0;
630
637
  }
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
+ }
631
646
  // Move over buttons in .form-actions to align with .controls
632
647
  .form-actions {
633
- padding-left: 160px;
648
+ padding-left: $horizontalComponentOffset;
634
649
  }
635
650
  }
@@ -9,8 +9,9 @@
9
9
  // Clearfix
10
10
  // --------
11
11
  // For clearing floats like a boss h5bp.com/q
12
- @mixin clearfix() {
12
+ @mixin clearfix {
13
13
  *zoom: 1;
14
+
14
15
  &:before,
15
16
  &:after {
16
17
  display: table;
@@ -24,6 +25,10 @@
24
25
  }
25
26
  }
26
27
 
28
+ .clearfix {
29
+ @include clearfix;
30
+ }
31
+
27
32
  // Webkit-style focus
28
33
  // ------------------
29
34
  @mixin tab-focus() {
@@ -194,14 +199,15 @@
194
199
  select,
195
200
  textarea {
196
201
  color: $textColor;
202
+ }
203
+ input,
204
+ select,
205
+ textarea {
197
206
  border-color: $borderColor;
198
207
  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
199
208
  &:focus {
200
209
  border-color: darken($borderColor, 10%);
201
- // Write out in full since the lighten() function isn't easily escaped
202
- -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%);
203
- -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%);
204
- box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%);
210
+ @include box-shadow((inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%)));
205
211
  }
206
212
  }
207
213
  // Give a small background color for input-prepend/-append
@@ -280,8 +286,15 @@
280
286
  -o-transition: $transition;
281
287
  transition: $transition;
282
288
  }
289
+ @mixin transition-delay($transition-delay) {
290
+ -webkit-transition-delay: $transition-delay;
291
+ -moz-transition-delay: $transition-delay;
292
+ -o-transition-delay: $transition-delay;
293
+ transition-delay: $transition-delay;
294
+ }
283
295
 
284
296
  // Transformations
297
+
285
298
  @mixin rotate($degrees) {
286
299
  -webkit-transform: rotate($degrees);
287
300
  -moz-transform: rotate($degrees);
@@ -306,16 +319,15 @@
306
319
  @mixin skew($x, $y) {
307
320
  -webkit-transform: skew($x, $y);
308
321
  -moz-transform: skew($x, $y);
309
- -ms-transform: skew($x, $y);
322
+ -ms-transform: skewX($x) skewY($y); // See https://github.com/twitter/bootstrap/issues/4885
310
323
  -o-transform: skew($x, $y);
311
324
  transform: skew($x, $y);
312
325
  }
313
326
  @mixin translate3d($x, $y, $z) {
314
- -webkit-transform: translate($x, $y, $z);
315
- -moz-transform: translate($x, $y, $z);
316
- -ms-transform: translate($x, $y, $z);
317
- -o-transform: translate($x, $y, $z);
318
- transform: translate($x, $y, $z);
327
+ -webkit-transform: translate3d($x, $y, $z);
328
+ -moz-transform: translate3d($x, $y, $z);
329
+ -o-transform: translate3d($x, $y, $z);
330
+ transform: translate3d($x, $y, $z);
319
331
  }
320
332
 
321
333
  // Backface visibility
@@ -431,8 +443,8 @@
431
443
  background-image: -webkit-linear-gradient($deg, $startColor, $endColor); // Safari 5.1+, Chrome 10+
432
444
  background-image: -o-linear-gradient($deg, $startColor, $endColor); // Opera 11.10
433
445
  background-image: linear-gradient($deg, $startColor, $endColor); // Standard, IE10
434
- }
435
- @mixin gradient-vertical-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f) {
446
+ }
447
+ @mixin vertical-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f) {
436
448
  background-color: mix($midColor, $endColor, 80%);
437
449
  background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), color-stop($colorStop, $midColor), to($endColor));
438
450
  background-image: -webkit-linear-gradient($startColor, $midColor $colorStop, $endColor);
@@ -452,7 +464,7 @@
452
464
  background-image: -o-radial-gradient(circle, $innerColor, $outerColor);
453
465
  background-repeat: no-repeat;
454
466
  }
455
- @mixin gradient-striped($color, $angle: -45deg) {
467
+ @mixin gradient-striped($color: #555, $angle: -45deg) {
456
468
  background-color: $color;
457
469
  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent));
458
470
  background-image: -webkit-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
@@ -583,6 +595,7 @@
583
595
 
584
596
  [class*="span"] {
585
597
  float: left;
598
+ min-height: 1px; // prevent collapsing columns
586
599
  margin-left: $gridGutterWidth;
587
600
  }
588
601
 
@@ -3,8 +3,9 @@
3
3
  // --------------------------------------------------
4
4
 
5
5
 
6
- // Recalculate z-index where appropriate
7
- .modal-open {
6
+ // Recalculate z-index where appropriate,
7
+ // but only apply to elements within modal
8
+ .modal-open .modal {
8
9
  .dropdown-menu { z-index: $zindexDropdown + $zindexModal; }
9
10
  .dropdown.open { *z-index: $zindexDropdown + $zindexModal; }
10
11
  .popover { z-index: $zindexPopover + $zindexModal; }
@@ -27,6 +27,9 @@
27
27
  border: 1px solid $navbarBorder;
28
28
  @include border-radius(4px);
29
29
  @include box-shadow(0 1px 4px rgba(0,0,0,.065));
30
+
31
+ // Prevent floats from breaking the navbar
32
+ @include clearfix();
30
33
  }
31
34
 
32
35
  // Set width to auto for default container
@@ -87,13 +90,16 @@
87
90
  // -------------------------
88
91
  .navbar .btn,
89
92
  .navbar .btn-group {
90
- @include navbar-vertical-align(28px); // Vertically center in navbar
93
+ @include navbar-vertical-align(30px); // Vertically center in navbar
91
94
  }
92
- .navbar .btn-group .btn {
93
- margin: 0; // then undo the margin here so we don't accidentally double it
95
+ .navbar .btn-group .btn,
96
+ .navbar .input-prepend .btn,
97
+ .navbar .input-append .btn {
98
+ margin-top: 0; // then undo the margin here so we don't accidentally double it
94
99
  }
95
100
 
96
101
  // Navbar forms
102
+ // -------------------------
97
103
  .navbar-form {
98
104
  margin-bottom: 0; // remove default bottom margin
99
105
  @include clearfix();
@@ -125,6 +131,7 @@
125
131
  }
126
132
 
127
133
  // Navbar search
134
+ // -------------------------
128
135
  .navbar-search {
129
136
  position: relative;
130
137
  float: left;
@@ -166,12 +173,12 @@
166
173
  z-index: $zindexFixedNavbar;
167
174
  margin-bottom: 0; // remove 18px margin for default navbar
168
175
  }
169
- .navbar-fixed-top,
170
- .navbar-fixed-bottom,
171
- .navbar-static-top {
172
- .navbar-inner {
173
- border: 0;
174
- }
176
+ .navbar-fixed-top .navbar-inner,
177
+ .navbar-static-top .navbar-inner {
178
+ border-width: 0 0 1px;
179
+ }
180
+ .navbar-fixed-bottom .navbar-inner {
181
+ border-width: 1px 0 0;
175
182
  }
176
183
  .navbar-fixed-top .navbar-inner,
177
184
  .navbar-fixed-bottom .navbar-inner {
@@ -221,6 +228,7 @@
221
228
  }
222
229
  .navbar .nav.pull-right {
223
230
  float: right; // redeclare due to specificity
231
+ margin-right: 0; // remove margin on float right nav
224
232
  }
225
233
  .navbar .nav > li {
226
234
  float: left;
@@ -254,9 +262,7 @@
254
262
  color: $navbarLinkColorActive;
255
263
  text-decoration: none;
256
264
  background-color: $navbarLinkBackgroundActive;
257
- -webkit-box-shadow: inset 0 3px 8px rgba(0,0,0,.125);
258
- -moz-box-shadow: inset 0 3px 8px rgba(0,0,0,.125);
259
- box-shadow: inset 0 3px 8px rgba(0,0,0,.125);
265
+ @include box-shadow(inset 0 3px 8px rgba(0,0,0,.125));
260
266
  }
261
267
 
262
268
  // Navbar button for toggling navbar items in responsive layouts
@@ -12,7 +12,8 @@
12
12
  .pager li {
13
13
  display: inline;
14
14
  }
15
- .pager a {
15
+ .pager a,
16
+ .pager span {
16
17
  display: inline-block;
17
18
  padding: 5px 14px;
18
19
  background-color: #fff;
@@ -23,14 +24,16 @@
23
24
  text-decoration: none;
24
25
  background-color: #f5f5f5;
25
26
  }
26
- .pager .next a {
27
+ .pager .next a,
28
+ .pager .next span {
27
29
  float: right;
28
30
  }
29
31
  .pager .previous a {
30
32
  float: left;
31
33
  }
32
34
  .pager .disabled a,
33
- .pager .disabled a:hover {
35
+ .pager .disabled a:hover,
36
+ .pager .disabled span {
34
37
  color: $grayLight;
35
38
  background-color: #fff;
36
39
  cursor: default;
@@ -15,11 +15,11 @@
15
15
  @include border-radius(3px);
16
16
  @include box-shadow(0 1px 2px rgba(0,0,0,.05));
17
17
  }
18
- .pagination li {
18
+ .pagination ul > li {
19
19
  display: inline;
20
- }
21
- .pagination a,
22
- .pagination span {
20
+ }
21
+ .pagination ul > li > a,
22
+ .pagination ul > li > span {
23
23
  float: left;
24
24
  padding: 0 14px;
25
25
  line-height: ($baseLineHeight * 2) - 2;
@@ -28,30 +28,30 @@
28
28
  border: 1px solid $paginationBorder;
29
29
  border-left-width: 0;
30
30
  }
31
- .pagination a:hover,
32
- .pagination .active a,
33
- .pagination .active span {
31
+ .pagination ul > li > a:hover,
32
+ .pagination ul > .active > a,
33
+ .pagination ul > .active > span {
34
34
  background-color: #f5f5f5;
35
35
  }
36
- .pagination .active a,
37
- .pagination .active span {
36
+ .pagination ul > .active > a,
37
+ .pagination ul > .active > span {
38
38
  color: $grayLight;
39
39
  cursor: default;
40
40
  }
41
- .pagination .disabled span,
42
- .pagination .disabled a,
43
- .pagination .disabled a:hover {
41
+ .pagination ul > .disabled > span,
42
+ .pagination ul > .disabled > a,
43
+ .pagination ul > .disabled > a:hover {
44
44
  color: $grayLight;
45
45
  background-color: transparent;
46
46
  cursor: default;
47
47
  }
48
- .pagination li:first-child a,
49
- .pagination li:first-child span {
48
+ .pagination ul > li:first-child > a,
49
+ .pagination ul > li:first-child > span {
50
50
  border-left-width: 1px;
51
51
  @include border-radius(3px 0 0 3px);
52
52
  }
53
- .pagination li:last-child a,
54
- .pagination li:last-child span {
53
+ .pagination ul > li:last-child > a,
54
+ .pagination ul > li:last-child > span {
55
55
  @include border-radius(0 3px 3px 0);
56
56
  }
57
57
 
@@ -77,8 +77,11 @@ sub {
77
77
  // -------------------------
78
78
 
79
79
  img {
80
- max-width: 100%; // Make images inherently responsive
81
- height: auto; // Make images inherently responsive
80
+ /* Responsive images (ensure images don't scale beyond their parents) */
81
+ max-width: 100%; /* Part 1: Set a maxium relative to the parent */
82
+ width: auto\9; /* IE7-8 need help adjusting responsive images */
83
+ height: auto; /* Part 2: Scale the height according to the width, otherwise you get stretching */
84
+
82
85
  vertical-align: middle;
83
86
  border: 0;
84
87
  -ms-interpolation-mode: bicubic;
@@ -8,7 +8,8 @@
8
8
  }
9
9
  // Negative indent the now static "fixed" navbar
10
10
  .navbar-fixed-top,
11
- .navbar-fixed-bottom {
11
+ .navbar-fixed-bottom,
12
+ .navbar-static-top {
12
13
  margin-left: -20px;
13
14
  margin-right: -20px;
14
15
  }
@@ -56,8 +57,9 @@
56
57
  .row-fluid [class*="span"] {
57
58
  float: none;
58
59
  display: block;
59
- width: auto;
60
+ width: 100%;
60
61
  margin-left: 0;
62
+ @include box-sizing(border-box);
61
63
  }
62
64
  .span12,
63
65
  .row-fluid .span12 {
@@ -85,6 +87,9 @@
85
87
  display: inline-block; // redeclare so they don't wrap to new lines
86
88
  width: auto;
87
89
  }
90
+ .controls-row [class*="span"] + [class*="span"] {
91
+ margin-left: 0;
92
+ }
88
93
 
89
94
  // Modals
90
95
  .modal {
@@ -124,25 +129,27 @@
124
129
  }
125
130
 
126
131
  // Remove the horizontal form styles
127
- .form-horizontal .control-group > label {
132
+ .form-horizontal {
133
+ .control-label {
128
134
  float: none;
129
135
  width: auto;
130
136
  padding-top: 0;
131
137
  text-align: left;
132
138
  }
133
139
  // Move over all input controls and content
134
- .form-horizontal .controls {
140
+ .controls {
135
141
  margin-left: 0;
136
142
  }
137
143
  // Move the options list down to align with labels
138
- .form-horizontal .control-list {
144
+ .control-list {
139
145
  padding-top: 0; // has to be padding because margin collaspes
140
146
  }
141
147
  // Move over buttons in .form-actions to align with .controls
142
- .form-horizontal .form-actions {
148
+ .form-actions {
143
149
  padding-left: 10px;
144
150
  padding-right: 10px;
145
151
  }
152
+ }
146
153
 
147
154
  // Modals
148
155
  .modal {
@@ -115,6 +115,12 @@
115
115
  .nav-collapse .dropdown-menu .divider {
116
116
  display: none;
117
117
  }
118
+ .nav-collapse .nav > li > .dropdown-menu {
119
+ &:before,
120
+ &:after {
121
+ display: none;
122
+ }
123
+ }
118
124
  // Forms in navbar
119
125
  .nav-collapse .navbar-form,
120
126
  .nav-collapse .navbar-search {
@@ -125,6 +131,11 @@
125
131
  border-bottom: 1px solid $navbarBackground;
126
132
  @include box-shadow((inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)));
127
133
  }
134
+ .navbar-inverse .nav-collapse .navbar-form,
135
+ .navbar-inverse .nav-collapse .navbar-search {
136
+ border-top-color: $navbarInverseBackground;
137
+ border-bottom-color: $navbarInverseBackground;
138
+ }
128
139
  // Pull right (secondary) nav content
129
140
  .navbar .nav-collapse .nav.pull-right {
130
141
  float: none;
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap Responsive v2.1.0
2
+ * Bootstrap Responsive v2.1.1
3
3
  *
4
4
  * Copyright 2012 Twitter, Inc
5
5
  * Licensed under the Apache License v2.0
@@ -32,20 +32,21 @@ a:hover {
32
32
  // Images
33
33
  // -------------------------
34
34
 
35
+ // Rounded corners
35
36
  .img-rounded {
36
37
  @include border-radius(6px);
37
38
  }
38
39
 
40
+ // Add polaroid-esque trim
39
41
  .img-polaroid {
40
42
  padding: 4px;
41
43
  background-color: #fff;
42
44
  border: 1px solid #ccc;
43
45
  border: 1px solid rgba(0,0,0,.2);
44
- -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.1);
45
- -moz-box-shadow: 0 1px 3px rgba(0,0,0,.1);
46
- box-shadow: 0 1px 3px rgba(0,0,0,.1);
46
+ @include box-shadow(0 1px 3px rgba(0,0,0,.1));
47
47
  }
48
48
 
49
+ // Perfect circle
49
50
  .img-circle {
50
- @include border-radius(500px);
51
+ @include border-radius(500px); // crank the border-radius so it works with most reasonably sized images
51
52
  }
@@ -30,13 +30,19 @@
30
30
 
31
31
  /* White icons with optional class, or on hover/active states of certain elements */
32
32
  .icon-white,
33
- .nav > .active > a > [class^="icon-"],
34
- .nav > .active > a > [class*=" icon-"],
33
+ .nav-tabs > .active > a > [class^="icon-"],
34
+ .nav-tabs > .active > a > [class*=" icon-"],
35
+ .nav-pills > .active > a > [class^="icon-"],
36
+ .nav-pills > .active > a > [class*=" icon-"],
37
+ .nav-list > .active > a > [class^="icon-"],
38
+ .nav-list > .active > a > [class*=" icon-"],
39
+ .navbar-inverse .nav > .active > a > [class^="icon-"],
40
+ .navbar-inverse .nav > .active > a > [class*=" icon-"],
35
41
  .dropdown-menu > li > a:hover > [class^="icon-"],
36
42
  .dropdown-menu > li > a:hover > [class*=" icon-"],
37
43
  .dropdown-menu > .active > a > [class^="icon-"],
38
44
  .dropdown-menu > .active > a > [class*=" icon-"] {
39
- background-image: image-url($iconWhiteSpritePath);
45
+ background-image: url($iconWhiteSpritePath);
40
46
  }
41
47
 
42
48
  .icon-glass { background-position: 0 0; }
@@ -133,7 +133,7 @@ table {
133
133
  colgroup + tbody tr:first-child td:last-child {
134
134
  -webkit-border-top-right-radius: 4px;
135
135
  border-top-right-radius: 4px;
136
- -moz-border-right-topleft: 4px;
136
+ -moz-border-radius-topleft: 4px;
137
137
  }
138
138
 
139
139
  }
@@ -188,18 +188,38 @@ table {
188
188
  }
189
189
 
190
190
 
191
+
191
192
  // TABLE BACKGROUNDS
192
193
  // -----------------
193
194
  // Exact selectors below required to override .table-striped
194
195
 
195
- .table {
196
- tbody tr.success td {
196
+ .table tbody tr {
197
+ &.success td {
197
198
  background-color: $successBackground;
198
199
  }
199
- tbody tr.error td {
200
+ &.error td {
200
201
  background-color: $errorBackground;
201
202
  }
202
- tbody tr.info td {
203
+ &.warning td {
204
+ background-color: $warningBackground;
205
+ }
206
+ &.info td {
203
207
  background-color: $infoBackground;
204
208
  }
205
209
  }
210
+
211
+ // Hover states for .table-hover
212
+ .table-hover tbody tr {
213
+ &.success:hover td {
214
+ background-color: darken($successBackground, 5%);
215
+ }
216
+ &.error:hover td {
217
+ background-color: darken($errorBackground, 5%);
218
+ }
219
+ &.warning:hover td {
220
+ background-color: darken($warningBackground, 5%);
221
+ }
222
+ &.info:hover td {
223
+ background-color: darken($infoBackground, 5%);
224
+ }
225
+ }
@@ -11,7 +11,7 @@ p {
11
11
  }
12
12
  .lead {
13
13
  margin-bottom: $baseLineHeight;
14
- font-size: 20px;
14
+ font-size: $baseFontSize * 1.5;
15
15
  font-weight: 200;
16
16
  line-height: $baseLineHeight * 1.5;
17
17
  }
@@ -32,9 +32,23 @@ em {
32
32
  cite {
33
33
  font-style: normal;
34
34
  }
35
+
36
+ // Utility classes
35
37
  .muted {
36
38
  color: $grayLight;
37
39
  }
40
+ .text-warning {
41
+ color: $warningText;
42
+ }
43
+ .text-error {
44
+ color: $errorText;
45
+ }
46
+ .text-info {
47
+ color: $infoText;
48
+ }
49
+ .text-success {
50
+ color: $successText;
51
+ }
38
52
 
39
53
 
40
54
  // Headings
@@ -115,15 +129,16 @@ dd {
115
129
  }
116
130
  // Horizontal layout (like forms)
117
131
  .dl-horizontal {
132
+ @include clearfix(); // Ensure dl clears floats if empty dd elements present
118
133
  dt {
119
134
  float: left;
120
- width: 120px;
135
+ width: $horizontalComponentOffset - 20;
121
136
  clear: left;
122
137
  text-align: right;
123
138
  @include text-overflow();
124
139
  }
125
140
  dd {
126
- margin-left: 130px;
141
+ margin-left: $horizontalComponentOffset;
127
142
  }
128
143
  }
129
144
 
@@ -57,7 +57,6 @@ $headingsFontFamily: inherit !default; // empty to use BS default, $baseFontF
57
57
  $headingsFontWeight: bold !default; // instead of browser default, bold
58
58
  $headingsColor: inherit !default; // empty to use BS default, $textColor
59
59
 
60
-
61
60
  // Tables
62
61
  // -------------------------
63
62
  $tableBackground: transparent !default; // overall background-color
@@ -65,7 +64,6 @@ $tableBackgroundAccent: #f9f9f9 !default; // for striping
65
64
  $tableBackgroundHover: #f5f5f5 !default; // for hover
66
65
  $tableBorder: #ddd !default; // table and cell border
67
66
 
68
-
69
67
  // Buttons
70
68
  // -------------------------
71
69
  $btnBackground: $white !default;
@@ -107,11 +105,10 @@ $dropdownDividerTop: #e5e5e5 !default;
107
105
  $dropdownDividerBottom: $white !default;
108
106
 
109
107
  $dropdownLinkColor: $grayDark !default;
110
-
108
+ $dropdownLinkColorHover: $white !default;
111
109
  $dropdownLinkColorActive: $dropdownLinkColor !default;
112
- $dropdownLinkBackgroundActive: $linkColor !default;
113
110
 
114
- $dropdownLinkColorHover: $white !default;
111
+ $dropdownLinkBackgroundActive: $linkColor !default;
115
112
  $dropdownLinkBackgroundHover: $dropdownLinkBackgroundActive !default;
116
113
 
117
114
 
@@ -132,8 +129,8 @@ $zindexModal: 1050 !default;
132
129
 
133
130
 
134
131
  // Sprite icons path
135
- $iconSpritePath: image-path("twitter/glyphicons-halflings.png") !default;
136
- $iconWhiteSpritePath: image-path("twitter/glyphicons-halflings-white.png") !default;
132
+ $iconSpritePath: image-path("glyphicons-halflings.png") !default;
133
+ $iconWhiteSpritePath: image-path("glyphicons-halflings-white.png") !default;
137
134
 
138
135
  // Input placeholder text color
139
136
  $placeholderText: $grayLight !default;
@@ -141,6 +138,11 @@ $placeholderText: $grayLight !default;
141
138
  // Hr border color
142
139
  $hrBorder: $grayLighter !default;
143
140
 
141
+ // Horizontal forms & lists
142
+ // -------------------------
143
+ $horizontalComponentOffset: 180px;
144
+
145
+
144
146
  // Wells
145
147
  // -------------------------
146
148
  $wellBackground: #f5f5f5 !default;
@@ -155,8 +157,8 @@ $navbarBackgroundHighlight: #ffffff !default;
155
157
  $navbarBackground: darken($navbarBackgroundHighlight, 5%) !default;
156
158
  $navbarBorder: darken($navbarBackground, 12%) !default;
157
159
 
158
- $navbarText: $gray !default;
159
- $navbarLinkColor: $gray !default;
160
+ $navbarText: #777 !default;
161
+ $navbarLinkColor: #777 !default;
160
162
  $navbarLinkColorHover: $grayDark !default;
161
163
  $navbarLinkColorActive: $gray !default;
162
164
  $navbarLinkBackgroundHover: transparent !default;
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: anjlab-bootstrap-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.0.5
4
+ version: 2.1.1.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-08-23 00:00:00.000000000 Z
12
+ date: 2012-09-05 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
168
168
  version: '0'
169
169
  segments:
170
170
  - 0
171
- hash: -974679650102658663
171
+ hash: -1463780656877862367
172
172
  required_rubygems_version: !ruby/object:Gem::Requirement
173
173
  none: false
174
174
  requirements:
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
177
177
  version: '0'
178
178
  segments:
179
179
  - 0
180
- hash: -974679650102658663
180
+ hash: -1463780656877862367
181
181
  requirements: []
182
182
  rubyforge_project:
183
183
  rubygems_version: 1.8.24