twitter-bootstrap-rails 2.0 → 2.0.1.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


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

Files changed (77) hide show
  1. data/README.md +31 -37
  2. data/Rakefile +11 -0
  3. data/lib/generators/bootstrap/install/install_generator.rb +37 -13
  4. data/lib/generators/bootstrap/install/templates/application.css +0 -1
  5. data/lib/generators/bootstrap/install/templates/bootstrap.coffee +6 -15
  6. data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less +13 -0
  7. data/lib/generators/bootstrap/layout/layout_generator.rb +4 -4
  8. data/lib/generators/bootstrap/layout/templates/layout.html.erb +96 -49
  9. data/lib/generators/bootstrap/layout/templates/layout.html.haml +76 -0
  10. data/lib/generators/bootstrap/layout/templates/layout.html.slim +77 -0
  11. data/lib/generators/bootstrap/themed/templates/_form.html.erb +5 -4
  12. data/lib/generators/bootstrap/themed/templates/_form.html.haml +11 -0
  13. data/lib/generators/bootstrap/themed/templates/_form.html.slim +11 -0
  14. data/lib/generators/bootstrap/themed/templates/edit.html.erb +1 -2
  15. data/lib/generators/bootstrap/themed/templates/edit.html.haml +3 -0
  16. data/lib/generators/bootstrap/themed/templates/edit.html.slim +3 -0
  17. data/lib/generators/bootstrap/themed/templates/index.html.erb +27 -28
  18. data/lib/generators/bootstrap/themed/templates/index.html.haml +25 -0
  19. data/lib/generators/bootstrap/themed/templates/index.html.slim +25 -0
  20. data/lib/generators/bootstrap/themed/templates/new.html.haml +2 -0
  21. data/lib/generators/bootstrap/themed/templates/new.html.slim +2 -0
  22. data/lib/generators/bootstrap/themed/templates/show.html.erb +5 -4
  23. data/lib/generators/bootstrap/themed/templates/show.html.haml +9 -0
  24. data/lib/generators/bootstrap/themed/templates/show.html.slim +9 -0
  25. data/lib/generators/bootstrap/themed/themed_generator.rb +13 -13
  26. data/lib/twitter/bootstrap/rails/version.rb +1 -1
  27. data/vendor/assets/images/twitter/bootstrap/glyphicons-halflings-white.png +0 -0
  28. data/vendor/assets/images/twitter/bootstrap/glyphicons-halflings.png +0 -0
  29. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-alert.js +16 -7
  30. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-button.js +3 -3
  31. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-carousel.js +7 -4
  32. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-collapse.js +7 -5
  33. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-dropdown.js +16 -7
  34. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-modal.js +12 -7
  35. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-popover.js +5 -5
  36. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js +4 -3
  37. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-tab.js +11 -6
  38. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-tooltip.js +2 -2
  39. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-transition.js +3 -3
  40. data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-typeahead.js +40 -21
  41. data/vendor/toolkit/twitter/bootstrap/accordion.less +5 -4
  42. data/vendor/toolkit/twitter/bootstrap/alerts.less +1 -0
  43. data/vendor/toolkit/twitter/bootstrap/bootstrap.less +10 -8
  44. data/vendor/toolkit/twitter/bootstrap/breadcrumbs.less +1 -1
  45. data/vendor/toolkit/twitter/bootstrap/button-groups.less +49 -17
  46. data/vendor/toolkit/twitter/bootstrap/buttons.less +156 -89
  47. data/vendor/toolkit/twitter/bootstrap/carousel.less +12 -5
  48. data/vendor/toolkit/twitter/bootstrap/code.less +57 -0
  49. data/vendor/toolkit/twitter/bootstrap/dropdowns.less +24 -4
  50. data/vendor/toolkit/twitter/bootstrap/forms.less +117 -91
  51. data/vendor/toolkit/twitter/bootstrap/grid.less +8 -0
  52. data/vendor/toolkit/twitter/bootstrap/hero-unit.less +20 -0
  53. data/vendor/toolkit/twitter/bootstrap/labels.less +23 -7
  54. data/vendor/toolkit/twitter/bootstrap/layouts.less +17 -0
  55. data/vendor/toolkit/twitter/bootstrap/mixins.less +253 -36
  56. data/vendor/toolkit/twitter/bootstrap/modals.less +20 -2
  57. data/vendor/toolkit/twitter/bootstrap/navbar.less +82 -34
  58. data/vendor/toolkit/twitter/bootstrap/navs.less +87 -72
  59. data/vendor/toolkit/twitter/bootstrap/pager.less +7 -2
  60. data/vendor/toolkit/twitter/bootstrap/pagination.less +1 -0
  61. data/vendor/toolkit/twitter/bootstrap/popovers.less +25 -25
  62. data/vendor/toolkit/twitter/bootstrap/progress-bars.less +14 -18
  63. data/vendor/toolkit/twitter/bootstrap/reset.less +3 -4
  64. data/vendor/toolkit/twitter/bootstrap/responsive.less +224 -165
  65. data/vendor/toolkit/twitter/bootstrap/scaffolding.less +6 -89
  66. data/vendor/toolkit/twitter/bootstrap/sprites.less +139 -99
  67. data/vendor/toolkit/twitter/bootstrap/tables.less +15 -57
  68. data/vendor/toolkit/twitter/bootstrap/thumbnails.less +4 -2
  69. data/vendor/toolkit/twitter/bootstrap/type.less +15 -44
  70. data/vendor/toolkit/twitter/bootstrap/variables.less +38 -21
  71. data/vendor/toolkit/twitter/bootstrap_base.less +2 -0
  72. metadata +36 -21
  73. data/lib/generators/bootstrap/install/templates/bootstrap.less +0 -5
  74. data/vendor/assets/stylesheets/twitter/bootstrap.css.less +0 -1
  75. data/vendor/toolkit/twitter/bootstrap.less +0 -1
  76. data/vendor/toolkit/twitter/bootstrap/patterns.less +0 -30
  77. data/vendor/toolkit/twitter/bootstrap/print.less +0 -18
@@ -13,10 +13,15 @@
13
13
  }
14
14
  .pager a {
15
15
  display: inline-block;
16
- padding: 6px 15px;
17
- background-color: #f5f5f5;
16
+ padding: 5px 14px;
17
+ background-color: #fff;
18
+ border: 1px solid #ddd;
18
19
  .border-radius(15px);
19
20
  }
21
+ .pager a:hover {
22
+ text-decoration: none;
23
+ background-color: #f5f5f5;
24
+ }
20
25
  .pager .next a {
21
26
  float: right;
22
27
  }
@@ -30,6 +30,7 @@
30
30
  }
31
31
  .pagination .active a {
32
32
  color: @grayLight;
33
+ cursor: default;
33
34
  }
34
35
  .pagination .disabled a,
35
36
  .pagination .disabled a:hover {
@@ -21,29 +21,29 @@
21
21
  width: 0;
22
22
  height: 0;
23
23
  }
24
- .inner {
25
- padding: 3px;
26
- width: 280px;
27
- overflow: hidden;
28
- background: @black; // has to be full background declaration for IE fallback
29
- background: rgba(0,0,0,.8);
30
- .border-radius(6px);
31
- .box-shadow(0 3px 7px rgba(0,0,0,0.3));
24
+ }
25
+ .popover-inner {
26
+ padding: 3px;
27
+ width: 280px;
28
+ overflow: hidden;
29
+ background: @black; // has to be full background declaration for IE fallback
30
+ background: rgba(0,0,0,.8);
31
+ .border-radius(6px);
32
+ .box-shadow(0 3px 7px rgba(0,0,0,0.3));
33
+ }
34
+ .popover-title {
35
+ padding: 9px 15px;
36
+ line-height: 1;
37
+ background-color: #f5f5f5;
38
+ border-bottom:1px solid #eee;
39
+ .border-radius(3px 3px 0 0);
40
+ }
41
+ .popover-content {
42
+ padding: 14px;
43
+ background-color: @white;
44
+ .border-radius(0 0 3px 3px);
45
+ .background-clip(padding-box);
46
+ p, ul, ol {
47
+ margin-bottom: 0;
32
48
  }
33
- .title {
34
- padding: 9px 15px;
35
- line-height: 1;
36
- background-color: #f5f5f5;
37
- border-bottom:1px solid #eee;
38
- .border-radius(3px 3px 0 0);
39
- }
40
- .content {
41
- padding: 14px;
42
- background-color: @white;
43
- .border-radius(0 0 3px 3px);
44
- .background-clip(padding-box);
45
- p, ul, ol {
46
- margin-bottom: 0;
47
- }
48
- }
49
- }
49
+ }
@@ -11,11 +11,11 @@
11
11
  to { background-position: 40px 0; }
12
12
  }
13
13
 
14
- // Temporarily commented out since LESS won't compile with this
15
- // @-moz-keyframes progress-bar-stripes {
16
- // from { background-position: 0 0; }
17
- // to { background-position: 40px 0; }
18
- // }
14
+ // Firefox
15
+ @-moz-keyframes progress-bar-stripes {
16
+ from { background-position: 0 0; }
17
+ to { background-position: 40px 0; }
18
+ }
19
19
 
20
20
  // Spec
21
21
  @keyframes progress-bar-stripes {
@@ -28,18 +28,14 @@
28
28
  // THE BARS
29
29
  // --------
30
30
 
31
- // Common styles
32
- .progress,
33
- .progress .bar {
34
- .border-radius(4px);
35
- }
36
-
37
31
  // Outer container
38
32
  .progress {
33
+ overflow: hidden;
39
34
  height: 18px;
40
35
  margin-bottom: 18px;
41
36
  #gradient > .vertical(#f5f5f5, #f9f9f9);
42
37
  .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
38
+ .border-radius(4px);
43
39
  }
44
40
 
45
41
  // Bar of progress
@@ -57,7 +53,7 @@
57
53
  }
58
54
 
59
55
  // Striped bars
60
- .progress.striped .bar {
56
+ .progress-striped .bar {
61
57
  #gradient > .striped(#62c462);
62
58
  .background-size(40px 40px);
63
59
  }
@@ -75,25 +71,25 @@
75
71
  // ------
76
72
 
77
73
  // Danger (red)
78
- .progress.danger .bar {
74
+ .progress-danger .bar {
79
75
  #gradient > .vertical(#ee5f5b, #c43c35);
80
76
  }
81
- .progress.danger.striped .bar {
77
+ .progress-danger.progress-striped .bar {
82
78
  #gradient > .striped(#ee5f5b);
83
79
  }
84
80
 
85
81
  // Success (green)
86
- .progress.success .bar {
82
+ .progress-success .bar {
87
83
  #gradient > .vertical(#62c462, #57a957);
88
84
  }
89
- .progress.success.striped .bar {
85
+ .progress-success.progress-striped .bar {
90
86
  #gradient > .striped(#62c462);
91
87
  }
92
88
 
93
89
  // Info (teal)
94
- .progress.info .bar {
90
+ .progress-info .bar {
95
91
  #gradient > .vertical(#5bc0de, #339bb9);
96
92
  }
97
- .progress.info.striped .bar {
93
+ .progress-info.progress-striped .bar {
98
94
  #gradient > .striped(#5bc0de);
99
95
  }
@@ -46,7 +46,7 @@ html {
46
46
  }
47
47
  // Focus states
48
48
  a:focus {
49
- outline: thin dotted;
49
+ .tab-focus();
50
50
  }
51
51
  // Hover & Active
52
52
  a:hover,
@@ -91,8 +91,7 @@ select,
91
91
  textarea {
92
92
  margin: 0;
93
93
  font-size: 100%;
94
- vertical-align: baseline;
95
- *vertical-align: middle;
94
+ vertical-align: middle;
96
95
  }
97
96
  button,
98
97
  input {
@@ -109,7 +108,7 @@ input[type="button"],
109
108
  input[type="reset"],
110
109
  input[type="submit"] {
111
110
  cursor: pointer; // Cursors on all buttons applied consistently
112
- -webkit-appearance: button; // Style clicable inputs in iOS
111
+ -webkit-appearance: button; // Style clickable inputs in iOS
113
112
  }
114
113
  input[type="search"] { // Appearance in Safari/Chrome
115
114
  -webkit-appearance: textfield;
@@ -1,3 +1,13 @@
1
+ /*!
2
+ * Bootstrap Responsive v2.0.1
3
+ *
4
+ * Copyright 2012 Twitter, Inc
5
+ * Licensed under the Apache License v2.0
6
+ * http://www.apache.org/licenses/LICENSE-2.0
7
+ *
8
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
9
+ */
10
+
1
11
  // Responsive.less
2
12
  // For phone and tablet devices
3
13
  // -------------------------------------------------------------
@@ -15,72 +25,54 @@
15
25
  // ------------------
16
26
 
17
27
  // Hide from screenreaders and browsers
18
- // Credit: HTML5BP
28
+ // Credit: HTML5 Boilerplate
19
29
  .hidden {
20
30
  display: none;
21
31
  visibility: hidden;
22
32
  }
23
33
 
24
34
 
35
+
25
36
  // UP TO LANDSCAPE PHONE
26
37
  // ---------------------
27
38
 
28
39
  @media (max-width: 480px) {
29
40
 
30
- // Make the nav work for small devices
31
- .navbar {
32
- .nav {
33
- position: absolute;
34
- top: 0;
35
- left: 0;
36
- width: 180px;
37
- padding-top: 40px;
38
- list-style: none;
39
- }
40
- .nav,
41
- .nav > li:last-child a {
42
- .border-radius(0 0 4px 0);
43
- }
44
- .nav > li {
45
- float: none;
46
- display: none;
47
- }
48
- .nav > li > a {
49
- float: none;
50
- background-color: #222;
51
- }
52
- .nav > .active {
53
- display: block;
54
- position: absolute;
55
- top: 0;
56
- left: 0;
57
- }
58
- .nav > .active > a {
59
- background-color: transparent;
60
- }
61
- .nav > .active > a:hover {
62
- background-color: #333;
63
- }
64
- .nav > .active > a:after {
65
- display: inline-block;
66
- width: 0;
67
- height: 0;
68
- margin-top: 8px;
69
- margin-left: 6px;
70
- text-indent: -99999px;
71
- vertical-align: top;
72
- border-left: 4px solid transparent;
73
- border-right: 4px solid transparent;
74
- border-top: 4px solid @white;
75
- .opacity(100);
76
- content: "↓";
77
- }
78
- .nav:hover > li {
79
- display: block;
80
- }
81
- .nav:hover > li > a:hover {
82
- background-color: #333;
83
- }
41
+ // Smooth out the collapsing/expanding nav
42
+ .nav-collapse {
43
+ -webkit-transform: translate3d(0, 0, 0); // activate the GPU
44
+ }
45
+
46
+ // Block level the page header small tag for readability
47
+ .page-header h1 small {
48
+ display: block;
49
+ line-height: @baseLineHeight;
50
+ }
51
+
52
+ // Make span* classes full width
53
+ input[class*="span"],
54
+ select[class*="span"],
55
+ textarea[class*="span"],
56
+ .uneditable-input {
57
+ display: block;
58
+ width: 100%;
59
+ min-height: 28px; /* Make inputs at least the height of their button counterpart */
60
+ /* Makes inputs behave like true block-level elements */
61
+ -webkit-box-sizing: border-box; /* Older Webkit */
62
+ -moz-box-sizing: border-box; /* Older FF */
63
+ -ms-box-sizing: border-box; /* IE8 */
64
+ box-sizing: border-box; /* CSS3 spec*/
65
+ }
66
+ // But don't let it screw up prepend/append inputs
67
+ .input-prepend input[class*="span"],
68
+ .input-append input[class*="span"] {
69
+ width: auto;
70
+ }
71
+
72
+ // Update checkboxes for iOS
73
+ input[type="checkbox"],
74
+ input[type="radio"] {
75
+ border: 1px solid #ccc;
84
76
  }
85
77
 
86
78
  // Remove the horizontal form styles
@@ -100,169 +92,236 @@
100
92
  }
101
93
  // Move over buttons in .form-actions to align with .controls
102
94
  .form-horizontal .form-actions {
103
- padding-left: 0;
95
+ padding-left: 10px;
96
+ padding-right: 10px;
104
97
  }
105
98
 
106
99
  // Modals
107
100
  .modal {
108
101
  position: absolute;
109
- top: 20px;
110
- left: 20px;
111
- right: 20px;
102
+ top: 10px;
103
+ left: 10px;
104
+ right: 10px;
112
105
  width: auto;
113
106
  margin: 0;
114
107
  &.fade.in { top: auto; }
115
108
  }
116
109
  .modal-header .close {
117
110
  padding: 10px;
111
+ margin: -10px;
112
+ }
113
+
114
+ // Carousel
115
+ .carousel-caption {
116
+ position: static;
118
117
  }
119
118
 
120
119
  }
121
120
 
122
121
 
122
+
123
123
  // LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
124
124
  // --------------------------------------------------
125
125
 
126
- @media (max-width: 768px) {
127
-
128
- // Unfix the navbar
129
- .navbar-fixed {
130
- position: absolute;
131
- }
132
- .navbar-fixed .nav {
133
- float: none;
134
- }
135
-
126
+ @media (max-width: 767px) {
127
+ // GRID & CONTAINERS
128
+ // -----------------
136
129
  // Remove width from containers
137
130
  .container {
138
131
  width: auto;
139
132
  padding: 0 20px;
140
133
  }
134
+ // Fluid rows
135
+ .row-fluid {
136
+ width: 100%;
137
+ }
141
138
  // Undo negative margin on rows
142
139
  .row {
143
140
  margin-left: 0;
144
141
  }
145
142
  // Make all columns even
146
- .row > [class*="span"] {
143
+ .row > [class*="span"],
144
+ .row-fluid > [class*="span"] {
147
145
  float: none;
148
146
  display: block;
149
147
  width: auto;
150
148
  margin: 0;
151
149
  }
152
-
153
150
  }
154
151
 
155
152
 
153
+
156
154
  // PORTRAIT TABLET TO DEFAULT DESKTOP
157
155
  // ----------------------------------
158
156
 
159
- @media (min-width: 768px) and (max-width: 940px) {
157
+ @media (min-width: 768px) and (max-width: 979px) {
158
+
159
+ // Fixed grid
160
+ #gridSystem > .generate(12, 42px, 20px);
161
+
162
+ // Fluid grid
163
+ #fluidGridSystem > .generate(12, 5.801104972%, 2.762430939%);
164
+
165
+ // Input grid
166
+ #inputGridSystem > .generate(12, 42px, 20px);
167
+
168
+ }
169
+
160
170
 
161
- // Reset grid variables
162
- @gridColumns: 16;
163
- @gridColumnWidth: 44px;
164
- @gridGutterWidth: 20px;
165
- @siteWidth: 748px;
166
171
 
167
- // Bring grid mixins to recalculate widths
168
- .columns(@columns: 1) {
169
- width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
172
+ // TABLETS AND BELOW
173
+ // -----------------
174
+ @media (max-width: 979px) {
175
+
176
+ // UNFIX THE TOPBAR
177
+ // ----------------
178
+ // Remove any padding from the body
179
+ body {
180
+ padding-top: 0;
170
181
  }
171
- .offset(@columns: 1) {
172
- margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
182
+ // Unfix the navbar
183
+ .navbar-fixed-top {
184
+ position: static;
185
+ margin-bottom: @baseLineHeight;
186
+ }
187
+ .navbar-fixed-top .navbar-inner {
188
+ padding: 5px;
189
+ }
190
+ .navbar .container {
191
+ width: auto;
192
+ padding: 0;
193
+ }
194
+ // Account for brand name
195
+ .navbar .brand {
196
+ padding-left: 10px;
197
+ padding-right: 10px;
198
+ margin: 0 0 0 -5px;
199
+ }
200
+ // Nav collapse clears brand
201
+ .navbar .nav-collapse {
202
+ clear: left;
203
+ }
204
+ // Block-level the nav
205
+ .navbar .nav {
206
+ float: none;
207
+ margin: 0 0 (@baseLineHeight / 2);
208
+ }
209
+ .navbar .nav > li {
210
+ float: none;
211
+ }
212
+ .navbar .nav > li > a {
213
+ margin-bottom: 2px;
214
+ }
215
+ .navbar .nav > .divider-vertical {
216
+ display: none;
217
+ }
218
+ .navbar .nav .nav-header {
219
+ color: @navbarText;
220
+ text-shadow: none;
221
+ }
222
+ // Nav and dropdown links in navbar
223
+ .navbar .nav > li > a,
224
+ .navbar .dropdown-menu a {
225
+ padding: 6px 15px;
226
+ font-weight: bold;
227
+ color: @navbarLinkColor;
228
+ .border-radius(3px);
229
+ }
230
+ .navbar .dropdown-menu li + li a {
231
+ margin-bottom: 2px;
232
+ }
233
+ .navbar .nav > li > a:hover,
234
+ .navbar .dropdown-menu a:hover {
235
+ background-color: @navbarBackground;
236
+ }
237
+ // Dropdowns in the navbar
238
+ .navbar .dropdown-menu {
239
+ position: static;
240
+ top: auto;
241
+ left: auto;
242
+ float: none;
243
+ display: block;
244
+ max-width: none;
245
+ margin: 0 15px;
246
+ padding: 0;
247
+ background-color: transparent;
248
+ border: none;
249
+ .border-radius(0);
250
+ .box-shadow(none);
251
+ }
252
+ .navbar .dropdown-menu:before,
253
+ .navbar .dropdown-menu:after {
254
+ display: none;
255
+ }
256
+ .navbar .dropdown-menu .divider {
257
+ display: none;
258
+ }
259
+ // Forms in navbar
260
+ .navbar-form,
261
+ .navbar-search {
262
+ float: none;
263
+ padding: (@baseLineHeight / 2) 15px;
264
+ margin: (@baseLineHeight / 2) 0;
265
+ border-top: 1px solid @navbarBackground;
266
+ border-bottom: 1px solid @navbarBackground;
267
+ @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
268
+ .box-shadow(@shadow);
269
+ }
270
+ // Pull right (secondary) nav content
271
+ .navbar .nav.pull-right {
272
+ float: none;
273
+ margin-left: 0;
274
+ }
275
+ // Static navbar
276
+ .navbar-static .navbar-inner {
277
+ padding-left: 10px;
278
+ padding-right: 10px;
279
+ }
280
+ // Navbar button
281
+ .btn-navbar {
282
+ display: block;
173
283
  }
174
284
 
175
- // 16cols at 30px wide with 16px gutters
176
- .container {
177
- width: @siteWidth;
178
- }
179
-
180
- // Default columns
181
- .span1 { .columns(1); }
182
- .span2 { .columns(2); }
183
- .span3 { .columns(3); }
184
- .span4 { .columns(4); }
185
- .span5 { .columns(5); }
186
- .span6 { .columns(6); }
187
- .span7 { .columns(7); }
188
- .span8 { .columns(8); }
189
- .span9 { .columns(9); }
190
- .span10 { .columns(10); }
191
- .span11 { .columns(11); }
192
- .span12 { .columns(12); }
193
-
194
- // Offset column options
195
- .offset1 { .offset(1); }
196
- .offset2 { .offset(2); }
197
- .offset3 { .offset(3); }
198
- .offset4 { .offset(4); }
199
- .offset5 { .offset(5); }
200
- .offset6 { .offset(6); }
201
- .offset7 { .offset(7); }
202
- .offset8 { .offset(8); }
203
- .offset9 { .offset(9); }
204
- .offset10 { .offset(10); }
205
- .offset11 { .offset(11); }
206
- .offset12 { .offset(12); }
285
+ // Hide everything in the navbar save .brand and toggle button */
286
+ .nav-collapse {
287
+ overflow: hidden;
288
+ height: 0;
289
+ }
290
+ }
291
+
292
+
207
293
 
294
+ // DEFAULT DESKTOP
295
+ // ---------------
296
+
297
+ @media (min-width: 980px) {
298
+ .nav-collapse.collapse {
299
+ height: auto !important;
300
+ }
208
301
  }
209
302
 
303
+
304
+
210
305
  // LARGE DESKTOP & UP
211
306
  // ------------------
212
- /*
213
- @media (min-width: 1210px) {
214
307
 
215
- // Reset grid variables
216
- @gridColumns: 12;
217
- @gridColumnWidth: 70px;
218
- @gridGutterWidth: 30px;
219
- @siteWidth: 1170px;
308
+ @media (min-width: 1200px) {
220
309
 
221
- // Bring grid mixins to recalculate widths
222
- .columns(@columns: 1) {
223
- width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
224
- }
225
- .offset(@columns: 1) {
226
- margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
227
- }
310
+ // Fixed grid
311
+ #gridSystem > .generate(12, 70px, 30px);
228
312
 
229
- .container {
230
- width: @siteWidth;
313
+ // Fluid grid
314
+ #fluidGridSystem > .generate(12, 5.982905983%, 2.564102564%);
315
+
316
+ // Input grid
317
+ #inputGridSystem > .generate(12, 70px, 30px);
318
+
319
+ // Thumbnails
320
+ .thumbnails {
321
+ margin-left: -30px;
322
+ }
323
+ .thumbnails > li {
324
+ margin-left: 30px;
231
325
  }
232
- .row {
233
- margin-left: @gridGutterWidth * -1;
234
- }
235
- [class*="span"] {
236
- margin-left: @gridGutterWidth;
237
- }
238
-
239
- // Default columns
240
- .span1 { .columns(1); }
241
- .span2 { .columns(2); }
242
- .span3 { .columns(3); }
243
- .span4 { .columns(4); }
244
- .span5 { .columns(5); }
245
- .span6 { .columns(6); }
246
- .span7 { .columns(7); }
247
- .span8 { .columns(8); }
248
- .span9 { .columns(9); }
249
- .span10 { .columns(10); }
250
- .span11 { .columns(11); }
251
- .span12 { .columns(12); }
252
-
253
- // Offset column options
254
- .offset1 { .offset(1); }
255
- .offset2 { .offset(2); }
256
- .offset3 { .offset(3); }
257
- .offset4 { .offset(4); }
258
- .offset5 { .offset(5); }
259
- .offset6 { .offset(6); }
260
- .offset7 { .offset(7); }
261
- .offset8 { .offset(8); }
262
- .offset9 { .offset(9); }
263
- .offset10 { .offset(10); }
264
- .offset11 { .offset(11); }
265
- .offset12 { .offset(12); }
266
326
 
267
327
  }
268
- */