bootstrap-generators 2.1.1 → 2.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (84) hide show
  1. data/README.md +48 -3
  2. data/lib/bootstrap/generators/version.rb +1 -1
  3. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.css.scss +25 -2
  4. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +23 -1
  5. data/lib/generators/bootstrap/install/templates/assets/stylesheets/fluid.css.scss +1 -1
  6. data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css.scss +1 -1
  7. data/vendor/assets/javascripts/bootstrap-affix.js +4 -2
  8. data/vendor/assets/javascripts/bootstrap-alert.js +2 -4
  9. data/vendor/assets/javascripts/bootstrap-button.js +5 -7
  10. data/vendor/assets/javascripts/bootstrap-carousel.js +12 -12
  11. data/vendor/assets/javascripts/bootstrap-collapse.js +9 -11
  12. data/vendor/assets/javascripts/bootstrap-dropdown.js +9 -11
  13. data/vendor/assets/javascripts/bootstrap-modal.js +20 -25
  14. data/vendor/assets/javascripts/bootstrap-popover.js +1 -1
  15. data/vendor/assets/javascripts/bootstrap-scrollspy.js +1 -1
  16. data/vendor/assets/javascripts/bootstrap-tab.js +5 -7
  17. data/vendor/assets/javascripts/bootstrap-tooltip.js +12 -11
  18. data/vendor/assets/javascripts/bootstrap-transition.js +5 -5
  19. data/vendor/assets/javascripts/bootstrap-typeahead.js +19 -9
  20. data/vendor/twitter/bootstrap/less/accordion.less +1 -1
  21. data/vendor/twitter/bootstrap/less/alerts.less +1 -1
  22. data/vendor/twitter/bootstrap/less/bootstrap.less +2 -1
  23. data/vendor/twitter/bootstrap/less/breadcrumbs.less +1 -1
  24. data/vendor/twitter/bootstrap/less/button-groups.less +5 -8
  25. data/vendor/twitter/bootstrap/less/buttons.less +17 -16
  26. data/vendor/twitter/bootstrap/less/code.less +1 -1
  27. data/vendor/twitter/bootstrap/less/dropdowns.less +32 -5
  28. data/vendor/twitter/bootstrap/less/forms.less +47 -14
  29. data/vendor/twitter/bootstrap/less/hero-unit.less +6 -5
  30. data/vendor/twitter/bootstrap/less/labels-badges.less +4 -2
  31. data/vendor/twitter/bootstrap/less/media.less +55 -0
  32. data/vendor/twitter/bootstrap/less/mixins.less +15 -10
  33. data/vendor/twitter/bootstrap/less/modals.less +7 -11
  34. data/vendor/twitter/bootstrap/less/navbar.less +6 -6
  35. data/vendor/twitter/bootstrap/less/navs.less +3 -2
  36. data/vendor/twitter/bootstrap/less/pager.less +10 -9
  37. data/vendor/twitter/bootstrap/less/pagination.less +69 -12
  38. data/vendor/twitter/bootstrap/less/popovers.less +2 -2
  39. data/vendor/twitter/bootstrap/less/progress-bars.less +2 -2
  40. data/vendor/twitter/bootstrap/less/reset.less +5 -4
  41. data/vendor/twitter/bootstrap/less/responsive-767px-max.less +20 -1
  42. data/vendor/twitter/bootstrap/less/responsive-navbar.less +12 -4
  43. data/vendor/twitter/bootstrap/less/responsive.less +1 -1
  44. data/vendor/twitter/bootstrap/less/sprites.less +3 -3
  45. data/vendor/twitter/bootstrap/less/tables.less +20 -29
  46. data/vendor/twitter/bootstrap/less/thumbnails.less +1 -1
  47. data/vendor/twitter/bootstrap/less/tooltip.less +1 -1
  48. data/vendor/twitter/bootstrap/less/type.less +30 -24
  49. data/vendor/twitter/bootstrap/less/variables.less +23 -1
  50. data/vendor/twitter/bootstrap/less/wells.less +3 -3
  51. data/vendor/twitter/bootstrap/sass/_accordion.scss +1 -1
  52. data/vendor/twitter/bootstrap/sass/_alerts.scss +1 -1
  53. data/vendor/twitter/bootstrap/sass/_breadcrumbs.scss +1 -1
  54. data/vendor/twitter/bootstrap/sass/_button-groups.scss +5 -8
  55. data/vendor/twitter/bootstrap/sass/_buttons.scss +18 -17
  56. data/vendor/twitter/bootstrap/sass/_code.scss +1 -1
  57. data/vendor/twitter/bootstrap/sass/_component-animations.scss +2 -2
  58. data/vendor/twitter/bootstrap/sass/_dropdowns.scss +32 -5
  59. data/vendor/twitter/bootstrap/sass/_forms.scss +46 -14
  60. data/vendor/twitter/bootstrap/sass/_hero-unit.scss +6 -5
  61. data/vendor/twitter/bootstrap/sass/_labels-badges.scss +4 -2
  62. data/vendor/twitter/bootstrap/sass/_media.scss +55 -0
  63. data/vendor/twitter/bootstrap/sass/_mixins.scss +12 -7
  64. data/vendor/twitter/bootstrap/sass/_modals.scss +8 -11
  65. data/vendor/twitter/bootstrap/sass/_navbar.scss +8 -10
  66. data/vendor/twitter/bootstrap/sass/_navs.scss +5 -4
  67. data/vendor/twitter/bootstrap/sass/_pager.scss +10 -9
  68. data/vendor/twitter/bootstrap/sass/_pagination.scss +69 -12
  69. data/vendor/twitter/bootstrap/sass/_popovers.scss +2 -2
  70. data/vendor/twitter/bootstrap/sass/_progress-bars.scss +2 -2
  71. data/vendor/twitter/bootstrap/sass/_reset.scss +6 -4
  72. data/vendor/twitter/bootstrap/sass/_responsive-767px-max.scss +20 -1
  73. data/vendor/twitter/bootstrap/sass/_responsive-navbar.scss +12 -4
  74. data/vendor/twitter/bootstrap/sass/_scaffolding.scss +1 -3
  75. data/vendor/twitter/bootstrap/sass/_sprites.scss +3 -3
  76. data/vendor/twitter/bootstrap/sass/_tables.scss +12 -8
  77. data/vendor/twitter/bootstrap/sass/_thumbnails.scss +1 -1
  78. data/vendor/twitter/bootstrap/sass/_tooltip.scss +1 -1
  79. data/vendor/twitter/bootstrap/sass/_type.scss +30 -24
  80. data/vendor/twitter/bootstrap/sass/_variables.scss +25 -2
  81. data/vendor/twitter/bootstrap/sass/_wells.scss +3 -3
  82. data/vendor/twitter/bootstrap/sass/bootstrap.scss +2 -1
  83. data/vendor/twitter/bootstrap/sass/responsive.scss +1 -1
  84. metadata +12 -10
@@ -2,16 +2,6 @@
2
2
  // Modals
3
3
  // --------------------------------------------------
4
4
 
5
-
6
- // Recalculate z-index where appropriate,
7
- // but only apply to elements within modal
8
- .modal-open .modal {
9
- .dropdown-menu { z-index: @zindexDropdown + @zindexModal; }
10
- .dropdown.open { *z-index: @zindexDropdown + @zindexModal; }
11
- .popover { z-index: @zindexPopover + @zindexModal; }
12
- .tooltip { z-index: @zindexTooltip + @zindexModal; }
13
- }
14
-
15
5
  // Background
16
6
  .modal-backdrop {
17
7
  position: fixed;
@@ -36,7 +26,6 @@
36
26
  top: 50%;
37
27
  left: 50%;
38
28
  z-index: @zindexModal;
39
- overflow: auto;
40
29
  width: 560px;
41
30
  margin: -250px 0 0 -280px;
42
31
  background-color: @white;
@@ -46,6 +35,9 @@
46
35
  .border-radius(6px);
47
36
  .box-shadow(0 3px 7px rgba(0,0,0,0.3));
48
37
  .background-clip(padding-box);
38
+ // Remove focus outline from opened modal
39
+ outline: none;
40
+
49
41
  &.fade {
50
42
  .transition(e('opacity .3s linear, top .3s ease-out'));
51
43
  top: -25%;
@@ -95,4 +87,8 @@
95
87
  .btn-group .btn + .btn {
96
88
  margin-left: -1px;
97
89
  }
90
+ // and override it for block buttons as well
91
+ .btn-block + .btn-block {
92
+ margin-left: 0;
93
+ }
98
94
  }
@@ -25,7 +25,7 @@
25
25
  padding-right: 20px;
26
26
  #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
27
27
  border: 1px solid @navbarBorder;
28
- .border-radius(4px);
28
+ .border-radius(@baseBorderRadius);
29
29
  .box-shadow(0 1px 4px rgba(0,0,0,.065));
30
30
 
31
31
  // Prevent floats from breaking the navbar
@@ -41,6 +41,7 @@
41
41
  // Override the default collapsed state
42
42
  .nav-collapse.collapse {
43
43
  height: auto;
44
+ overflow: visible;
44
45
  }
45
46
 
46
47
 
@@ -152,7 +153,6 @@
152
153
 
153
154
  .navbar-static-top {
154
155
  position: static;
155
- width: 100%;
156
156
  margin-bottom: 0; // remove 18px margin for default navbar
157
157
  .navbar-inner {
158
158
  .border-radius(0);
@@ -202,7 +202,7 @@
202
202
  .navbar-fixed-top,
203
203
  .navbar-static-top {
204
204
  .navbar-inner {
205
- .box-shadow(inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1));
205
+ .box-shadow(~"0 1px 10px rgba(0,0,0,.1)");
206
206
  }
207
207
  }
208
208
 
@@ -210,7 +210,7 @@
210
210
  .navbar-fixed-bottom {
211
211
  bottom: 0;
212
212
  .navbar-inner {
213
- .box-shadow(inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1));
213
+ .box-shadow(~"0 -1px 10px rgba(0,0,0,.1)");
214
214
  }
215
215
  }
216
216
 
@@ -274,7 +274,7 @@
274
274
  margin-left: 5px;
275
275
  margin-right: 5px;
276
276
  .buttonBackground(darken(@navbarBackgroundHighlight, 5%), darken(@navbarBackground, 5%));
277
- .box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075));
277
+ .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)");
278
278
  }
279
279
  .navbar .btn-navbar .icon-bar {
280
280
  display: block;
@@ -446,7 +446,7 @@
446
446
  color: @white;
447
447
  background-color: @navbarInverseSearchBackground;
448
448
  border-color: @navbarInverseSearchBorder;
449
- .box-shadow(inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15));
449
+ .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)");
450
450
  .transition(none);
451
451
  .placeholder(@navbarInverseSearchPlaceholderColor);
452
452
 
@@ -67,7 +67,8 @@
67
67
  text-shadow: 0 -1px 0 rgba(0,0,0,.2);
68
68
  background-color: @linkColor;
69
69
  }
70
- .nav-list [class^="icon-"] {
70
+ .nav-list [class^="icon-"],
71
+ .nav-list [class*=" icon-"] {
71
72
  margin-right: 2px;
72
73
  }
73
74
  // Dividers (basically an hr) within the dropdown
@@ -123,7 +124,7 @@
123
124
  .nav-tabs > .active > a,
124
125
  .nav-tabs > .active > a:hover {
125
126
  color: @gray;
126
- background-color: @white;
127
+ background-color: @bodyBackground;
127
128
  border: 1px solid #ddd;
128
129
  border-bottom-color: transparent;
129
130
  cursor: default;
@@ -12,28 +12,29 @@
12
12
  .pager li {
13
13
  display: inline;
14
14
  }
15
- .pager a,
16
- .pager span {
15
+ .pager li > a,
16
+ .pager li > span {
17
17
  display: inline-block;
18
18
  padding: 5px 14px;
19
19
  background-color: #fff;
20
20
  border: 1px solid #ddd;
21
21
  .border-radius(15px);
22
22
  }
23
- .pager a:hover {
23
+ .pager li > a:hover {
24
24
  text-decoration: none;
25
25
  background-color: #f5f5f5;
26
26
  }
27
- .pager .next a,
28
- .pager .next span {
27
+ .pager .next > a,
28
+ .pager .next > span {
29
29
  float: right;
30
30
  }
31
- .pager .previous a {
31
+ .pager .previous > a,
32
+ .pager .previous > span {
32
33
  float: left;
33
34
  }
34
- .pager .disabled a,
35
- .pager .disabled a:hover,
36
- .pager .disabled span {
35
+ .pager .disabled > a,
36
+ .pager .disabled > a:hover,
37
+ .pager .disabled > span {
37
38
  color: @grayLight;
38
39
  background-color: #fff;
39
40
  cursor: default;
@@ -2,27 +2,30 @@
2
2
  // Pagination (multiple pages)
3
3
  // --------------------------------------------------
4
4
 
5
-
5
+ // Space out pagination from surrounding content
6
6
  .pagination {
7
- height: @baseLineHeight * 2;
8
7
  margin: @baseLineHeight 0;
9
- }
8
+ }
9
+
10
10
  .pagination ul {
11
+ // Allow for text-based alignment
11
12
  display: inline-block;
12
13
  .ie7-inline-block();
14
+ // Reset default ul styles
13
15
  margin-left: 0;
14
16
  margin-bottom: 0;
15
- .border-radius(3px);
17
+ // Visuals
18
+ .border-radius(@baseBorderRadius);
16
19
  .box-shadow(0 1px 2px rgba(0,0,0,.05));
17
20
  }
18
21
  .pagination ul > li {
19
- display: inline;
22
+ display: inline; // Remove list-style and block-level defaults
20
23
  }
21
24
  .pagination ul > li > a,
22
25
  .pagination ul > li > span {
23
- float: left;
24
- padding: 0 14px;
25
- line-height: (@baseLineHeight * 2) - 2;
26
+ float: left; // Collapse white-space
27
+ padding: 4px 12px;
28
+ line-height: @baseLineHeight;
26
29
  text-decoration: none;
27
30
  background-color: @paginationBackground;
28
31
  border: 1px solid @paginationBorder;
@@ -31,7 +34,7 @@
31
34
  .pagination ul > li > a:hover,
32
35
  .pagination ul > .active > a,
33
36
  .pagination ul > .active > span {
34
- background-color: #f5f5f5;
37
+ background-color: @paginationActiveBackground;
35
38
  }
36
39
  .pagination ul > .active > a,
37
40
  .pagination ul > .active > span {
@@ -48,17 +51,71 @@
48
51
  .pagination ul > li:first-child > a,
49
52
  .pagination ul > li:first-child > span {
50
53
  border-left-width: 1px;
51
- .border-radius(3px 0 0 3px);
54
+ .border-left-radius(@baseBorderRadius);
52
55
  }
53
56
  .pagination ul > li:last-child > a,
54
57
  .pagination ul > li:last-child > span {
55
- .border-radius(0 3px 3px 0);
58
+ .border-right-radius(@baseBorderRadius);
56
59
  }
57
60
 
58
- // Centered
61
+
62
+ // Alignment
63
+ // --------------------------------------------------
64
+
59
65
  .pagination-centered {
60
66
  text-align: center;
61
67
  }
62
68
  .pagination-right {
63
69
  text-align: right;
64
70
  }
71
+
72
+
73
+ // Sizing
74
+ // --------------------------------------------------
75
+
76
+ // Large
77
+ .pagination-large {
78
+ ul > li > a,
79
+ ul > li > span {
80
+ padding: @paddingLarge;
81
+ font-size: @fontSizeLarge;
82
+ }
83
+ ul > li:first-child > a,
84
+ ul > li:first-child > span {
85
+ .border-left-radius(@borderRadiusLarge);
86
+ }
87
+ ul > li:last-child > a,
88
+ ul > li:last-child > span {
89
+ .border-right-radius(@borderRadiusLarge);
90
+ }
91
+ }
92
+
93
+ // Small and mini
94
+ .pagination-mini,
95
+ .pagination-small {
96
+ ul > li:first-child > a,
97
+ ul > li:first-child > span {
98
+ .border-left-radius(@borderRadiusSmall);
99
+ }
100
+ ul > li:last-child > a,
101
+ ul > li:last-child > span {
102
+ .border-right-radius(@borderRadiusSmall);
103
+ }
104
+ }
105
+
106
+ // Small
107
+ .pagination-small {
108
+ ul > li > a,
109
+ ul > li > span {
110
+ padding: @paddingSmall;
111
+ font-size: @fontSizeSmall;
112
+ }
113
+ }
114
+ // Mini
115
+ .pagination-mini {
116
+ ul > li > a,
117
+ ul > li > span {
118
+ padding: @paddingMini;
119
+ font-size: @fontSizeMini;
120
+ }
121
+ }
@@ -21,10 +21,10 @@
21
21
  .box-shadow(0 5px 10px rgba(0,0,0,.2));
22
22
 
23
23
  // Offset the popover to account for the popover arrow
24
- &.top { margin-bottom: 10px; }
24
+ &.top { margin-top: -10px; }
25
25
  &.right { margin-left: 10px; }
26
26
  &.bottom { margin-top: 10px; }
27
- &.left { margin-right: 10px; }
27
+ &.left { margin-left: -10px; }
28
28
 
29
29
  }
30
30
 
@@ -48,7 +48,7 @@
48
48
  margin-bottom: @baseLineHeight;
49
49
  #gradient > .vertical(#f5f5f5, #f9f9f9);
50
50
  .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
51
- .border-radius(4px);
51
+ .border-radius(@baseBorderRadius);
52
52
  }
53
53
 
54
54
  // Bar of progress
@@ -66,7 +66,7 @@
66
66
  .transition(width .6s ease);
67
67
  }
68
68
  .progress .bar + .bar {
69
- .box-shadow(inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15));
69
+ .box-shadow(~"inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)");
70
70
  }
71
71
 
72
72
  // Striped bars
@@ -88,7 +88,8 @@ img {
88
88
  }
89
89
 
90
90
  // Prevent max-width from affecting Google Maps
91
- #map_canvas img {
91
+ #map_canvas img,
92
+ .google-maps img {
92
93
  max-width: none;
93
94
  }
94
95
 
@@ -115,11 +116,11 @@ input::-moz-focus-inner { // Inner padding and border oddities in FF3/4
115
116
  border: 0;
116
117
  }
117
118
  button,
118
- input[type="button"],
119
+ html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls.
119
120
  input[type="reset"],
120
121
  input[type="submit"] {
121
- cursor: pointer; // Cursors on all buttons applied consistently
122
- -webkit-appearance: button; // Style clickable inputs in iOS
122
+ -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS.
123
+ cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others.
123
124
  }
124
125
  input[type="search"] { // Appearance in Safari/Chrome
125
126
  -webkit-box-sizing: content-box;
@@ -58,6 +58,7 @@
58
58
  }
59
59
  // Make all grid-sized elements block level again
60
60
  [class*="span"],
61
+ .uneditable-input[class*="span"], // Makes uneditable inputs full-width when using grid sizing
61
62
  .row-fluid [class*="span"] {
62
63
  float: none;
63
64
  display: block;
@@ -70,6 +71,9 @@
70
71
  width: 100%;
71
72
  .box-sizing(border-box);
72
73
  }
74
+ .row-fluid [class*="offset"]:first-child {
75
+ margin-left: 0;
76
+ }
73
77
 
74
78
  // FORM FIELDS
75
79
  // -----------
@@ -103,7 +107,8 @@
103
107
  right: 20px;
104
108
  width: auto;
105
109
  margin: 0;
106
- &.fade.in { top: auto; }
110
+ &.fade { top: -100px; }
111
+ &.fade.in { top: 20px; }
107
112
  }
108
113
 
109
114
  }
@@ -155,6 +160,20 @@
155
160
  }
156
161
  }
157
162
 
163
+ // Medias
164
+ // Reset float and spacing to stack
165
+ .media .pull-left,
166
+ .media .pull-right {
167
+ float: none;
168
+ display: block;
169
+ margin-bottom: 10px;
170
+ }
171
+ // Remove side margins since we stack instead of indent
172
+ .media-object {
173
+ margin-right: 0;
174
+ margin-left: 0;
175
+ }
176
+
158
177
  // Modals
159
178
  .modal {
160
179
  top: 10px;
@@ -75,7 +75,7 @@
75
75
  .nav-collapse .btn {
76
76
  padding: 4px 10px 4px;
77
77
  font-weight: normal;
78
- .border-radius(4px);
78
+ .border-radius(@baseBorderRadius);
79
79
  }
80
80
  .nav-collapse .dropdown-menu li + li a {
81
81
  margin-bottom: 2px;
@@ -84,6 +84,10 @@
84
84
  .nav-collapse .dropdown-menu a:hover {
85
85
  background-color: @navbarBackground;
86
86
  }
87
+ .navbar-inverse .nav-collapse .nav > li > a,
88
+ .navbar-inverse .nav-collapse .dropdown-menu a {
89
+ color: @navbarInverseLinkColor;
90
+ }
87
91
  .navbar-inverse .nav-collapse .nav > li > a:hover,
88
92
  .navbar-inverse .nav-collapse .dropdown-menu a:hover {
89
93
  background-color: @navbarInverseBackground;
@@ -99,7 +103,7 @@
99
103
  top: auto;
100
104
  left: auto;
101
105
  float: none;
102
- display: block;
106
+ display: none;
103
107
  max-width: none;
104
108
  margin: 0 15px;
105
109
  padding: 0;
@@ -108,6 +112,10 @@
108
112
  .border-radius(0);
109
113
  .box-shadow(none);
110
114
  }
115
+ .nav-collapse .open > .dropdown-menu {
116
+ display: block;
117
+ }
118
+
111
119
  .nav-collapse .dropdown-menu:before,
112
120
  .nav-collapse .dropdown-menu:after {
113
121
  display: none;
@@ -129,7 +137,7 @@
129
137
  margin: (@baseLineHeight / 2) 0;
130
138
  border-top: 1px solid @navbarBackground;
131
139
  border-bottom: 1px solid @navbarBackground;
132
- .box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1));
140
+ .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)");
133
141
  }
134
142
  .navbar-inverse .nav-collapse .navbar-form,
135
143
  .navbar-inverse .nav-collapse .navbar-search {
@@ -166,7 +174,7 @@
166
174
  // DEFAULT DESKTOP
167
175
  // ---------------
168
176
 
169
- @media (min-width: 980px) {
177
+ @media (min-width: @navbarCollapseDesktopWidth) {
170
178
 
171
179
  // Required to make the collapsing navbar work on regular desktops
172
180
  .nav-collapse.collapse {
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap Responsive v2.1.1
2
+ * Bootstrap Responsive v2.2.1
3
3
  *
4
4
  * Copyright 2012 Twitter, Inc
5
5
  * Licensed under the Apache License v2.0