less-rails-bootstrap 2.0.5 → 2.0.6

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 (53) hide show
  1. data/CHANGELOG.md +5 -0
  2. data/lib/less/rails/bootstrap/version.rb +1 -1
  3. data/test/cases/usage_css_spec.rb +19 -19
  4. data/vendor/assets/images/twitter/bootstrap/glyphicons-halflings-white.png +0 -0
  5. data/vendor/assets/images/twitter/bootstrap/glyphicons-halflings.png +0 -0
  6. data/vendor/assets/javascripts/twitter/bootstrap/alert.js +8 -5
  7. data/vendor/assets/javascripts/twitter/bootstrap/button.js +3 -3
  8. data/vendor/assets/javascripts/twitter/bootstrap/carousel.js +5 -2
  9. data/vendor/assets/javascripts/twitter/bootstrap/collapse.js +2 -2
  10. data/vendor/assets/javascripts/twitter/bootstrap/dropdown.js +2 -2
  11. data/vendor/assets/javascripts/twitter/bootstrap/modal.js +6 -5
  12. data/vendor/assets/javascripts/twitter/bootstrap/popover.js +2 -2
  13. data/vendor/assets/javascripts/twitter/bootstrap/scrollspy.js +2 -2
  14. data/vendor/assets/javascripts/twitter/bootstrap/tab.js +2 -2
  15. data/vendor/assets/javascripts/twitter/bootstrap/tooltip.js +2 -2
  16. data/vendor/assets/javascripts/twitter/bootstrap/transition.js +3 -3
  17. data/vendor/assets/javascripts/twitter/bootstrap/typeahead.js +2 -2
  18. data/vendor/frameworks/twitter/bootstrap/accordion.less +0 -0
  19. data/vendor/frameworks/twitter/bootstrap/alerts.less +0 -0
  20. data/vendor/frameworks/twitter/bootstrap/bootstrap.less +1 -1
  21. data/vendor/frameworks/twitter/bootstrap/breadcrumbs.less +1 -1
  22. data/vendor/frameworks/twitter/bootstrap/button-groups.less +3 -2
  23. data/vendor/frameworks/twitter/bootstrap/buttons.less +26 -8
  24. data/vendor/frameworks/twitter/bootstrap/carousel.less +0 -0
  25. data/vendor/frameworks/twitter/bootstrap/close.less +0 -0
  26. data/vendor/frameworks/twitter/bootstrap/code.less +13 -0
  27. data/vendor/frameworks/twitter/bootstrap/component-animations.less +0 -0
  28. data/vendor/frameworks/twitter/bootstrap/dropdowns.less +1 -2
  29. data/vendor/frameworks/twitter/bootstrap/forms.less +49 -42
  30. data/vendor/frameworks/twitter/bootstrap/grid.less +0 -0
  31. data/vendor/frameworks/twitter/bootstrap/hero-unit.less +0 -0
  32. data/vendor/frameworks/twitter/bootstrap/labels.less +23 -7
  33. data/vendor/frameworks/twitter/bootstrap/layouts.less +0 -0
  34. data/vendor/frameworks/twitter/bootstrap/mixins.less +78 -25
  35. data/vendor/frameworks/twitter/bootstrap/modals.less +11 -0
  36. data/vendor/frameworks/twitter/bootstrap/navbar.less +12 -5
  37. data/vendor/frameworks/twitter/bootstrap/navs.less +22 -13
  38. data/vendor/frameworks/twitter/bootstrap/pager.less +0 -0
  39. data/vendor/frameworks/twitter/bootstrap/pagination.less +0 -0
  40. data/vendor/frameworks/twitter/bootstrap/popovers.less +0 -0
  41. data/vendor/frameworks/twitter/bootstrap/progress-bars.less +0 -0
  42. data/vendor/frameworks/twitter/bootstrap/reset.less +1 -1
  43. data/vendor/frameworks/twitter/bootstrap/responsive.less +10 -6
  44. data/vendor/frameworks/twitter/bootstrap/scaffolding.less +0 -0
  45. data/vendor/frameworks/twitter/bootstrap/sprites.less +7 -5
  46. data/vendor/frameworks/twitter/bootstrap/tables.less +14 -3
  47. data/vendor/frameworks/twitter/bootstrap/thumbnails.less +2 -2
  48. data/vendor/frameworks/twitter/bootstrap/tooltip.less +0 -0
  49. data/vendor/frameworks/twitter/bootstrap/type.less +3 -2
  50. data/vendor/frameworks/twitter/bootstrap/utilities.less +0 -0
  51. data/vendor/frameworks/twitter/bootstrap/variables.less +15 -7
  52. data/vendor/frameworks/twitter/bootstrap/wells.less +0 -0
  53. metadata +5 -5
@@ -1,6 +1,7 @@
1
1
  // MODALS
2
2
  // ------
3
3
 
4
+ // Recalculate z-index where appropriate
4
5
  .modal-open {
5
6
  .dropdown-menu { z-index: @zindexDropdown + @zindexModal; }
6
7
  .dropdown.open { *z-index: @zindexDropdown + @zindexModal; }
@@ -8,6 +9,7 @@
8
9
  .tooltip { z-index: @zindexTooltip + @zindexModal; }
9
10
  }
10
11
 
12
+ // Background
11
13
  .modal-backdrop {
12
14
  position: fixed;
13
15
  top: 0;
@@ -25,6 +27,7 @@
25
27
  .opacity(80);
26
28
  }
27
29
 
30
+ // Base modal
28
31
  .modal {
29
32
  position: fixed;
30
33
  top: 50%;
@@ -53,9 +56,17 @@
53
56
  // Close icon
54
57
  .close { margin-top: 2px; }
55
58
  }
59
+
60
+ // Body (where all modal content resises)
56
61
  .modal-body {
57
62
  padding: 15px;
58
63
  }
64
+ // Remove bottom margin if need be
65
+ .modal-body .modal-form {
66
+ margin-bottom: 0;
67
+ }
68
+
69
+ // Footer (for actions)
59
70
  .modal-footer {
60
71
  padding: 14px 15px 15px;
61
72
  margin-bottom: 0;
@@ -81,7 +81,7 @@
81
81
  margin-top: 5px; // make buttons vertically centered in navbar
82
82
  }
83
83
  .btn-group .btn {
84
- margin-top: 0;
84
+ margin-top: 0; // then undo the margin here so we don't accidentally double it
85
85
  }
86
86
  }
87
87
 
@@ -104,6 +104,14 @@
104
104
  input[type="radio"] {
105
105
  margin-top: 3px;
106
106
  }
107
+ .input-append,
108
+ .input-prepend {
109
+ margin-top: 6px;
110
+ white-space: nowrap; // preven two items from separating within a .navbar-form that has .pull-left
111
+ input {
112
+ margin-top: 0; // remove the margin on top since it's on the parent
113
+ }
114
+ }
107
115
  }
108
116
 
109
117
  // Navbar search
@@ -133,7 +141,7 @@
133
141
  background-color: @grayLight;
134
142
  background-color: rgba(255,255,255,.5);
135
143
  }
136
- // Focus states (we use .focused since IE8 and down doesn't support :focus)
144
+ // Focus states (we use .focused since IE7-8 and down doesn't support :focus)
137
145
  &:focus,
138
146
  &.focused {
139
147
  padding: 5px 10px;
@@ -161,7 +169,7 @@
161
169
  .navbar-fixed-top .navbar-inner {
162
170
  padding-left: 0;
163
171
  padding-right: 0;
164
- .border-radius(0px);
172
+ .border-radius(0);
165
173
  }
166
174
 
167
175
 
@@ -194,7 +202,7 @@
194
202
  }
195
203
  // Hover
196
204
  .navbar .nav > li > a:hover {
197
- background-color: transparent;
205
+ background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active
198
206
  color: @navbarLinkColorHover;
199
207
  text-decoration: none;
200
208
  }
@@ -205,7 +213,6 @@
205
213
  color: @navbarLinkColorHover;
206
214
  text-decoration: none;
207
215
  background-color: @navbarBackground;
208
- background-color: rgba(0,0,0,.5);
209
216
  }
210
217
 
211
218
  // Dividers (basically a vertical hr)
@@ -21,6 +21,21 @@
21
21
  background-color: @grayLighter;
22
22
  }
23
23
 
24
+ // Nav headers (for dropdowns and lists)
25
+ .nav .nav-header {
26
+ display: block;
27
+ padding: 3px 15px;
28
+ font-size: 11px;
29
+ font-weight: bold;
30
+ line-height: @baseLineHeight;
31
+ color: @grayLight;
32
+ text-shadow: 0 1px 0 rgba(255,255,255,.5);
33
+ text-transform: uppercase;
34
+ }
35
+ // Space them out when they follow another list item (link)
36
+ .nav li + .nav-header {
37
+ margin-top: 9px;
38
+ }
24
39
 
25
40
 
26
41
  // NAV LIST
@@ -33,21 +48,12 @@
33
48
  }
34
49
  .nav-list > li > a,
35
50
  .nav-list .nav-header {
36
- display: block;
37
- padding: 3px 15px;
38
51
  margin-left: -15px;
39
52
  margin-right: -15px;
40
53
  text-shadow: 0 1px 0 rgba(255,255,255,.5);
41
54
  }
42
- .nav-list .nav-header {
43
- font-size: 11px;
44
- font-weight: bold;
45
- line-height: @baseLineHeight;
46
- color: @grayLight;
47
- text-transform: uppercase;
48
- }
49
- .nav-list > li + .nav-header {
50
- margin-top: 9px;
55
+ .nav-list > li > a {
56
+ padding: 3px 15px;
51
57
  }
52
58
  .nav-list .active > a,
53
59
  .nav-list .active > a:hover {
@@ -55,7 +61,7 @@
55
61
  text-shadow: 0 -1px 0 rgba(0,0,0,.2);
56
62
  background-color: @linkColor;
57
63
  }
58
- .nav-list .icon {
64
+ .nav-list [class^="icon-"] {
59
65
  margin-right: 2px;
60
66
  }
61
67
 
@@ -152,7 +158,7 @@
152
158
  }
153
159
  .nav-tabs.nav-stacked > li > a {
154
160
  border: 1px solid #ddd;
155
- .border-radius(0px);
161
+ .border-radius(0);
156
162
  }
157
163
  .nav-tabs.nav-stacked > li:first-child > a {
158
164
  .border-radius(4px 4px 0 0);
@@ -249,6 +255,9 @@
249
255
  .tabbable {
250
256
  .clearfix();
251
257
  }
258
+ .tab-content {
259
+ overflow: hidden; // prevent content from running below tabs
260
+ }
252
261
 
253
262
  // Remove border on bottom, left, right
254
263
  .tabs-below .nav-tabs,
File without changes
File without changes
File without changes
@@ -108,7 +108,7 @@ input[type="button"],
108
108
  input[type="reset"],
109
109
  input[type="submit"] {
110
110
  cursor: pointer; // Cursors on all buttons applied consistently
111
- -webkit-appearance: button; // Style clicable inputs in iOS
111
+ -webkit-appearance: button; // Style clickable inputs in iOS
112
112
  }
113
113
  input[type="search"] { // Appearance in Safari/Chrome
114
114
  -webkit-appearance: textfield;
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap Responsive v2.0.0
2
+ * Bootstrap Responsive v2.0.1
3
3
  *
4
4
  * Copyright 2012 Twitter, Inc
5
5
  * Licensed under the Apache License v2.0
@@ -56,7 +56,7 @@
56
56
  .uneditable-input {
57
57
  display: block;
58
58
  width: 100%;
59
- height: 28px; /* Make inputs at least the height of their button counterpart */
59
+ min-height: 28px; /* Make inputs at least the height of their button counterpart */
60
60
  /* Makes inputs behave like true block-level elements */
61
61
  -webkit-box-sizing: border-box; /* Older Webkit */
62
62
  -moz-box-sizing: border-box; /* Older FF */
@@ -123,7 +123,7 @@
123
123
  // LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
124
124
  // --------------------------------------------------
125
125
 
126
- @media (max-width: 768px) {
126
+ @media (max-width: 767px) {
127
127
  // GRID & CONTAINERS
128
128
  // -----------------
129
129
  // Remove width from containers
@@ -154,7 +154,7 @@
154
154
  // PORTRAIT TABLET TO DEFAULT DESKTOP
155
155
  // ----------------------------------
156
156
 
157
- @media (min-width: 768px) and (max-width: 980px) {
157
+ @media (min-width: 768px) and (max-width: 979px) {
158
158
 
159
159
  // Fixed grid
160
160
  #gridSystem > .generate(12, 42px, 20px);
@@ -171,7 +171,7 @@
171
171
 
172
172
  // TABLETS AND BELOW
173
173
  // -----------------
174
- @media (max-width: 980px) {
174
+ @media (max-width: 979px) {
175
175
 
176
176
  // UNFIX THE TOPBAR
177
177
  // ----------------
@@ -215,6 +215,10 @@
215
215
  .navbar .nav > .divider-vertical {
216
216
  display: none;
217
217
  }
218
+ .navbar .nav .nav-header {
219
+ color: @navbarText;
220
+ text-shadow: none;
221
+ }
218
222
  // Nav and dropdown links in navbar
219
223
  .navbar .nav > li > a,
220
224
  .navbar .dropdown-menu a {
@@ -242,7 +246,7 @@
242
246
  padding: 0;
243
247
  background-color: transparent;
244
248
  border: none;
245
- .border-radius(0px);
249
+ .border-radius(0);
246
250
  .box-shadow(none);
247
251
  }
248
252
  .navbar .dropdown-menu:before,
File without changes
@@ -9,24 +9,26 @@
9
9
  // All icons receive the styles of the <i> tag with a base class
10
10
  // of .i and are then given a unique class to add width, height,
11
11
  // and background-position. Your resulting HTML will look like
12
- // <i class="i icon-inbox"></i>.
12
+ // <i class="icon-inbox"></i>.
13
13
 
14
14
  // For the white version of the icons, just add the .icon-white class:
15
- // <i class="i icon-inbox icon-white"></i>
15
+ // <i class="icon-inbox icon-white"></i>
16
16
 
17
- [class^="icon-"] {
17
+ [class^="icon-"],
18
+ [class*=" icon-"] {
18
19
  display: inline-block;
19
20
  width: 14px;
20
21
  height: 14px;
22
+ line-height: 14px;
21
23
  vertical-align: text-top;
22
- background-image: asset-url("twitter/bootstrap/glyphicons-halflings.png");
24
+ background-image: @iconSpritePath;
23
25
  background-position: 14px 14px;
24
26
  background-repeat: no-repeat;
25
27
 
26
28
  .ie7-restore-right-whitespace();
27
29
  }
28
30
  .icon-white {
29
- background-image: asset-url("twitter/bootstrap/glyphicons-halflings-white.png");
31
+ background-image: @iconWhiteSpritePath;
30
32
  }
31
33
 
32
34
  .icon-glass { background-position: 0 0; }
@@ -25,14 +25,15 @@ table {
25
25
  padding: 8px;
26
26
  line-height: @baseLineHeight;
27
27
  text-align: left;
28
+ vertical-align: top;
28
29
  border-top: 1px solid #ddd;
29
30
  }
30
31
  th {
31
32
  font-weight: bold;
32
- vertical-align: bottom;
33
33
  }
34
- td {
35
- vertical-align: top;
34
+ // Bottom align for column headings
35
+ thead th {
36
+ vertical-align: bottom;
36
37
  }
37
38
  // Remove top border from thead by default
38
39
  thead:first-child tr th,
@@ -113,6 +114,16 @@ table {
113
114
  }
114
115
 
115
116
 
117
+ // HOVER EFFECT
118
+ // ------------
119
+ // Placed here since it has to come after the potential zebra striping
120
+ .table {
121
+ tbody tr:hover td,
122
+ tbody tr:hover th {
123
+ background-color: #f5f5f5;
124
+ }
125
+ }
126
+
116
127
 
117
128
  // TABLE CELL SIZING
118
129
  // -----------------
@@ -2,13 +2,13 @@
2
2
  // ----------
3
3
 
4
4
  .thumbnails {
5
- margin-left: -20px;
5
+ margin-left: -@gridGutterWidth;
6
6
  list-style: none;
7
7
  .clearfix();
8
8
  }
9
9
  .thumbnails > li {
10
10
  float: left;
11
- margin: 0 0 @baseLineHeight 20px;
11
+ margin: 0 0 @baseLineHeight @gridGutterWidth;
12
12
  }
13
13
  .thumbnail {
14
14
  display: block;
File without changes
@@ -110,7 +110,8 @@ ol {
110
110
  li {
111
111
  line-height: @baseLineHeight;
112
112
  }
113
- ul.unstyled {
113
+ ul.unstyled,
114
+ ol.unstyled {
114
115
  margin-left: 0;
115
116
  list-style: none;
116
117
  }
@@ -137,7 +138,7 @@ dd {
137
138
  hr {
138
139
  margin: @baseLineHeight 0;
139
140
  border: 0;
140
- border-top: 1px solid #e5e5e5;
141
+ border-top: 1px solid @hrBorder;
141
142
  border-bottom: 1px solid @white;
142
143
  }
143
144
 
File without changes
@@ -47,20 +47,28 @@
47
47
  // Z-index master list
48
48
  // Used for a bird's eye view of components dependent on the z-axis
49
49
  // Try to avoid customizing these :)
50
- @zindexDropdown: 1000;
51
- @zindexPopover: 1010;
52
- @zindexTooltip: 1020;
53
- @zindexFixedNavbar: 1030;
54
- @zindexModalBackdrop: 1040;
55
- @zindexModal: 1050;
50
+ @zindexDropdown: 1000;
51
+ @zindexPopover: 1010;
52
+ @zindexTooltip: 1020;
53
+ @zindexFixedNavbar: 1030;
54
+ @zindexModalBackdrop: 1040;
55
+ @zindexModal: 1050;
56
+
57
+ // Sprite icons path
58
+ @iconSpritePath: asset-url("twitter/bootstrap/glyphicons-halflings.png");
59
+ @iconWhiteSpritePath: asset-url("twitter/bootstrap/glyphicons-halflings-white.png");
56
60
 
57
61
  // Input placeholder text color
58
- @placeholderText: @grayLight;
62
+ @placeholderText: @grayLight;
63
+
64
+ // Hr border color
65
+ @hrBorder: @grayLighter;
59
66
 
60
67
  // Navbar
61
68
  @navbarHeight: 40px;
62
69
  @navbarBackground: @grayDarker;
63
70
  @navbarBackgroundHighlight: @grayDark;
71
+ @navbarLinkBackgroundHover: transparent;
64
72
 
65
73
  @navbarText: @grayLight;
66
74
  @navbarLinkColor: @grayLight;
File without changes
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: less-rails-bootstrap
3
3
  version: !ruby/object:Gem::Version
4
- hash: 5
4
+ hash: 3
5
5
  prerelease:
6
6
  segments:
7
7
  - 2
8
8
  - 0
9
- - 5
10
- version: 2.0.5
9
+ - 6
10
+ version: 2.0.6
11
11
  platform: ruby
12
12
  authors:
13
13
  - Ken Collins
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-02-17 00:00:00 Z
18
+ date: 2012-02-20 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  name: less-rails
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
191
191
  requirements: []
192
192
 
193
193
  rubyforge_project:
194
- rubygems_version: 1.8.16
194
+ rubygems_version: 1.8.15
195
195
  signing_key:
196
196
  specification_version: 3
197
197
  summary: CSS toolkit from Twitter For Rails 3.1 Asset Pipeline