twitter-bootstrap-rails 2.0.3 → 2.0.4

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 (58) hide show
  1. data/README.md +22 -2
  2. data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less +2 -0
  3. data/lib/generators/bootstrap/layout/templates/layout.html.erb +6 -12
  4. data/lib/generators/bootstrap/layout/templates/layout.html.haml +0 -5
  5. data/lib/generators/bootstrap/layout/templates/layout.html.slim +1 -6
  6. data/lib/generators/bootstrap/themed/templates/_form.html.erb +1 -1
  7. data/lib/generators/bootstrap/themed/templates/_form.html.haml +13 -11
  8. data/lib/generators/bootstrap/themed/templates/edit.html.haml +1 -2
  9. data/lib/generators/bootstrap/themed/templates/edit.html.slim +1 -1
  10. data/lib/generators/bootstrap/themed/templates/index.html.haml +3 -3
  11. data/lib/generators/bootstrap/themed/templates/new.html.haml +1 -1
  12. data/lib/generators/bootstrap/themed/templates/new.html.slim +1 -1
  13. data/lib/generators/bootstrap/themed/templates/show.html.haml +1 -1
  14. data/lib/generators/bootstrap/themed/themed_generator.rb +4 -4
  15. data/lib/twitter/bootstrap/rails/engine.rb +9 -3
  16. data/lib/twitter/bootstrap/rails/twitter-bootstrap-breadcrumbs.rb +25 -0
  17. data/lib/twitter/bootstrap/rails/version.rb +1 -1
  18. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-alert.js +1 -1
  19. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-button.js +4 -2
  20. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-carousel.js +7 -3
  21. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-collapse.js +4 -2
  22. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-dropdown.js +1 -1
  23. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-modal.js +1 -1
  24. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-popover.js +1 -1
  25. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js +1 -1
  26. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-tab.js +1 -1
  27. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-tooltip.js +2 -2
  28. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-transition.js +1 -1
  29. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-typeahead.js +7 -7
  30. data/vendor/toolkit/twitter/bootstrap/alerts.less +2 -14
  31. data/vendor/toolkit/twitter/bootstrap/badges.less +36 -0
  32. data/vendor/toolkit/twitter/bootstrap/bootstrap.less +2 -1
  33. data/vendor/toolkit/twitter/bootstrap/breadcrumbs.less +2 -0
  34. data/vendor/toolkit/twitter/bootstrap/button-groups.less +31 -7
  35. data/vendor/toolkit/twitter/bootstrap/buttons.less +17 -13
  36. data/vendor/toolkit/twitter/bootstrap/code.less +2 -2
  37. data/vendor/toolkit/twitter/bootstrap/component-animations.less +4 -2
  38. data/vendor/toolkit/twitter/bootstrap/dropdowns.less +45 -27
  39. data/vendor/toolkit/twitter/bootstrap/forms.less +78 -45
  40. data/vendor/toolkit/twitter/bootstrap/grid.less +2 -5
  41. data/vendor/toolkit/twitter/bootstrap/hero-unit.less +3 -1
  42. data/vendor/toolkit/twitter/bootstrap/labels.less +8 -2
  43. data/vendor/toolkit/twitter/bootstrap/mixins.less +190 -166
  44. data/vendor/toolkit/twitter/bootstrap/modals.less +12 -5
  45. data/vendor/toolkit/twitter/bootstrap/navbar.less +77 -35
  46. data/vendor/toolkit/twitter/bootstrap/navs.less +19 -9
  47. data/vendor/toolkit/twitter/bootstrap/pager.less +6 -0
  48. data/vendor/toolkit/twitter/bootstrap/pagination.less +1 -0
  49. data/vendor/toolkit/twitter/bootstrap/progress-bars.less +15 -1
  50. data/vendor/toolkit/twitter/bootstrap/reset.less +1 -1
  51. data/vendor/toolkit/twitter/bootstrap/responsive.less +72 -28
  52. data/vendor/toolkit/twitter/bootstrap/scaffolding.less +4 -4
  53. data/vendor/toolkit/twitter/bootstrap/sprites.less +1 -1
  54. data/vendor/toolkit/twitter/bootstrap/tables.less +26 -17
  55. data/vendor/toolkit/twitter/bootstrap/type.less +22 -6
  56. data/vendor/toolkit/twitter/bootstrap/variables.less +100 -6
  57. data/vendor/toolkit/twitter/bootstrap/wells.less +10 -0
  58. metadata +13 -11
@@ -3,8 +3,8 @@
3
3
  // -------------------------------------------------------------------------------------------
4
4
 
5
5
 
6
- // STRUCTURAL LAYOUT
7
- // -----------------
6
+ // Body reset
7
+ // ----------
8
8
 
9
9
  body {
10
10
  margin: 0;
@@ -12,11 +12,11 @@ body {
12
12
  font-size: @baseFontSize;
13
13
  line-height: @baseLineHeight;
14
14
  color: @textColor;
15
- background-color: @white;
15
+ background-color: @bodyBackground;
16
16
  }
17
17
 
18
18
 
19
- // LINKS
19
+ // Links
20
20
  // -----
21
21
 
22
22
  a {
@@ -11,7 +11,7 @@
11
11
  // and background-position. Your resulting HTML will look like
12
12
  // <i class="icon-inbox"></i>.
13
13
 
14
- // For the white version of the icons, just add the .icon-white class:
14
+ // For the white version of the icons, just add the .icon-white class:
15
15
  // <i class="icon-inbox icon-white"></i>
16
16
 
17
17
  [class^="icon-"],
@@ -11,6 +11,7 @@ table {
11
11
  max-width: 100%;
12
12
  border-collapse: collapse;
13
13
  border-spacing: 0;
14
+ background-color: @tableBackground;
14
15
  }
15
16
 
16
17
  // BASELINE STYLES
@@ -26,7 +27,7 @@ table {
26
27
  line-height: @baseLineHeight;
27
28
  text-align: left;
28
29
  vertical-align: top;
29
- border-top: 1px solid #ddd;
30
+ border-top: 1px solid @tableBorder;
30
31
  }
31
32
  th {
32
33
  font-weight: bold;
@@ -36,13 +37,15 @@ table {
36
37
  vertical-align: bottom;
37
38
  }
38
39
  // Remove top border from thead by default
39
- thead:first-child tr th,
40
- thead:first-child tr td {
40
+ colgroup + thead tr:first-child th,
41
+ colgroup + thead tr:first-child td,
42
+ thead:first-child tr:first-child th,
43
+ thead:first-child tr:first-child td {
41
44
  border-top: 0;
42
45
  }
43
46
  // Account for multiple tbody instances
44
47
  tbody + tbody {
45
- border-top: 2px solid #ddd;
48
+ border-top: 2px solid @tableBorder;
46
49
  }
47
50
  }
48
51
 
@@ -63,15 +66,14 @@ table {
63
66
  // ----------------
64
67
 
65
68
  .table-bordered {
66
- border: 1px solid #ddd;
69
+ border: 1px solid @tableBorder;
70
+ border-left: 0;
67
71
  border-collapse: separate; // Done so we can round those corners!
68
72
  *border-collapse: collapsed; // IE7 can't round corners anyway
69
73
  .border-radius(4px);
70
- th + th,
71
- td + td,
72
- th + td,
73
- td + th {
74
- border-left: 1px solid #ddd;
74
+ th,
75
+ td {
76
+ border-left: 1px solid @tableBorder;
75
77
  }
76
78
  // Prevent a double border
77
79
  thead:first-child tr:first-child th,
@@ -108,7 +110,7 @@ table {
108
110
  tbody {
109
111
  tr:nth-child(odd) td,
110
112
  tr:nth-child(odd) th {
111
- background-color: #f9f9f9;
113
+ background-color: @tableBackgroundAccent;
112
114
  }
113
115
  }
114
116
  }
@@ -120,7 +122,7 @@ table {
120
122
  .table {
121
123
  tbody tr:hover td,
122
124
  tbody tr:hover th {
123
- background-color: #f5f5f5;
125
+ background-color: @tableBackgroundHover;
124
126
  }
125
127
  }
126
128
 
@@ -129,11 +131,6 @@ table {
129
131
  // -----------------
130
132
 
131
133
  // Change the columns
132
- .tableColumns(@columnSpan: 1) {
133
- float: none;
134
- width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 16;
135
- margin-left: 0;
136
- }
137
134
  table {
138
135
  .span1 { .tableColumns(1); }
139
136
  .span2 { .tableColumns(2); }
@@ -147,4 +144,16 @@ table {
147
144
  .span10 { .tableColumns(10); }
148
145
  .span11 { .tableColumns(11); }
149
146
  .span12 { .tableColumns(12); }
147
+ .span13 { .tableColumns(13); }
148
+ .span14 { .tableColumns(14); }
149
+ .span15 { .tableColumns(15); }
150
+ .span16 { .tableColumns(16); }
151
+ .span17 { .tableColumns(17); }
152
+ .span18 { .tableColumns(18); }
153
+ .span19 { .tableColumns(19); }
154
+ .span20 { .tableColumns(20); }
155
+ .span21 { .tableColumns(21); }
156
+ .span22 { .tableColumns(22); }
157
+ .span23 { .tableColumns(23); }
158
+ .span24 { .tableColumns(24); }
150
159
  }
@@ -28,8 +28,9 @@ p {
28
28
 
29
29
  h1, h2, h3, h4, h5, h6 {
30
30
  margin: 0;
31
- font-weight: bold;
32
- color: @grayDark;
31
+ font-family: @headingsFontFamily;
32
+ font-weight: @headingsFontWeight;
33
+ color: @headingsColor;
33
34
  text-rendering: optimizelegibility; // Fix the character spacing for headings
34
35
  small {
35
36
  font-weight: normal;
@@ -126,10 +127,23 @@ dd {
126
127
  }
127
128
  dt {
128
129
  font-weight: bold;
130
+ line-height: @baseLineHeight - 1; // fix jank Helvetica Neue font bug
129
131
  }
130
132
  dd {
131
133
  margin-left: @baseLineHeight / 2;
132
134
  }
135
+ // Horizontal layout (like forms)
136
+ .dl-horizontal {
137
+ dt {
138
+ float: left;
139
+ clear: left;
140
+ width: 120px;
141
+ text-align: right;
142
+ }
143
+ dd {
144
+ margin-left: 130px;
145
+ }
146
+ }
133
147
 
134
148
  // MISC
135
149
  // ----
@@ -154,12 +168,14 @@ em {
154
168
  }
155
169
 
156
170
  // Abbreviations and acronyms
157
- abbr {
158
- font-size: 90%;
159
- text-transform: uppercase;
171
+ abbr[title] {
160
172
  border-bottom: 1px dotted #ddd;
161
173
  cursor: help;
162
174
  }
175
+ abbr.initialism {
176
+ font-size: 90%;
177
+ text-transform: uppercase;
178
+ }
163
179
 
164
180
  // Blockquotes
165
181
  blockquote {
@@ -196,7 +212,7 @@ blockquote {
196
212
  // Quotes
197
213
  q:before,
198
214
  q:after,
199
- blockquote:before,
215
+ blockquote:before,
200
216
  blockquote:after {
201
217
  content: "";
202
218
  }
@@ -7,11 +7,9 @@
7
7
  // GLOBAL VALUES
8
8
  // --------------------------------------------------
9
9
 
10
- // Links
11
- @linkColor: #08c;
12
- @linkColorHover: darken(@linkColor, 15%);
13
10
 
14
11
  // Grays
12
+ // -------------------------
15
13
  @black: #000;
16
14
  @grayDarker: #222;
17
15
  @grayDark: #333;
@@ -20,7 +18,9 @@
20
18
  @grayLighter: #eee;
21
19
  @white: #fff;
22
20
 
21
+
23
22
  // Accent colors
23
+ // -------------------------
24
24
  @blue: #049cdb;
25
25
  @blueDark: #0064cd;
26
26
  @green: #46a546;
@@ -30,14 +30,79 @@
30
30
  @pink: #c3325f;
31
31
  @purple: #7a43b6;
32
32
 
33
+
34
+ // Scaffolding
35
+ // -------------------------
36
+ @bodyBackground: @white;
37
+ @textColor: @grayDark;
38
+
39
+
40
+ // Links
41
+ // -------------------------
42
+ @linkColor: #08c;
43
+ @linkColorHover: darken(@linkColor, 15%);
44
+
45
+
33
46
  // Typography
47
+ // -------------------------
34
48
  @baseFontSize: 13px;
35
49
  @baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
36
50
  @baseLineHeight: 18px;
37
- @textColor: @grayDark;
51
+ @altFontFamily: Georgia, "Times New Roman", Times, serif;
52
+
53
+ @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
54
+ @headingsFontWeight: bold; // instead of browser default, bold
55
+ @headingsColor: inherit; // empty to use BS default, @textColor
56
+
57
+
58
+ // Tables
59
+ // -------------------------
60
+ @tableBackground: transparent; // overall background-color
61
+ @tableBackgroundAccent: #f9f9f9; // for striping
62
+ @tableBackgroundHover: #f5f5f5; // for hover
63
+ @tableBorder: #ddd; // table and cell border
64
+
38
65
 
39
66
  // Buttons
40
- @primaryButtonBackground: @linkColor;
67
+ // -------------------------
68
+ @btnBackground: @white;
69
+ @btnBackgroundHighlight: darken(@white, 10%);
70
+ @btnBorder: darken(@white, 20%);
71
+
72
+ @btnPrimaryBackground: @linkColor;
73
+ @btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%);
74
+
75
+ @btnInfoBackground: #5bc0de;
76
+ @btnInfoBackgroundHighlight: #2f96b4;
77
+
78
+ @btnSuccessBackground: #62c462;
79
+ @btnSuccessBackgroundHighlight: #51a351;
80
+
81
+ @btnWarningBackground: lighten(@orange, 15%);
82
+ @btnWarningBackgroundHighlight: @orange;
83
+
84
+ @btnDangerBackground: #ee5f5b;
85
+ @btnDangerBackgroundHighlight: #bd362f;
86
+
87
+ @btnInverseBackground: @gray;
88
+ @btnInverseBackgroundHighlight: @grayDarker;
89
+
90
+
91
+ // Forms
92
+ // -------------------------
93
+ @inputBackground: @white;
94
+ @inputBorder: #ccc;
95
+ @inputDisabledBackground: @grayLighter;
96
+
97
+
98
+ // Dropdowns
99
+ // -------------------------
100
+ @dropdownBackground: @white;
101
+ @dropdownBorder: rgba(0,0,0,.2);
102
+ @dropdownLinkColor: @grayDark;
103
+ @dropdownLinkColorHover: @white;
104
+ @dropdownLinkBackgroundHover: @linkColor;
105
+
41
106
 
42
107
 
43
108
 
@@ -45,6 +110,7 @@
45
110
  // --------------------------------------------------
46
111
 
47
112
  // Z-index master list
113
+ // -------------------------
48
114
  // Used for a bird's eye view of components dependent on the z-axis
49
115
  // Try to avoid customizing these :)
50
116
  @zindexDropdown: 1000;
@@ -54,27 +120,51 @@
54
120
  @zindexModalBackdrop: 1040;
55
121
  @zindexModal: 1050;
56
122
 
123
+
57
124
  // Sprite icons path
125
+ // -------------------------
58
126
  @iconSpritePath: "../img/glyphicons-halflings.png";
59
127
  @iconWhiteSpritePath: "../img/glyphicons-halflings-white.png";
60
128
 
129
+
61
130
  // Input placeholder text color
131
+ // -------------------------
62
132
  @placeholderText: @grayLight;
63
133
 
134
+
64
135
  // Hr border color
136
+ // -------------------------
65
137
  @hrBorder: @grayLighter;
66
138
 
139
+
67
140
  // Navbar
141
+ // -------------------------
68
142
  @navbarHeight: 40px;
69
143
  @navbarBackground: @grayDarker;
70
144
  @navbarBackgroundHighlight: @grayDark;
71
- @navbarLinkBackgroundHover: transparent;
72
145
 
73
146
  @navbarText: @grayLight;
74
147
  @navbarLinkColor: @grayLight;
75
148
  @navbarLinkColorHover: @white;
149
+ @navbarLinkColorActive: @navbarLinkColorHover;
150
+ @navbarLinkBackgroundHover: transparent;
151
+ @navbarLinkBackgroundActive: @navbarBackground;
152
+
153
+ @navbarSearchBackground: lighten(@navbarBackground, 25%);
154
+ @navbarSearchBackgroundFocus: @white;
155
+ @navbarSearchBorder: darken(@navbarSearchBackground, 30%);
156
+ @navbarSearchPlaceholderColor: #ccc;
157
+
158
+
159
+ // Hero unit
160
+ // -------------------------
161
+ @heroUnitBackground: @grayLighter;
162
+ @heroUnitHeadingColor: inherit;
163
+ @heroUnitLeadColor: inherit;
164
+
76
165
 
77
166
  // Form states and alerts
167
+ // -------------------------
78
168
  @warningText: #c09853;
79
169
  @warningBackground: #fcf8e3;
80
170
  @warningBorder: darken(spin(@warningBackground, -10), 3%);
@@ -93,15 +183,19 @@
93
183
 
94
184
 
95
185
 
186
+
96
187
  // GRID
97
188
  // --------------------------------------------------
98
189
 
99
190
  // Default 940px grid
191
+ // -------------------------
100
192
  @gridColumns: 12;
101
193
  @gridColumnWidth: 60px;
102
194
  @gridGutterWidth: 20px;
103
195
  @gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
104
196
 
197
+
105
198
  // Fluid grid
199
+ // -------------------------
106
200
  @fluidGridColumnWidth: 6.382978723%;
107
201
  @fluidGridGutterWidth: 2.127659574%;
@@ -15,3 +15,13 @@
15
15
  border-color: rgba(0,0,0,.15);
16
16
  }
17
17
  }
18
+
19
+ // Sizes
20
+ .well-large {
21
+ padding: 24px;
22
+ .border-radius(6px);
23
+ }
24
+ .well-small {
25
+ padding: 9px;
26
+ .border-radius(3px);
27
+ }
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.0.3
4
+ version: 2.0.4
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-02-25 00:00:00.000000000 Z
12
+ date: 2012-03-17 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
16
- requirement: &72966450 !ruby/object:Gem::Requirement
16
+ requirement: &73258230 !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: *72966450
24
+ version_requirements: *73258230
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: actionpack
27
- requirement: &72966170 !ruby/object:Gem::Requirement
27
+ requirement: &73257980 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
32
32
  version: '3.1'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *72966170
35
+ version_requirements: *73257980
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: less-rails
38
- requirement: &72965850 !ruby/object:Gem::Requirement
38
+ requirement: &73257730 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
42
42
  - !ruby/object:Gem::Version
43
- version: 2.1.6
43
+ version: 2.1.8
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *72965850
46
+ version_requirements: *73257730
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rails
49
- requirement: &72965510 !ruby/object:Gem::Requirement
49
+ requirement: &73257390 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
54
54
  version: '3.1'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *72965510
57
+ version_requirements: *73257390
58
58
  description: twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for
59
59
  Rails 3.1 Asset Pipeline
60
60
  email:
@@ -92,6 +92,7 @@ files:
92
92
  - lib/twitter/bootstrap/rails/bootstrap.rb
93
93
  - lib/twitter/bootstrap/rails/version.rb
94
94
  - lib/twitter/bootstrap/rails/engine.rb
95
+ - lib/twitter/bootstrap/rails/twitter-bootstrap-breadcrumbs.rb
95
96
  - vendor/assets/images/twitter/bootstrap/glyphicons-halflings-white.png
96
97
  - vendor/assets/images/twitter/bootstrap/glyphicons-halflings.png
97
98
  - vendor/assets/javascripts/twitter/bootstrap.js
@@ -122,6 +123,7 @@ files:
122
123
  - vendor/toolkit/twitter/bootstrap/component-animations.less
123
124
  - vendor/toolkit/twitter/bootstrap/responsive.less
124
125
  - vendor/toolkit/twitter/bootstrap/popovers.less
126
+ - vendor/toolkit/twitter/bootstrap/badges.less
125
127
  - vendor/toolkit/twitter/bootstrap/alerts.less
126
128
  - vendor/toolkit/twitter/bootstrap/scaffolding.less
127
129
  - vendor/toolkit/twitter/bootstrap/navs.less