anjlab-bootstrap-rails 2.0.2.1 → 2.0.3.rc

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 (47) hide show
  1. data/Rakefile +36 -25
  2. data/lib/bootstrap-rails/version.rb +1 -1
  3. data/vendor/assets/images/glyphicons-halflings-white.png +0 -0
  4. data/vendor/assets/images/glyphicons-halflings.png +0 -0
  5. data/vendor/assets/javascripts/bootstrap-alert.js +28 -32
  6. data/vendor/assets/javascripts/bootstrap-button.js +29 -33
  7. data/vendor/assets/javascripts/bootstrap-carousel.js +27 -19
  8. data/vendor/assets/javascripts/bootstrap-collapse.js +44 -25
  9. data/vendor/assets/javascripts/bootstrap-dropdown.js +18 -10
  10. data/vendor/assets/javascripts/bootstrap-modal.js +25 -17
  11. data/vendor/assets/javascripts/bootstrap-popover.js +13 -10
  12. data/vendor/assets/javascripts/bootstrap-scrollspy.js +43 -17
  13. data/vendor/assets/javascripts/bootstrap-tab.js +12 -7
  14. data/vendor/assets/javascripts/bootstrap-tooltip.js +40 -35
  15. data/vendor/assets/javascripts/bootstrap-transition.js +30 -20
  16. data/vendor/assets/javascripts/bootstrap-typeahead.js +25 -11
  17. data/vendor/assets/stylesheets/accordion.scss +5 -0
  18. data/vendor/assets/stylesheets/bootstrap.scss +2 -3
  19. data/vendor/assets/stylesheets/button-groups.scss +55 -36
  20. data/vendor/assets/stylesheets/buttons.scss +15 -11
  21. data/vendor/assets/stylesheets/close.scss +12 -1
  22. data/vendor/assets/stylesheets/code.scss +4 -4
  23. data/vendor/assets/stylesheets/component-animations.scss +5 -5
  24. data/vendor/assets/stylesheets/dropdowns.scss +15 -20
  25. data/vendor/assets/stylesheets/forms.scss +58 -30
  26. data/vendor/assets/stylesheets/labels-badges.scss +54 -0
  27. data/vendor/assets/stylesheets/layouts.scss +1 -1
  28. data/vendor/assets/stylesheets/mixins.scss +58 -46
  29. data/vendor/assets/stylesheets/modals.scss +1 -1
  30. data/vendor/assets/stylesheets/navbar.scss +64 -41
  31. data/vendor/assets/stylesheets/navs.scss +36 -36
  32. data/vendor/assets/stylesheets/progress-bars.scss +14 -6
  33. data/vendor/assets/stylesheets/reset.scss +3 -3
  34. data/vendor/assets/stylesheets/responsive-1200px-min.scss +26 -0
  35. data/vendor/assets/stylesheets/responsive-767px-max.scss +149 -0
  36. data/vendor/assets/stylesheets/responsive-768px-979px.scss +17 -0
  37. data/vendor/assets/stylesheets/responsive-navbar.scss +146 -0
  38. data/vendor/assets/stylesheets/responsive-utilities.scss +41 -0
  39. data/vendor/assets/stylesheets/responsive.scss +14 -337
  40. data/vendor/assets/stylesheets/sprites.scss +37 -5
  41. data/vendor/assets/stylesheets/tables.scss +22 -5
  42. data/vendor/assets/stylesheets/thumbnails.scss +14 -2
  43. data/vendor/assets/stylesheets/type.scss +7 -6
  44. data/vendor/assets/stylesheets/variables.scss +10 -6
  45. metadata +43 -16
  46. data/vendor/assets/stylesheets/badges.scss +0 -36
  47. data/vendor/assets/stylesheets/labels.scss +0 -38
@@ -19,13 +19,12 @@
19
19
  display: inline-block;
20
20
  width: 14px;
21
21
  height: 14px;
22
+ @include ie7-restore-right-whitespace();
22
23
  line-height: 14px;
23
24
  vertical-align: text-top;
24
25
  background-image: url($iconSpritePath);
25
26
  background-position: 14px 14px;
26
27
  background-repeat: no-repeat;
27
-
28
- @include ie7-restore-right-whitespace();
29
28
  }
30
29
  .icon-white {
31
30
  background-image: url($iconWhiteSpritePath);
@@ -149,10 +148,43 @@
149
148
  .icon-comment { background-position: -240px -120px; }
150
149
  .icon-magnet { background-position: -264px -120px; }
151
150
  .icon-chevron-up { background-position: -288px -120px; }
152
- .icon-chevron-down { background-position: -313px -119px; } // 1px off
151
+ .icon-chevron-down { background-position: -313px -119px; } // 1px, 1px off
153
152
  .icon-retweet { background-position: -336px -120px; }
154
153
  .icon-shopping-cart { background-position: -360px -120px; }
155
154
  .icon-folder-close { background-position: -384px -120px; }
156
155
  .icon-folder-open { background-position: -408px -120px; }
157
- .icon-resize-vertical { background-position: -432px -119px; }
158
- .icon-resize-horizontal { background-position: -456px -118px; }
156
+ .icon-resize-vertical { background-position: -432px -119px; } // 1px, 1px off
157
+ .icon-resize-horizontal { background-position: -456px -118px; } // 1px, 2px off
158
+
159
+ .icon-hdd { background-position: 0 -144px; }
160
+ .icon-bullhorn { background-position: -24px -144px; }
161
+ .icon-bell { background-position: -48px -144px; }
162
+ .icon-certificate { background-position: -72px -144px; }
163
+ .icon-thumbs-up { background-position: -96px -144px; }
164
+ .icon-thumbs-down { background-position: -120px -144px; }
165
+ .icon-hand-right { background-position: -144px -144px; }
166
+ .icon-hand-left { background-position: -168px -144px; }
167
+ .icon-hand-up { background-position: -192px -144px; }
168
+ .icon-hand-down { background-position: -216px -144px; }
169
+ .icon-circle-arrow-right { background-position: -240px -144px; }
170
+ .icon-circle-arrow-left { background-position: -264px -144px; }
171
+ .icon-circle-arrow-up { background-position: -288px -144px; }
172
+ .icon-circle-arrow-down { background-position: -312px -144px; }
173
+ .icon-globe { background-position: -336px -144px; }
174
+ .icon-wrench { background-position: -360px -144px; }
175
+ .icon-tasks { background-position: -384px -144px; }
176
+ .icon-filter { background-position: -408px -144px; }
177
+ .icon-briefcase { background-position: -432px -144px; }
178
+ .icon-fullscreen { background-position: -456px -144px; }
179
+
180
+
181
+
182
+
183
+
184
+
185
+
186
+
187
+
188
+
189
+
190
+
@@ -9,9 +9,9 @@
9
9
 
10
10
  table {
11
11
  max-width: 100%;
12
+ background-color: $tableBackground;
12
13
  border-collapse: collapse;
13
14
  border-spacing: 0;
14
- background-color: $tableBackground;
15
15
  }
16
16
 
17
17
  // BASELINE STYLES
@@ -37,6 +37,8 @@ table {
37
37
  vertical-align: bottom;
38
38
  }
39
39
  // Remove top border from thead by default
40
+ caption + thead tr:first-child th,
41
+ caption + thead tr:first-child td,
40
42
  colgroup + thead tr:first-child th,
41
43
  colgroup + thead tr:first-child td,
42
44
  thead:first-child tr:first-child th,
@@ -67,15 +69,21 @@ table {
67
69
 
68
70
  .table-bordered {
69
71
  border: 1px solid $tableBorder;
70
- border-left: 0;
71
72
  border-collapse: separate; // Done so we can round those corners!
72
73
  *border-collapse: collapsed; // IE7 can't round corners anyway
74
+ border-left: 0;
73
75
  @include border-radius(4px);
74
76
  th,
75
77
  td {
76
78
  border-left: 1px solid $tableBorder;
77
79
  }
78
80
  // Prevent a double border
81
+ caption + thead tr:first-child th,
82
+ caption + tbody tr:first-child th,
83
+ caption + tbody tr:first-child td,
84
+ colgroup + thead tr:first-child th,
85
+ colgroup + tbody tr:first-child th,
86
+ colgroup + tbody tr:first-child td,
79
87
  thead:first-child tr:first-child th,
80
88
  tbody:first-child tr:first-child th,
81
89
  tbody:first-child tr:first-child td {
@@ -84,20 +92,29 @@ table {
84
92
  // For first th or td in the first row in the first thead or tbody
85
93
  thead:first-child tr:first-child th:first-child,
86
94
  tbody:first-child tr:first-child td:first-child {
87
- @include border-radius(4px 0 0 0);
95
+ -webkit-border-top-left-radius: 4px;
96
+ border-top-left-radius: 4px;
97
+ -moz-border-radius-topleft: 4px;
88
98
  }
89
99
  thead:first-child tr:first-child th:last-child,
90
100
  tbody:first-child tr:first-child td:last-child {
91
- @include border-radius(0 4px 0 0);
101
+ -webkit-border-top-right-radius: 4px;
102
+ border-top-right-radius: 4px;
103
+ -moz-border-radius-topright: 4px;
92
104
  }
93
105
  // For first th or td in the first row in the first thead or tbody
94
106
  thead:last-child tr:last-child th:first-child,
95
107
  tbody:last-child tr:last-child td:first-child {
96
108
  @include border-radius(0 0 0 4px);
109
+ -webkit-border-bottom-left-radius: 4px;
110
+ border-bottom-left-radius: 4px;
111
+ -moz-border-radius-bottomleft: 4px;
97
112
  }
98
113
  thead:last-child tr:last-child th:last-child,
99
114
  tbody:last-child tr:last-child td:last-child {
100
- @include border-radius(0 0 4px 0);
115
+ -webkit-border-bottom-right-radius: 4px;
116
+ border-bottom-right-radius: 4px;
117
+ -moz-border-radius-bottomright: 4px;
101
118
  }
102
119
  }
103
120
 
@@ -1,15 +1,26 @@
1
1
  // THUMBNAILS
2
2
  // ----------
3
+ // Note: `.thumbnails` and `.thumbnails > li` are overriden in responsive files
3
4
 
5
+ // Make wrapper ul behave like the grid
4
6
  .thumbnails {
5
7
  margin-left: -$gridGutterWidth;
6
8
  list-style: none;
7
9
  @include clearfix();
8
10
  }
11
+ // Fluid rows have no left margin
12
+ .row-fluid .thumbnails {
13
+ margin-left: 0;
14
+ }
15
+
16
+ // Float li to make thumbnails appear in a row
9
17
  .thumbnails > li {
10
- float: left;
11
- margin: 0 0 $baseLineHeight $gridGutterWidth;
18
+ float: left; // Explicity set the float since we don't require .span* classes
19
+ margin-bottom: $baseLineHeight;
20
+ margin-left: $gridGutterWidth;
12
21
  }
22
+
23
+ // The actual thumbnail (can be `a` or `div`)
13
24
  .thumbnail {
14
25
  display: block;
15
26
  padding: 4px;
@@ -23,6 +34,7 @@ a.thumbnail:hover {
23
34
  border-color: $linkColor;
24
35
  @include box-shadow(0 1px 4px rgba(0,105,214,.25));
25
36
  }
37
+
26
38
  // Images and captions
27
39
  .thumbnail > img {
28
40
  display: block;
@@ -52,8 +52,8 @@ h2 {
52
52
  }
53
53
  }
54
54
  h3 {
55
- line-height: $baseLineHeight * 1.5;
56
55
  font-size: 18px;
56
+ line-height: $baseLineHeight * 1.5;
57
57
  small {
58
58
  font-size: 14px;
59
59
  }
@@ -136,9 +136,10 @@ dd {
136
136
  .dl-horizontal {
137
137
  dt {
138
138
  float: left;
139
- clear: left;
140
139
  width: 120px;
140
+ clear: left;
141
141
  text-align: right;
142
+ @include text-overflow();
142
143
  }
143
144
  dd {
144
145
  margin-left: 130px;
@@ -169,8 +170,8 @@ em {
169
170
 
170
171
  // Abbreviations and acronyms
171
172
  abbr[title] {
172
- border-bottom: 1px dotted #ddd;
173
173
  cursor: help;
174
+ border-bottom: 1px dotted #ddd;
174
175
  }
175
176
  abbr.initialism {
176
177
  font-size: 90%;
@@ -198,10 +199,10 @@ blockquote {
198
199
  // Float right with text-align: right
199
200
  &.pull-right {
200
201
  float: right;
201
- padding-left: 0;
202
202
  padding-right: 15px;
203
- border-left: 0;
203
+ padding-left: 0;
204
204
  border-right: 5px solid $grayLighter;
205
+ border-left: 0;
205
206
  p,
206
207
  small {
207
208
  text-align: right;
@@ -221,8 +222,8 @@ blockquote:after {
221
222
  address {
222
223
  display: block;
223
224
  margin-bottom: $baseLineHeight;
224
- line-height: $baseLineHeight;
225
225
  font-style: normal;
226
+ line-height: $baseLineHeight;
226
227
  }
227
228
 
228
229
  // Misc
@@ -45,10 +45,14 @@ $linkColorHover: darken($linkColor, 15%) !default;
45
45
 
46
46
  // Typography
47
47
  // -------------------------
48
+ $sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
49
+ $serifFontFamily: Georgia, "Times New Roman", Times, serif !default;
50
+ $monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace !default;
51
+
48
52
  $baseFontSize: 13px !default;
49
- $baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
53
+ $baseFontFamily: $sansFontFamily !default;
50
54
  $baseLineHeight: 18px !default;
51
- $altFontFamily: Georgia, "Times New Roman", Times, serif !default;
55
+ $altFontFamily: $serifFontFamily !default;
52
56
 
53
57
  $headingsFontFamily: inherit !default; // empty to use BS default, $baseFontFamily
54
58
  $headingsFontWeight: bold !default; // instead of browser default, bold
@@ -67,7 +71,7 @@ $tableBorder: #ddd !default; // table and cell border
67
71
  // -------------------------
68
72
  $btnBackground: $white !default;
69
73
  $btnBackgroundHighlight: darken($white, 10%) !default;
70
- $btnBorder: darken($white, 20%) !default;
74
+ $btnBorder: #ccc !default;
71
75
 
72
76
  $btnPrimaryBackground: $linkColor !default;
73
77
  $btnPrimaryBackgroundHighlight: adjust-hue($btnPrimaryBackground, 15%) !default;
@@ -92,8 +96,9 @@ $btnInverseBackgroundHighlight: $grayDarker !default;
92
96
  // -------------------------
93
97
  $inputBackground: $white !default;
94
98
  $inputBorder: #ccc !default;
99
+ $inputBorderRadius: 3px !default;
95
100
  $inputDisabledBackground: $grayLighter !default;
96
-
101
+ $formActionsBackground: #f5f5f5 !default;
97
102
 
98
103
  // Dropdowns
99
104
  // -------------------------
@@ -147,6 +152,7 @@ $navbarSearchBackground: lighten($navbarBackground, 25%) !default;
147
152
  $navbarSearchBackgroundFocus: $white !default;
148
153
  $navbarSearchBorder: darken($navbarSearchBackground, 30%) !default;
149
154
  $navbarSearchPlaceholderColor: #ccc !default;
155
+ $navbarBrandColor: $navbarLinkColor !default;
150
156
 
151
157
 
152
158
  // Hero unit
@@ -176,7 +182,6 @@ $infoBorder: darken(adjust-hue($infoBackground, -10), 7%) !default;
176
182
 
177
183
 
178
184
 
179
-
180
185
  // GRID
181
186
  // --------------------------------------------------
182
187
 
@@ -187,7 +192,6 @@ $gridColumnWidth: 60px !default;
187
192
  $gridGutterWidth: 20px !default;
188
193
  $gridRowWidth: ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1)) !default;
189
194
 
190
-
191
195
  // Fluid grid
192
196
  $fluidGridColumnWidth: 6.382978723% !default;
193
197
  $fluidGridGutterWidth: 2.127659574% !default;
metadata CHANGED
@@ -1,19 +1,19 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: anjlab-bootstrap-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.2.1
5
- prerelease:
4
+ version: 2.0.3.rc
5
+ prerelease: 6
6
6
  platform: ruby
7
7
  authors:
8
8
  - Yury Korolev
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-03-15 00:00:00.000000000 Z
12
+ date: 2012-04-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
16
- requirement: &70127895098960 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
21
21
  version: '3.0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70127895098960
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ! '>='
28
+ - !ruby/object:Gem::Version
29
+ version: '3.0'
25
30
  - !ruby/object:Gem::Dependency
26
31
  name: sass
27
- requirement: &70127907296000 !ruby/object:Gem::Requirement
32
+ requirement: !ruby/object:Gem::Requirement
28
33
  none: false
29
34
  requirements:
30
35
  - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
32
37
  version: '0'
33
38
  type: :runtime
34
39
  prerelease: false
35
- version_requirements: *70127907296000
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ! '>='
44
+ - !ruby/object:Gem::Version
45
+ version: '0'
36
46
  - !ruby/object:Gem::Dependency
37
47
  name: bundler
38
- requirement: &70127907294560 !ruby/object:Gem::Requirement
48
+ requirement: !ruby/object:Gem::Requirement
39
49
  none: false
40
50
  requirements:
41
51
  - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
43
53
  version: '1.0'
44
54
  type: :development
45
55
  prerelease: false
46
- version_requirements: *70127907294560
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
58
+ requirements:
59
+ - - ! '>='
60
+ - !ruby/object:Gem::Version
61
+ version: '1.0'
47
62
  - !ruby/object:Gem::Dependency
48
63
  name: rails
49
- requirement: &70127907293500 !ruby/object:Gem::Requirement
64
+ requirement: !ruby/object:Gem::Requirement
50
65
  none: false
51
66
  requirements:
52
67
  - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
54
69
  version: '3.1'
55
70
  type: :development
56
71
  prerelease: false
57
- version_requirements: *70127907293500
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ! '>='
76
+ - !ruby/object:Gem::Version
77
+ version: '3.1'
58
78
  description: Twitter Bootstrap CSS (with SASS flavour) and JS toolkits for Rails 3
59
79
  projects
60
80
  email:
@@ -92,7 +112,6 @@ files:
92
112
  - vendor/assets/javascripts/bootstrap.js
93
113
  - vendor/assets/stylesheets/accordion.scss
94
114
  - vendor/assets/stylesheets/alerts.scss
95
- - vendor/assets/stylesheets/badges.scss
96
115
  - vendor/assets/stylesheets/bootstrap.scss
97
116
  - vendor/assets/stylesheets/breadcrumbs.scss
98
117
  - vendor/assets/stylesheets/button-groups.scss
@@ -105,7 +124,7 @@ files:
105
124
  - vendor/assets/stylesheets/forms.scss
106
125
  - vendor/assets/stylesheets/grid.scss
107
126
  - vendor/assets/stylesheets/hero-unit.scss
108
- - vendor/assets/stylesheets/labels.scss
127
+ - vendor/assets/stylesheets/labels-badges.scss
109
128
  - vendor/assets/stylesheets/layouts.scss
110
129
  - vendor/assets/stylesheets/mixins.scss
111
130
  - vendor/assets/stylesheets/modals.scss
@@ -116,6 +135,11 @@ files:
116
135
  - vendor/assets/stylesheets/popovers.scss
117
136
  - vendor/assets/stylesheets/progress-bars.scss
118
137
  - vendor/assets/stylesheets/reset.scss
138
+ - vendor/assets/stylesheets/responsive-1200px-min.scss
139
+ - vendor/assets/stylesheets/responsive-767px-max.scss
140
+ - vendor/assets/stylesheets/responsive-768px-979px.scss
141
+ - vendor/assets/stylesheets/responsive-navbar.scss
142
+ - vendor/assets/stylesheets/responsive-utilities.scss
119
143
  - vendor/assets/stylesheets/responsive.scss
120
144
  - vendor/assets/stylesheets/scaffolding.scss
121
145
  - vendor/assets/stylesheets/sprites.scss
@@ -138,15 +162,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
138
162
  - - ! '>='
139
163
  - !ruby/object:Gem::Version
140
164
  version: '0'
165
+ segments:
166
+ - 0
167
+ hash: -2818097237327949141
141
168
  required_rubygems_version: !ruby/object:Gem::Requirement
142
169
  none: false
143
170
  requirements:
144
- - - ! '>='
171
+ - - ! '>'
145
172
  - !ruby/object:Gem::Version
146
- version: '0'
173
+ version: 1.3.1
147
174
  requirements: []
148
175
  rubyforge_project:
149
- rubygems_version: 1.8.17
176
+ rubygems_version: 1.8.22
150
177
  signing_key:
151
178
  specification_version: 3
152
179
  summary: Bootstrap CSS (with SASS flavour) and JS toolkits for Rails 3 projects
@@ -1,36 +0,0 @@
1
- // BADGES
2
- // ------
3
-
4
- // Base
5
- .badge {
6
- padding: 1px 9px 2px;
7
- font-size: $baseFontSize * .925;
8
- font-weight: bold;
9
- white-space: nowrap;
10
- color: $white;
11
- background-color: $grayLight;
12
- @include border-radius(9px);
13
- }
14
-
15
- // Hover state
16
- .badge:hover {
17
- color: $white;
18
- text-decoration: none;
19
- cursor: pointer;
20
- }
21
-
22
- // Colors
23
- .badge-error { background-color: $errorText; }
24
- .badge-error:hover { background-color: darken($errorText, 10%); }
25
-
26
- .badge-warning { background-color: $orange; }
27
- .badge-warning:hover { background-color: darken($orange, 10%); }
28
-
29
- .badge-success { background-color: $successText; }
30
- .badge-success:hover { background-color: darken($successText, 10%); }
31
-
32
- .badge-info { background-color: $infoText; }
33
- .badge-info:hover { background-color: darken($infoText, 10%); }
34
-
35
- .badge-inverse { background-color: $grayDark; }
36
- .badge-inverse:hover { background-color: darken($grayDark, 10%); }