twitter-bootstrap-rails 2.1.1 → 2.1.2

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.

Potentially problematic release.


This version of twitter-bootstrap-rails might be problematic. Click here for more details.

Files changed (71) hide show
  1. data/README.md +14 -3
  2. data/app/helpers/bootstrap_flash_helper.rb +12 -0
  3. data/lib/generators/bootstrap/layout/templates/layout.html.erb +1 -0
  4. data/lib/generators/bootstrap/layout/templates/layout.html.haml +1 -0
  5. data/lib/generators/bootstrap/layout/templates/layout.html.slim +1 -0
  6. data/lib/generators/bootstrap/partial/partial_generator.rb +20 -0
  7. data/lib/generators/bootstrap/partial/templates/_login.html.erb +29 -0
  8. data/lib/generators/bootstrap/partial/templates/_navbar.html.erb +13 -0
  9. data/lib/generators/bootstrap/themed/templates/index.html.erb +1 -1
  10. data/lib/generators/bootstrap/themed/templates/index.html.haml +1 -1
  11. data/lib/generators/bootstrap/themed/templates/index.html.slim +1 -1
  12. data/lib/generators/bootstrap/themed/templates/show.html.erb +1 -1
  13. data/lib/generators/bootstrap/themed/templates/show.html.haml +1 -1
  14. data/lib/generators/bootstrap/themed/templates/show.html.slim +1 -1
  15. data/lib/twitter/bootstrap/rails/version.rb +1 -1
  16. data/vendor/assets/javascripts/twitter/bootstrap.js +1 -0
  17. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-affix.js +104 -0
  18. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-alert.js +1 -1
  19. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-button.js +1 -1
  20. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-carousel.js +12 -5
  21. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-collapse.js +4 -3
  22. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-dropdown.js +66 -16
  23. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-modal.js +95 -74
  24. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-popover.js +9 -4
  25. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js +9 -9
  26. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-tab.js +2 -2
  27. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-tooltip.js +15 -15
  28. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-transition.js +2 -3
  29. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-typeahead.js +51 -40
  30. data/vendor/toolkit/fontawesome.less +5 -5
  31. data/vendor/toolkit/twitter/bootstrap/accordion.less +3 -2
  32. data/vendor/toolkit/twitter/bootstrap/alerts.less +16 -9
  33. data/vendor/toolkit/twitter/bootstrap/bootstrap.less +1 -1
  34. data/vendor/toolkit/twitter/bootstrap/breadcrumbs.less +10 -10
  35. data/vendor/toolkit/twitter/bootstrap/button-groups.less +76 -23
  36. data/vendor/toolkit/twitter/bootstrap/buttons.less +85 -65
  37. data/vendor/toolkit/twitter/bootstrap/carousel.less +13 -3
  38. data/vendor/toolkit/twitter/bootstrap/close.less +4 -2
  39. data/vendor/toolkit/twitter/bootstrap/code.less +6 -5
  40. data/vendor/toolkit/twitter/bootstrap/component-animations.less +5 -2
  41. data/vendor/toolkit/twitter/bootstrap/dropdowns.less +81 -14
  42. data/vendor/toolkit/twitter/bootstrap/forms.less +100 -48
  43. data/vendor/toolkit/twitter/bootstrap/grid.less +17 -1
  44. data/vendor/toolkit/twitter/bootstrap/hero-unit.less +4 -2
  45. data/vendor/toolkit/twitter/bootstrap/labels-badges.less +19 -2
  46. data/vendor/toolkit/twitter/bootstrap/layouts.less +1 -2
  47. data/vendor/toolkit/twitter/bootstrap/mixins.less +98 -73
  48. data/vendor/toolkit/twitter/bootstrap/modals.less +9 -2
  49. data/vendor/toolkit/twitter/bootstrap/navbar.less +238 -127
  50. data/vendor/toolkit/twitter/bootstrap/navs.less +38 -17
  51. data/vendor/toolkit/twitter/bootstrap/pager.less +5 -4
  52. data/vendor/toolkit/twitter/bootstrap/pagination.less +16 -8
  53. data/vendor/toolkit/twitter/bootstrap/popovers.less +101 -33
  54. data/vendor/toolkit/twitter/bootstrap/progress-bars.less +18 -13
  55. data/vendor/toolkit/twitter/bootstrap/reset.less +6 -3
  56. data/vendor/toolkit/twitter/bootstrap/responsive-1200px-min.less +9 -7
  57. data/vendor/toolkit/twitter/bootstrap/responsive-767px-max.less +86 -68
  58. data/vendor/toolkit/twitter/bootstrap/responsive-768px-979px.less +7 -5
  59. data/vendor/toolkit/twitter/bootstrap/responsive-navbar.less +18 -5
  60. data/vendor/toolkit/twitter/bootstrap/responsive-utilities.less +17 -15
  61. data/vendor/toolkit/twitter/bootstrap/responsive.less +5 -5
  62. data/vendor/toolkit/twitter/bootstrap/scaffolding.less +26 -4
  63. data/vendor/toolkit/twitter/bootstrap/sprites.less +15 -19
  64. data/vendor/toolkit/twitter/bootstrap/tables.less +60 -11
  65. data/vendor/toolkit/twitter/bootstrap/thumbnails.less +9 -4
  66. data/vendor/toolkit/twitter/bootstrap/tooltip.less +47 -12
  67. data/vendor/toolkit/twitter/bootstrap/type.less +57 -92
  68. data/vendor/toolkit/twitter/bootstrap/utilities.less +9 -2
  69. data/vendor/toolkit/twitter/bootstrap/variables.less +100 -29
  70. data/vendor/toolkit/twitter/bootstrap/wells.less +7 -5
  71. metadata +16 -22
@@ -1,5 +1,7 @@
1
- // UTILITY CLASSES
2
- // ---------------
1
+ //
2
+ // Utility classes
3
+ // --------------------------------------------------
4
+
3
5
 
4
6
  // Quick floats
5
7
  .pull-right {
@@ -21,3 +23,8 @@
21
23
  .invisible {
22
24
  visibility: hidden;
23
25
  }
26
+
27
+ // For Affix plugin
28
+ .affix {
29
+ position: fixed;
30
+ }
@@ -1,10 +1,9 @@
1
- // Variables.less
2
- // Variables to customize the look and feel of Bootstrap
3
- // -----------------------------------------------------
4
-
1
+ //
2
+ // Variables
3
+ // --------------------------------------------------
5
4
 
6
5
 
7
- // GLOBAL VALUES
6
+ // Global values
8
7
  // --------------------------------------------------
9
8
 
10
9
 
@@ -47,11 +46,11 @@
47
46
  // -------------------------
48
47
  @sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
49
48
  @serifFontFamily: Georgia, "Times New Roman", Times, serif;
50
- @monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace;
49
+ @monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace;
51
50
 
52
- @baseFontSize: 13px;
51
+ @baseFontSize: 14px;
53
52
  @baseFontFamily: @sansFontFamily;
54
- @baseLineHeight: 18px;
53
+ @baseLineHeight: 20px;
55
54
  @altFontFamily: @serifFontFamily;
56
55
 
57
56
  @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
@@ -71,10 +70,10 @@
71
70
  // -------------------------
72
71
  @btnBackground: @white;
73
72
  @btnBackgroundHighlight: darken(@white, 10%);
74
- @btnBorder: #ccc;
73
+ @btnBorder: #bbb;
75
74
 
76
75
  @btnPrimaryBackground: @linkColor;
77
- @btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%);
76
+ @btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 20%);
78
77
 
79
78
  @btnInfoBackground: #5bc0de;
80
79
  @btnInfoBackgroundHighlight: #2f96b4;
@@ -88,7 +87,7 @@
88
87
  @btnDangerBackground: #ee5f5b;
89
88
  @btnDangerBackgroundHighlight: #bd362f;
90
89
 
91
- @btnInverseBackground: @gray;
90
+ @btnInverseBackground: #444;
92
91
  @btnInverseBackgroundHighlight: @grayDarker;
93
92
 
94
93
 
@@ -104,12 +103,17 @@
104
103
  // -------------------------
105
104
  @dropdownBackground: @white;
106
105
  @dropdownBorder: rgba(0,0,0,.2);
107
- @dropdownLinkColor: @grayDark;
108
- @dropdownLinkColorHover: @white;
109
- @dropdownLinkBackgroundHover: @linkColor;
110
106
  @dropdownDividerTop: #e5e5e5;
111
107
  @dropdownDividerBottom: @white;
112
108
 
109
+ @dropdownLinkColor: @grayDark;
110
+
111
+ @dropdownLinkColorHover: @white;
112
+ @dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;
113
+
114
+ @dropdownLinkColorActive: @dropdownLinkColor;
115
+ @dropdownLinkBackgroundActive: @linkColor;
116
+
113
117
 
114
118
 
115
119
  // COMPONENT VARIABLES
@@ -121,7 +125,7 @@
121
125
  // Try to avoid customizing these :)
122
126
  @zindexDropdown: 1000;
123
127
  @zindexPopover: 1010;
124
- @zindexTooltip: 1020;
128
+ @zindexTooltip: 1030;
125
129
  @zindexFixedNavbar: 1030;
126
130
  @zindexModalBackdrop: 1040;
127
131
  @zindexModal: 1050;
@@ -143,25 +147,55 @@
143
147
  @hrBorder: @grayLighter;
144
148
 
145
149
 
150
+ // Wells
151
+ // -------------------------
152
+ @wellBackground: #f5f5f5;
153
+
154
+
146
155
  // Navbar
147
156
  // -------------------------
148
- @navbarHeight: 40px;
149
- @navbarBackground: @grayDarker;
150
- @navbarBackgroundHighlight: @grayDark;
157
+ @navbarCollapseWidth: 979px;
151
158
 
152
- @navbarText: @grayLight;
153
- @navbarLinkColor: @grayLight;
154
- @navbarLinkColorHover: @white;
155
- @navbarLinkColorActive: @navbarLinkColorHover;
159
+ @navbarHeight: 40px;
160
+ @navbarBackground: darken(@navbarBackgroundHighlight, 5%);
161
+ @navbarBackgroundHighlight: #ffffff;
162
+ @navbarBorder: darken(@navbarBackground, 12%);
163
+
164
+ @navbarText: @gray;
165
+ @navbarLinkColor: @gray;
166
+ @navbarLinkColorHover: @grayDark;
167
+ @navbarLinkColorActive: @gray;
156
168
  @navbarLinkBackgroundHover: transparent;
157
- @navbarLinkBackgroundActive: @navbarBackground;
169
+ @navbarLinkBackgroundActive: darken(@navbarBackground, 5%);
158
170
 
159
- @navbarSearchBackground: lighten(@navbarBackground, 25%);
160
- @navbarSearchBackgroundFocus: @white;
161
- @navbarSearchBorder: darken(@navbarSearchBackground, 30%);
162
- @navbarSearchPlaceholderColor: #ccc;
163
171
  @navbarBrandColor: @navbarLinkColor;
164
172
 
173
+ // Inverted navbar
174
+ @navbarInverseBackground: #111111;
175
+ @navbarInverseBackgroundHighlight: #222222;
176
+ @navbarInverseBorder: #252525;
177
+
178
+ @navbarInverseText: @grayLight;
179
+ @navbarInverseLinkColor: @grayLight;
180
+ @navbarInverseLinkColorHover: @white;
181
+ @navbarInverseLinkColorActive: @navbarInverseLinkColorHover;
182
+ @navbarInverseLinkBackgroundHover: transparent;
183
+ @navbarInverseLinkBackgroundActive: @navbarInverseBackground;
184
+
185
+ @navbarInverseSearchBackground: lighten(@navbarInverseBackground, 25%);
186
+ @navbarInverseSearchBackgroundFocus: @white;
187
+ @navbarInverseSearchBorder: @navbarInverseBackground;
188
+ @navbarInverseSearchPlaceholderColor: #ccc;
189
+
190
+ @navbarInverseBrandColor: @navbarInverseLinkColor;
191
+
192
+
193
+ // Pagination
194
+ // -------------------------
195
+ @paginationBackground: #fff;
196
+ @paginationBorder: #ddd;
197
+ @paginationActiveBackground: #f5f5f5;
198
+
165
199
 
166
200
  // Hero unit
167
201
  // -------------------------
@@ -189,10 +223,28 @@
189
223
  @infoBorder: darken(spin(@infoBackground, -10), 7%);
190
224
 
191
225
 
226
+ // Tooltips and popovers
227
+ // -------------------------
228
+ @tooltipColor: #fff;
229
+ @tooltipBackground: #000;
230
+ @tooltipArrowWidth: 5px;
231
+ @tooltipArrowColor: @tooltipBackground;
232
+
233
+ @popoverBackground: #fff;
234
+ @popoverArrowWidth: 10px;
235
+ @popoverArrowColor: #fff;
236
+ @popoverTitleBackground: darken(@popoverBackground, 3%);
237
+
238
+ // Special enhancement for popovers
239
+ @popoverArrowOuterWidth: @popoverArrowWidth + 1;
240
+ @popoverArrowOuterColor: rgba(0,0,0,.25);
241
+
242
+
192
243
 
193
244
  // GRID
194
245
  // --------------------------------------------------
195
246
 
247
+
196
248
  // Default 940px grid
197
249
  // -------------------------
198
250
  @gridColumns: 12;
@@ -200,7 +252,26 @@
200
252
  @gridGutterWidth: 20px;
201
253
  @gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
202
254
 
255
+ // 1200px min
256
+ @gridColumnWidth1200: 70px;
257
+ @gridGutterWidth1200: 30px;
258
+ @gridRowWidth1200: (@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1));
259
+
260
+ // 768px-979px
261
+ @gridColumnWidth768: 42px;
262
+ @gridGutterWidth768: 20px;
263
+ @gridRowWidth768: (@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1));
264
+
265
+
203
266
  // Fluid grid
204
267
  // -------------------------
205
- @fluidGridColumnWidth: 6.382978723%;
206
- @fluidGridGutterWidth: 2.127659574%;
268
+ @fluidGridColumnWidth: percentage(@gridColumnWidth/@gridRowWidth);
269
+ @fluidGridGutterWidth: percentage(@gridGutterWidth/@gridRowWidth);
270
+
271
+ // 1200px min
272
+ @fluidGridColumnWidth1200: percentage(@gridColumnWidth1200/@gridRowWidth1200);
273
+ @fluidGridGutterWidth1200: percentage(@gridGutterWidth1200/@gridRowWidth1200);
274
+
275
+ // 768px-979px
276
+ @fluidGridColumnWidth768: percentage(@gridColumnWidth768/@gridRowWidth768);
277
+ @fluidGridGutterWidth768: percentage(@gridGutterWidth768/@gridRowWidth768);
@@ -1,13 +1,15 @@
1
- // WELLS
2
- // -----
1
+ //
2
+ // Wells
3
+ // --------------------------------------------------
3
4
 
5
+
6
+ // Base class
4
7
  .well {
5
8
  min-height: 20px;
6
9
  padding: 19px;
7
10
  margin-bottom: 20px;
8
- background-color: #f5f5f5;
9
- border: 1px solid #eee;
10
- border: 1px solid rgba(0,0,0,.05);
11
+ background-color: @wellBackground;
12
+ border: 1px solid darken(@wellBackground, 7%);
11
13
  .border-radius(4px);
12
14
  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
13
15
  blockquote {
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: twitter-bootstrap-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.1
4
+ version: 2.1.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-07-17 00:00:00.000000000 Z
12
+ date: 2012-08-23 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
16
- requirement: &70109523796320 !ruby/object:Gem::Requirement
16
+ requirement: &70199668659600 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '3.1'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70109523796320
24
+ version_requirements: *70199668659600
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: actionpack
27
- requirement: &70109523795820 !ruby/object:Gem::Requirement
27
+ requirement: &70199668659060 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,32 +32,21 @@ dependencies:
32
32
  version: '3.1'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70109523795820
36
- - !ruby/object:Gem::Dependency
37
- name: therubyracer
38
- requirement: &70109523795320 !ruby/object:Gem::Requirement
39
- none: false
40
- requirements:
41
- - - =
42
- - !ruby/object:Gem::Version
43
- version: 0.10.1
44
- type: :runtime
45
- prerelease: false
46
- version_requirements: *70109523795320
35
+ version_requirements: *70199668659060
47
36
  - !ruby/object:Gem::Dependency
48
37
  name: less-rails
49
- requirement: &70109523794860 !ruby/object:Gem::Requirement
38
+ requirement: &70199668658560 !ruby/object:Gem::Requirement
50
39
  none: false
51
40
  requirements:
52
41
  - - ~>
53
42
  - !ruby/object:Gem::Version
54
- version: 2.2.2
43
+ version: 2.2.3
55
44
  type: :runtime
56
45
  prerelease: false
57
- version_requirements: *70109523794860
46
+ version_requirements: *70199668658560
58
47
  - !ruby/object:Gem::Dependency
59
48
  name: rails
60
- requirement: &70109523794400 !ruby/object:Gem::Requirement
49
+ requirement: &70199668658100 !ruby/object:Gem::Requirement
61
50
  none: false
62
51
  requirements:
63
52
  - - ! '>='
@@ -65,7 +54,7 @@ dependencies:
65
54
  version: '3.1'
66
55
  type: :development
67
56
  prerelease: false
68
- version_requirements: *70109523794400
57
+ version_requirements: *70199668658100
69
58
  description: twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for
70
59
  Rails 3.1 Asset Pipeline
71
60
  email:
@@ -83,6 +72,9 @@ files:
83
72
  - lib/generators/bootstrap/layout/templates/layout.html.erb
84
73
  - lib/generators/bootstrap/layout/templates/layout.html.haml
85
74
  - lib/generators/bootstrap/layout/templates/layout.html.slim
75
+ - lib/generators/bootstrap/partial/partial_generator.rb
76
+ - lib/generators/bootstrap/partial/templates/_login.html.erb
77
+ - lib/generators/bootstrap/partial/templates/_navbar.html.erb
86
78
  - lib/generators/bootstrap/themed/templates/_form.html.erb
87
79
  - lib/generators/bootstrap/themed/templates/_form.html.haml
88
80
  - lib/generators/bootstrap/themed/templates/_form.html.slim
@@ -113,6 +105,7 @@ files:
113
105
  - vendor/assets/fonts/fontawesome-webfont.woff
114
106
  - vendor/assets/images/twitter/bootstrap/glyphicons-halflings-white.png
115
107
  - vendor/assets/images/twitter/bootstrap/glyphicons-halflings.png
108
+ - vendor/assets/javascripts/twitter/bootstrap/bootstrap-affix.js
116
109
  - vendor/assets/javascripts/twitter/bootstrap/bootstrap-alert.js
117
110
  - vendor/assets/javascripts/twitter/bootstrap/bootstrap-button.js
118
111
  - vendor/assets/javascripts/twitter/bootstrap/bootstrap-carousel.js
@@ -169,6 +162,7 @@ files:
169
162
  - vendor/toolkit/twitter/bootstrap/variables.less
170
163
  - vendor/toolkit/twitter/bootstrap/wells.less
171
164
  - vendor/toolkit/twitter/bootstrap_base.less
165
+ - app/helpers/bootstrap_flash_helper.rb
172
166
  - app/helpers/flash_block_helper.rb
173
167
  - app/helpers/modal_helper.rb
174
168
  - app/helpers/twitter_breadcrumbs_helper.rb