bootswatch-rails 0.5.0 → 3.1.1

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 (43) hide show
  1. checksums.yaml +6 -14
  2. data/CONTRIBUTING.md +52 -0
  3. data/CONVERSION.md +6 -8
  4. data/HISTORY.md +9 -1
  5. data/README.md +6 -1
  6. data/Rakefile +3 -0
  7. data/lib/bootswatch-rails/version.rb +1 -1
  8. data/rearranges +12 -10
  9. data/vendor/assets/stylesheets/bootswatch/amelia/_bootswatch.scss +109 -718
  10. data/vendor/assets/stylesheets/bootswatch/amelia/_variables.scss +743 -217
  11. data/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss +78 -133
  12. data/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss +745 -217
  13. data/vendor/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss +113 -552
  14. data/vendor/assets/stylesheets/bootswatch/cosmo/_variables.scss +745 -217
  15. data/vendor/assets/stylesheets/bootswatch/custom/_bootswatch.scss +22 -0
  16. data/vendor/assets/stylesheets/bootswatch/custom/_variables.scss +620 -0
  17. data/vendor/assets/stylesheets/bootswatch/cyborg/_bootswatch.scss +105 -525
  18. data/vendor/assets/stylesheets/bootswatch/cyborg/_variables.scss +745 -217
  19. data/vendor/assets/stylesheets/bootswatch/darkly/_bootswatch.scss +273 -0
  20. data/vendor/assets/stylesheets/bootswatch/darkly/_variables.scss +829 -0
  21. data/vendor/assets/stylesheets/bootswatch/flatly/_bootswatch.scss +183 -452
  22. data/vendor/assets/stylesheets/bootswatch/flatly/_variables.scss +747 -218
  23. data/vendor/assets/stylesheets/bootswatch/journal/_bootswatch.scss +77 -295
  24. data/vendor/assets/stylesheets/bootswatch/journal/_variables.scss +745 -217
  25. data/vendor/assets/stylesheets/bootswatch/lumen/_bootswatch.scss +408 -0
  26. data/vendor/assets/stylesheets/bootswatch/lumen/_variables.scss +827 -0
  27. data/vendor/assets/stylesheets/bootswatch/readable/_bootswatch.scss +149 -37
  28. data/vendor/assets/stylesheets/bootswatch/readable/_variables.scss +745 -217
  29. data/vendor/assets/stylesheets/bootswatch/simplex/_bootswatch.scss +84 -413
  30. data/vendor/assets/stylesheets/bootswatch/simplex/_variables.scss +745 -217
  31. data/vendor/assets/stylesheets/bootswatch/slate/_bootswatch.scss +251 -481
  32. data/vendor/assets/stylesheets/bootswatch/slate/_variables.scss +749 -217
  33. data/vendor/assets/stylesheets/bootswatch/spacelab/_bootswatch.scss +87 -231
  34. data/vendor/assets/stylesheets/bootswatch/spacelab/_variables.scss +745 -216
  35. data/vendor/assets/stylesheets/bootswatch/superhero/_bootswatch.scss +168 -569
  36. data/vendor/assets/stylesheets/bootswatch/superhero/_variables.scss +746 -217
  37. data/vendor/assets/stylesheets/bootswatch/united/_bootswatch.scss +21 -110
  38. data/vendor/assets/stylesheets/bootswatch/united/_variables.scss +745 -217
  39. data/vendor/assets/stylesheets/bootswatch/yeti/_bootswatch.scss +418 -0
  40. data/vendor/assets/stylesheets/bootswatch/yeti/_variables.scss +827 -0
  41. metadata +17 -9
  42. data/vendor/assets/stylesheets/bootswatch/spruce/_bootswatch.scss +0 -650
  43. data/vendor/assets/stylesheets/bootswatch/spruce/_variables.scss +0 -301
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- NjQ4NTMwOTlhOTYxNDM4Y2U3YzlhMGIxMjllZmMzNGMyODQ4MDQ4Nw==
5
- data.tar.gz: !binary |-
6
- ZDNiYjgzNzZkOTJjZDFhZjA2NWUyYzc0OWVhNWUzNTQ5NTVmOTYwNQ==
7
- !binary "U0hBNTEy":
8
- metadata.gz: !binary |-
9
- Zjc1ZjNhN2FlMTgzMDI3Y2E2Y2VlNjEzNDcxMmRlNzhiYmFiZDQ0ZmI0MDQw
10
- MGMyNGRlNjA4MDJmNTA4OWQ1Nzg2MzAwZGYxMjlhYTQ0NjBkNjhiNjYyZmYz
11
- NDEzZmM4ZGE4Mzk3N2NmZDUwMGY2NjVmODE2Y2Q0NGFjZjY3YWQ=
12
- data.tar.gz: !binary |-
13
- MzEzMTBkZjAwNDdlODk2OWEzZDJjMzRhNTQ3ZGJmMDUzNGE1ZTMyNjExZTMw
14
- NjEyZmI4OGY3YzMxZjQ3MWMzYTMyMDJmNzY2MThkZTY1YmU2M2UzM2IwMjJm
15
- YTQ3YzY2YWFmYTgwZTVhY2ExODBkZGNiMzJhODE5ZmU4ZTFiNWQ=
2
+ SHA1:
3
+ metadata.gz: 9a68b136700cbc3f2de46679eb82073b74dc8271
4
+ data.tar.gz: 2e6ab33a047515935b04f13f84f533cbf4842eb8
5
+ SHA512:
6
+ metadata.gz: 0919880066faa383d1e78215a1e4834429115a14b325b83c2c062b2d953307b6b4b4bfc7b0e43da6630b070c128a42092fc07712ff8db45543db290325e8d27f
7
+ data.tar.gz: 5d0fb8519c3e6e64dd01971d73194f00ae1d8c0fade717d2e2a8ac9b9273ac9899697d523c0fbfa6cc6868cc28b9703ab3bf2236463e783fbd8949751107283e
data/CONTRIBUTING.md ADDED
@@ -0,0 +1,52 @@
1
+ This project hasn't been kept up to date very well for the usual reason: I
2
+ haven't needed it myself in a while. Here are my thoughts on how to keep it
3
+ going.
4
+
5
+ ## Keeping up with upstream bootswatches
6
+
7
+ ![One does not simply edit SCSS files](http://i.imgur.com/0N8Tf0U.jpg)
8
+
9
+ As it stands, this project is not popular enough to be maintained entirely by
10
+ hand. That's why I wrote ruby scripts to convert most of LESS to SCSS. This
11
+ automation means that you can't simply edit some scss file and submit a pull
12
+ request. The next time we run the converter, your fix will disappear. So here's
13
+ how to contribute in a way that avoids this problem.
14
+
15
+ ## I want to fix SCSS issue
16
+
17
+ #### I know ruby
18
+
19
+ 1. Checkout your fork
20
+ 2. Checkout current bootswatch submodule
21
+ 3. Edit converter script such that it fixes the problem you found
22
+ 4. Run `rake convert`
23
+ 5. Run `./rearranges` and fix variable declaration orders
24
+ 6. Follow instructions in `CONVERSION.md` and make manual fixes
25
+ 7. Submit a pull request
26
+
27
+ #### I don't know ruby
28
+
29
+ 1. Checkout your fork
30
+ 2. Fix the SCSS issue that you found
31
+ 3. In `CONVERSION.md` explain the exact steps to fix the issue
32
+ 4. Submit a pull request
33
+
34
+ ## I want to update all bootswatches to latest versions
35
+
36
+ 1. Checkout your fork
37
+ 2. Checkout current bootswatch submodule
38
+ 3. Pull in latest bootswatch submodule
39
+ 4. Run `rake convert`
40
+ 5. Run `./rearranges` and fix variable declaration orders
41
+ 6. Follow instructions in `CONVERSION.md` and make manual fixes
42
+ 7. Try all the bootswatches and make sure (as best you can) that they work
43
+ 8. If any additional fixes are required, refer to "I want to fix SCSS issue"
44
+ 9. Submit a pull request
45
+
46
+ ## I want to help automate this stuff better
47
+
48
+ You have to know ruby for this one.
49
+
50
+ 1. Checkout your fork
51
+ 2. Work on converter and rearranges scripts, etc
52
+ 3. Submit pull requests
data/CONVERSION.md CHANGED
@@ -1,10 +1,8 @@
1
- ## Notes on conversion
1
+ ## Manual conversion steps
2
2
 
3
- TODO: Automate these
3
+ Do this after you ran `rake convert` and rearranged variables according to
4
+ `./rearranges` script.
4
5
 
5
- 1. Update bootswatch submodule
6
- 2. Run rake convert
7
- 3. Run ./rearranges and fix variable declaration orders
8
- 4. Search *.scss for this regexp: \We\( and remove occurrences of e function
9
- 5. Search *.scss for this regexp: @include.+!important and move !important into parentheses
10
- 6. Search *.scss for this regexp: &- and prepend parent selector instead
6
+ 1. Search *.scss for this regexp: \We\( and remove occurrences of e function
7
+ 2. Search *.scss for this regexp: @include.+!important and move !important into parentheses
8
+ 3. Search *.scss for this regexp: &- and prepend parent selector instead
data/HISTORY.md CHANGED
@@ -1,4 +1,12 @@
1
- ## 0.5.0 (2013-02-22)
1
+ ## 3.0.0 (2013-10-17)
2
+
3
+ * Update all themes to current bootswatch versions (3.0.0)
4
+ * Remove Spruce theme
5
+ * Remove Superhero theme
6
+ * Add Custom base theme for creating your own swatch
7
+ * Change version scheme to match bootstrap versioning
8
+
9
+ ## 0.5.0 (2013-05-21)
2
10
 
3
11
  * Update all themes to current bootswatch versions (2.3.2)
4
12
  * Add Flatly theme
data/README.md CHANGED
@@ -35,6 +35,7 @@ considering that you're using
35
35
 
36
36
  // Then bootstrap itself
37
37
  @import "bootstrap";
38
+ @import "bootstrap/mixins";
38
39
 
39
40
  // Bootstrap body padding for fixed navbar
40
41
  body { padding-top: 60px; }
@@ -68,15 +69,17 @@ Included bootswatches
68
69
  * [Cerulean](http://bootswatch.com/cerulean/)
69
70
  * [Cosmo](http://bootswatch.com/cosmo/)
70
71
  * [Cyborg](http://bootswatch.com/cyborg/)
72
+ * [Darkly](http://bootswatch.com/darkly/)
71
73
  * [Flatly](http://bootswatch.com/flatly/)
72
74
  * [Journal](http://bootswatch.com/journal/)
75
+ * [Lumen](http://bootswatch.com/lumen/)
73
76
  * [Readable](http://bootswatch.com/readable/)
74
77
  * [Simplex](http://bootswatch.com/simplex/)
75
78
  * [Slate](http://bootswatch.com/slate/)
76
79
  * [Spacelab](http://bootswatch.com/spacelab/)
77
- * [Spruce](http://bootswatch.com/spruce/)
78
80
  * [Superhero](http://bootswatch.com/superhero/)
79
81
  * [United](http://bootswatch.com/united/)
82
+ * [Yeti](http://bootswatch.com/yeti/)
80
83
 
81
84
  ## Contributing
82
85
 
@@ -92,6 +95,8 @@ that does most of the work converting less to scss. If you want to contribute a
92
95
  fix that's easily automatable and you know ruby, please add a processor to the
93
96
  converter.
94
97
 
98
+ Note on 3.0.0 conversion: This was converted using a simple grunt task in the [bootswatch-scss](https://github.com/log0ymxm/bootswatch-scss) repo.
99
+
95
100
  ## Credits
96
101
 
97
102
  Big thanks to these guys.
data/Rakefile CHANGED
@@ -6,8 +6,10 @@ THEMES = %w(
6
6
  cerulean
7
7
  cosmo
8
8
  cyborg
9
+ darkly
9
10
  flatly
10
11
  journal
12
+ lumen
11
13
  readable
12
14
  simplex
13
15
  slate
@@ -15,6 +17,7 @@ THEMES = %w(
15
17
  spruce
16
18
  superhero
17
19
  united
20
+ yeti
18
21
  ).freeze
19
22
 
20
23
 
@@ -1,5 +1,5 @@
1
1
  module Bootswatch
2
2
  module Rails
3
- VERSION = "0.5.0"
3
+ VERSION = '3.1.1'
4
4
  end
5
5
  end
data/rearranges CHANGED
@@ -98,16 +98,18 @@ end
98
98
  moves = []
99
99
  unassigned.each do |variable|
100
100
  assignment = assigned.find{|v| v == variable}
101
- moves << [
102
- [ variable.section_name,
103
- variable.section_header,
104
- variable.section,
105
- variable ],
106
- [ assignment.section_name,
107
- assignment.section_header,
108
- assignment.section,
109
- assignment ]
110
- ]
101
+ if assignment
102
+ moves << [
103
+ [ variable.section_name,
104
+ variable.section_header,
105
+ variable.section,
106
+ variable ],
107
+ [ assignment.section_name,
108
+ assignment.section_header,
109
+ assignment.section,
110
+ assignment ]
111
+ ]
112
+ end
111
113
  end
112
114
 
113
115
  moves.uniq!
@@ -1,789 +1,180 @@
1
- // Amelia 2.3.2
1
+ // Amelia 3.1.1
2
2
  // Bootswatch
3
3
  // -----------------------------------------------------
4
4
 
5
+ @import url("//fonts.googleapis.com/css?family=Lobster|Cabin:400,700");
5
6
 
6
- // TYPOGRAPHY
7
- // -----------------------------------------------------
8
-
9
- @import url('//fonts.googleapis.com/css?family=Lobster|Cabin:400,700');
10
-
11
- h6 {
12
- color: $textColor;
13
- }
14
-
15
- h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
16
- font-family: $baseFontFamily;
17
- color: $textColor;
18
- }
19
-
20
- code, pre {
21
- background-color: rgba(255, 255, 255, 0.3);
22
- padding: 2px;
23
- }
24
-
25
- blockquote {
26
-
27
- border-left-color: lighten(#147E88, 12%);
28
-
29
- &.pull-right {
30
- border-right-color: lighten(#147E88, 12%);
31
- }
32
-
33
- small {
34
- color: rgba(255, 255, 255, 0.6);
35
- }
36
- }
37
-
38
- .muted {
39
- color: rgba(255, 255, 255, 0.6);
40
- }
41
-
42
- // SCAFFOLDING
43
- // -----------------------------------------------------
44
-
45
- body {
46
- @include gradient-radial(lighten(#0F8790, 7%), #0F8790);
47
- }
48
-
49
- hr {
50
- border-bottom: none;
51
- }
52
-
53
- .page-header {
54
- margin: 30px 0 15px;
55
- border-bottom: 0px solid transparent;
56
- }
57
-
58
- // NAVBAR
59
- // -----------------------------------------------------
7
+ // Navbar =====================================================================
60
8
 
61
- .navbar {
62
-
63
- .navbar-inner {
64
- @include border-radius(0);
65
- }
66
-
67
- .brand {
68
- padding: 15px 20px 14px;
69
- font-family: $headingsFontFamily;
70
- font-size: 24px;
71
- font-weight: normal;
72
- }
73
-
74
- .nav > li > a {
75
- padding-top: 17px;
76
- padding-bottom: 14px;
77
- text-shadow: none;
78
- }
79
-
80
- .nav > .active > a,
81
- .nav > .active > a:hover,
82
- .navbar .nav > .active > a:focus {
83
- @include box-shadow(none);
84
- }
85
-
86
- .navbar-search {
87
- margin-top: 10px;
88
- }
89
-
90
- .navbar-search .search-query {
91
- @include border-radius(0);
92
- padding-top: 5px;
93
- padding-bottom: 5px;
94
- }
95
-
96
- .navbar-text {
97
- margin: 17px 15px 14px;
98
- line-height: 20px;
99
- }
100
-
101
- .btn,
102
- .btn-group {
103
- padding: 4px;
104
- }
105
-
106
- .navbar-inverse {
107
-
108
- .dropdown-menu li > a:hover,
109
- .dropdown-menu li > a:focus,
110
- .dropdown-submenu:hover > a {
111
- background-image: none;
112
- background-color: $yellow;
113
- }
114
- }
9
+ .navbar-brand {
10
+ font-family: 'Lobster', cursive;
115
11
  }
116
12
 
117
- @media (max-width: $navbarCollapseWidth) {
118
-
119
- .navbar .nav-collapse {
120
-
121
- .nav li > a {
122
-
123
- color: $textColor;
124
- @include border-radius(0);
125
-
126
- &:hover {
127
- background-color: lighten($navbarBackground, 10%);
128
- }
129
- }
130
-
131
- .dropdown-menu li > a:hover,
132
- .dropdown-menu li > a:focus,
133
- .dropdown-submenu:hover > a {
134
- background-image: none;
135
- }
136
-
137
- .navbar-form,
138
- .navbar-search {
139
- @include box-shadow(none);
140
- border: none;
141
- }
142
-
143
- .navbar-search .search-query {
144
- border: 2px solid $textColor;
145
- }
146
-
147
- .nav-header {
148
- color: rgba(255, 255, 255, 0.5);
149
- }
150
- }
151
-
152
- .navbar-inverse .nav-collapse {
153
-
154
- .nav > li > a,
155
- .dropdown-menu a {
156
- color: $navbarInverseLinkColor !important;
157
- }
158
-
159
- .nav li > a:hover,
160
- .dropdown-menu a:hover {
161
- background-color: lighten($navbarInverseBackground, 10%) !important;
162
- }
163
- }
164
- }
165
-
166
- div.subnav {
167
-
168
- margin: 0 1px;
169
- background: rgba(42, 99, 105, 0.9) none;
170
- border: none;
171
- @include border-radius(0);
172
- @include box-shadow(none);
173
-
174
- .nav > li > a {
175
- color: $textColor;
176
- border-color: transparent;
177
- }
178
-
179
- .nav > li:first-child > a,
180
- .nav > li:first-child > a:hover {
181
- @include border-radius(0);
182
- }
183
-
184
- .nav > .active > a {
185
- background-color: rgba(255, 255, 255, 0.4);
186
- border-color: transparent;
187
- color: $textColor;
188
- @include box-shadow(none);
189
- }
190
-
191
- .nav > li > a:hover,
192
- .nav > .active > a:hover, {
193
- border-right-color: transparent;
194
- background-color: rgba(255, 255, 255, 0.4);
195
- color: $textColor;
196
- }
197
-
198
- .nav > li.open > a {
199
- border-color: transparent;
200
- background-color: rgba(255, 255, 255, 0.4);
201
- }
202
-
203
- div.subnav-fixed {
204
- top: $navbarHeight + 1;
205
- margin: 0;
206
- }
207
- }
208
-
209
- @media (max-width: 767px) {
210
-
211
- div.subnav .nav > li + li > a {
212
- border-top: 1px solid rgba(255, 255, 255, 0.4);
213
- }
214
- }
215
-
216
- // NAV
217
- // -----------------------------------------------------
218
-
219
- .nav-tabs,
220
- .nav-pills {
221
-
222
- border-color: transparent;
223
-
224
-
225
- & > li > a {
226
- border-color: transparent;
227
- @include border-radius(0);
228
- @include box-shadow(0);
229
- }
230
-
231
- & > li > a:hover {
232
- background-color: #8AD5DC;
233
- border-color: transparent;
234
- text-shadow: none;
235
- }
236
-
237
- & > .active > a,
238
- & > .active > a:hover {
239
- background-color: #8AD5DC;
240
- border-color: transparent;
241
- color: $textColor;
242
- text-shadow: none;
243
- }
244
-
245
- & > .disabled > a,
246
- & > .disabled > a:hover {
247
- background: none;
248
- color: $grayLighter;
249
- }
250
-
251
- & > .open > .dropdown-toggle,
252
- & > .open > .dropdown-toggle {
253
- background-color: #8AD5DC;
254
- color: $linkColor;
255
- border-color: transparent;
256
- }
257
-
258
-
259
- }
260
-
261
- .nav-tabs {
262
-
263
- border-bottom: 1px solid rgba(255, 255, 255, 0.5);
264
-
265
- & > li > a {
266
- background-color: #3CB9C6;
267
- }
268
-
269
- &.nav-stacked {
270
-
271
- li > a:first-child,
272
- li > a:last-child {
273
- @include border-radius(0);
274
- }
275
-
276
- li > a,
277
- li > a:hover,
278
- li.active > a,
279
- li.active > a:hover {
280
- border-color: transparent;
281
- }
282
- }
283
- }
284
-
285
- .nav-list {
286
-
287
- .nav-header {
288
- text-shadow: none;
289
- color: $textColor;
290
- }
291
-
292
- li > a {
293
- text-shadow: none;
294
- }
295
-
296
- li.active > a,
297
- li > a:hover,
298
- li.active > a:hover {
299
- background-color: #8AD5DC;
300
- text-shadow: none;
301
- }
302
-
303
- .divider {
304
- background-color: rgba(255, 255, 255, 0.3);
305
- border-bottom: none;
306
- }
307
- }
308
-
309
- .breadcrumb, .pager > li > a {
310
- border-color: transparent;
311
- @include border-radius(0);
312
- @include box-shadow(none);
313
- text-shadow: none;
314
- }
315
-
316
- .breadcrumb {
317
-
318
- background-color: #3CB9C6;
319
- background-image: none;
320
-
321
- li {
322
- text-shadow: none;
323
- }
324
-
325
- .active {
326
- color: $white;
327
- }
328
-
329
- & > li > a.divider,
330
- & > li > span.divider {
331
- color: $grayLighter;
332
- }
333
- }
334
-
335
- .pagination {
336
-
337
- ul {
338
- background-color: $paginationBackground;
339
- background-image: none;
340
- @include border-radius(0);
341
- }
342
-
343
- ul > li > a:hover {
344
- background-color: rgba(255, 255, 255, 0.4);
345
- color: $linkColor;
346
- }
347
-
348
- ul > li:first-child > a,
349
- ul > li:last-child > a {
350
- @include border-radius(0);
351
- }
352
-
353
- ul > .disabled > a,
354
- ul > .disabled > a:hover,
355
- ul > .disabled > span,
356
- ul > .disabled > span:hover {
357
- color: $textColor;
358
- }
359
-
360
- ul > .active > a,
361
- ul > .active > a:hover,
362
- ul > .active > span,
363
- ul > .active > span:hover {
364
- background-color: rgba(255, 255, 255, 0.4);
365
- color: $textColor;
366
- }
13
+ .navbar-default {
14
+ .badge {
15
+ background-color: #fff;
16
+ color: $navbar-default-bg;
17
+ }
367
18
  }
368
19
 
369
- .pager {
370
-
371
- li > a {
372
- background-color: #3CB9C6;
20
+ // Buttons ====================================================================
373
21
 
374
- &:hover {
375
- background-color: #8AD5DC;
376
- }
377
- }
22
+ .btn {
378
23
 
379
- .disabled a,
380
- .disabled a:hover {
381
- background-color: #3CB9C6;
382
- color: $white;
383
- }
24
+ .caret {
25
+ border-top-color: #fff;
26
+ }
384
27
  }
385
28
 
386
- // BUTTONS
387
- // -----------------------------------------------------
388
-
389
- @mixin buttonBackgroundCustom($color) {
29
+ .btn-default {
390
30
 
391
- background-color: $color;
392
- border-color: transparent;
393
-
394
- &:hover, &:active, &.active, &.disabled, &[disabled] {
395
- background-color: darken($color, 5%);
396
- text-shadow: none;
397
- }
398
-
399
- &:active, &.active {
400
- background-color: darken($color, 15%);
401
- @include box-shadow(none);
31
+ &:hover {
32
+ color: $btn-default-color;
402
33
  }
403
34
 
404
- // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
405
- &:active,
406
- &.active {
407
- background-color: darken($color, 15%);
35
+ .caret {
36
+ border-top-color: $btn-default-color;
408
37
  }
409
38
  }
410
39
 
411
- .btn {
412
- padding: 12px 16px;
413
- @include border-radius(0);
414
- background-image: none;
415
- text-shadow: none;
416
- @include box-shadow(none);
417
- @include buttonBackgroundCustom($btnBackground)
418
- }
419
-
420
- .btn-large {
421
- padding: $paddingLarge;
422
- }
423
-
424
- .btn-small {
425
- padding: $paddingSmall;
426
- }
427
-
428
- .btn-mini {
429
- padding: $paddingMini;
430
- }
431
-
432
- .btn-group .btn:first-child {
433
- margin-left: 0;
434
- @include border-radius(0);
435
- }
436
-
437
- .btn-group .btn:last-child,
438
- .btn-group .dropdown-toggle {
439
- @include border-radius(0);
440
- }
40
+ // Typography =================================================================
441
41
 
442
- .btn-group .dropdown-toggle,
443
- .btn-group.open .dropdown-toggle,
444
- .btn.open .dropdown-toggle {
445
- @include box-shadow(none);
42
+ .text-primary,
43
+ .text-primary:hover {
44
+ color: lighten($brand-primary, 40%);
446
45
  }
447
46
 
448
- .btn-primary {
449
- @include buttonBackgroundCustom($btnPrimaryBackground);
47
+ .text-success,
48
+ .text-success:hover {
49
+ color: lighten($brand-success, 20%);
450
50
  }
451
51
 
452
- .btn-info {
453
- @include buttonBackgroundCustom($btnInfoBackground);
52
+ .text-danger,
53
+ .text-danger:hover {
54
+ color: lighten($brand-danger, 20%);
454
55
  }
455
56
 
456
- .btn-success {
457
- @include buttonBackgroundCustom($btnSuccessBackground);
57
+ .text-warning,
58
+ .text-warning:hover {
59
+ color: lighten($brand-warning, 20%);
458
60
  }
459
61
 
460
- .btn-warning {
461
- @include buttonBackgroundCustom($btnWarningBackground);
62
+ .text-info,
63
+ .text-info:hover {
64
+ color: lighten($brand-info, 40%);
462
65
  }
463
66
 
464
- .btn-danger {
465
- @include buttonBackgroundCustom($btnDangerBackground);
466
- }
67
+ // Tables =====================================================================
467
68
 
468
- .btn-inverse {
469
- @include buttonBackgroundCustom($btnInverseBackground);
69
+ .table-responsive > .table {
70
+ background-color: $table-bg;
470
71
  }
471
72
 
472
- .btn-link {
473
- @include buttonBackgroundCustom($btnPrimaryBackground);
474
- }
475
-
476
- .btn-small [class^="icon-"] {
477
- margin-top: 1px;
478
- }
73
+ table,
74
+ .table {
479
75
 
480
- .add-on [class^="icon-"] {
481
- margin-left: 5px;
482
- }
483
-
484
- // TABLES
485
- // -----------------------------------------------------
486
-
487
- .table th, .table td,
488
- .table tbody + tbody {
489
- border-top: 0px solid transparent;
490
- }
76
+ a {
77
+ color: #fff;
78
+ text-decoration: underline;
79
+ }
491
80
 
492
- .table-bordered {
493
- @include border-radius(0);
81
+ .text-muted {
82
+ color: $text-muted;
83
+ }
494
84
  }
495
85
 
496
- .table tbody {
497
-
498
- tr.success td {
499
- background-color: $green;
500
- }
501
-
502
- tr.error td {
503
- background-color: $red;
504
- }
86
+ // Forms ======================================================================
505
87
 
506
- tr.info td {
507
- background-color: $blue;
508
- }
88
+ input,
89
+ textarea {
90
+ color: $input-color;
509
91
  }
510
92
 
511
- // FORMS
512
- // -----------------------------------------------------
513
-
514
93
  legend {
515
- font-family: $headingsFontFamily;
516
- }
517
-
518
- legend, label, .help-block, .input-file {
519
- border: 0px solid transparent;
520
- color: inherit;
521
- }
522
-
523
- input, textarea, .uneditable-input {
524
- border: 0px solid transparent;
525
- padding: 10px;
526
- }
527
-
528
- .uneditable-input {
529
- padding-bottom: 30px;
530
- }
531
-
532
- select {
533
- border: 0px solid transparent;
534
- }
535
-
536
- button {
537
- margin-left: 12px;
538
- }
539
-
540
- input, textarea, .search-query, .uneditable-input,
541
- .input-append input, .input-append .uneditable-input,
542
- .input-prepend input, .input-prepend .uneditable-input {
543
- border-color: transparent;
544
- @include box-shadow(none);
545
- }
546
-
547
- .form-actions {
548
- border-top: 0px solid transparent;
549
- }
550
-
551
- .control-group.warning {
552
- @include formFieldState($yellow, lighten($yellow, 30%), $warningBackground);
553
- }
554
-
555
- .control-group.error {
556
- @include formFieldState($orange, lighten($orange, 30%), $errorBackground);
557
- }
558
-
559
- .control-group.success {
560
- @include formFieldState($green, lighten($green, 20%), $successBackground);
561
- }
562
-
563
- .control-group.info {
564
- @include formFieldState($purple, lighten($purple, 20%), $infoBackground);
565
- }
566
-
567
- .control-group.warning {
568
-
569
- .control-label,
570
- .help-block,
571
- .help-inline {
572
- color: lighten($yellow, 30%);
573
- }
574
- }
575
-
576
- .control-group.error {
577
-
578
- .control-label,
579
- .help-block,
580
- .help-inline {
581
- color: lighten($orange, 30%);
582
- }
583
- }
584
-
585
- .control-group.success {
586
-
587
- .control-label,
588
- .help-block,
589
- .help-inline {
590
- color: lighten($green, 20%);
591
- }
94
+ font-family: 'Lobster', cursive;
95
+ color: #fff;
592
96
  }
593
- .control-group.info {
594
97
 
595
- .control-label,
596
- .help-block,
597
- .help-inline {
598
- color: lighten($purple, 20%);
599
- }
600
- }
601
-
602
- .input-prepend .add-on,
603
- .input-append .add-on {
604
- height: 20px;
605
- padding-top: 4px;
606
- background-color: $grayLighter;
607
- border-color: transparent;
608
- @include border-radius(0);
609
- color: $gray;
610
- text-shadow: none;
611
- }
612
-
613
- .input-append .btn,
614
- .input-prepend .btn {
615
- padding: 4px 10px;
616
- }
617
-
618
- // ALERTS, LABELS, BADGES
619
- // -----------------------------------------------------
620
-
621
- .alert {
622
-
623
- border-color: transparent;
624
- @include border-radius(0);
625
- @include box-shadow(none);
626
- text-shadow: none;
627
-
628
- h1, h2, h3, h4, h5, h6 {
629
- color: $textColor;
630
- }
631
-
632
- .alert-heading {
633
- color: $textColor;
634
- }
635
- }
636
-
637
- .label,
638
- .badge {
639
-
640
- background-color: $blue;
641
-
642
- .badge-success {
643
- background-color: $green;
644
- }
645
-
646
- .badge-important {
647
- background-color: $red;
648
- }
649
-
650
- .badge-warning {
651
- background-color: $orange;
652
- }
653
-
654
- .badge-info {
655
- background-color: $purple;
656
- }
657
-
658
- .badge-inverse {
659
- background-color: $btnInverseBackground;
660
- }
98
+ .has-warning {
99
+ .help-block,
100
+ .control-label,
101
+ .form-control-feedback {
102
+ color: lighten($brand-warning, 20%);
103
+ }
661
104
 
105
+ .form-control,
106
+ .form-control:focus {
107
+ border-color: lighten($brand-warning, 20%);
108
+ }
662
109
  }
663
110
 
664
- // MISCELLANEOUS
665
- // -----------------------------------------------------
111
+ .has-error {
112
+ .help-block,
113
+ .control-label,
114
+ .form-control-feedback {
115
+ color: lighten($brand-primary, 40%);
116
+ }
666
117
 
667
- .progress, .well, pre, code {
668
- border-color: transparent;
669
- @include border-radius(0);
670
- @include box-shadow(none);
671
- text-shadow: none;
118
+ .form-control,
119
+ .form-control:focus {
120
+ border-color: lighten($brand-primary, 40%);
121
+ }
672
122
  }
673
123
 
674
- .well {
675
- background-image: none;
676
- }
124
+ .has-success {
125
+ .help-block,
126
+ .control-label,
127
+ .form-control-feedback {
128
+ color: lighten($brand-success, 20%);
129
+ }
677
130
 
678
- .hero-unit {
679
- @include border-radius(0);
131
+ .form-control,
132
+ .form-control:focus {
133
+ border-color: lighten($brand-success, 20%);
134
+ }
680
135
  }
681
136
 
682
- .thumbnail {
683
- border: 0 solid transparent;
684
- @include border-radius(0);
685
- @include box-shadow(none);
137
+ .input-group-addon {
138
+ color: $btn-default-color;
686
139
  }
687
140
 
688
- .progress {
689
-
690
- background-image: none;
691
- background-color: #27666D;
692
-
693
- .bar {
694
-
695
- @include box-shadow(none);
696
- background-image: none;
697
- background-color: $yellow;
141
+ // Navs =======================================================================
698
142
 
699
- .bar-success {
700
- background-color: $green;
701
- }
702
-
703
- .bar-warning {
704
- background-color: $orange;
705
- }
706
-
707
- .bar-error {
708
- background-color: $red;
709
- }
710
- }
711
- }
143
+ .pagination {
712
144
 
713
- .progress-danger .bar {
714
- background-image: none;
715
- background-color: #AD1D28;
145
+ a:hover {
146
+ color: #fff;
147
+ }
716
148
  }
717
149
 
718
- .progress-danger.progress-striped .bar {
719
- @include gradient-striped(#AD1D28);
720
- }
150
+ .pager {
721
151
 
722
- .progress-success .bar {
723
- background-image: none;
724
- background-color: $green;
152
+ a:hover {
153
+ color: #fff;
154
+ }
725
155
  }
726
156
 
727
- .progress-success.progress-striped .bar {
728
- @include gradient-striped($green);
729
- }
157
+ // Indicators =================================================================
730
158
 
731
- .progress-info .bar {
732
- background-image: none;
733
- background-color: $blue;
734
- }
159
+ .close {
160
+ opacity: 0.4;
735
161
 
736
- .progress-info.progress-striped .bar {
737
- @include gradient-striped($blue);
162
+ &:hover,
163
+ &:focus {
164
+ opacity: 1;
165
+ }
738
166
  }
739
167
 
740
- .modal {
741
-
742
- @include border-radius(0);
168
+ // Progress bars ==============================================================
743
169
 
744
- .modal-header {
745
- background-color: $navbarBackground;
746
- color: $white;
747
- }
170
+ // Containers =================================================================
748
171
 
749
- .modal-body {
750
-
751
- color: $grayDark;
752
-
753
- h1, h2, h3, h4, h5, h6,
754
- legend {
755
- color: $red;
756
- }
757
-
758
- label,
759
- .input-file {
760
- color: $grayDark;
761
- }
762
-
763
- .help-block,
764
- .help-inline {
765
- color: $grayLight;
766
- }
767
-
768
- textarea,
769
- input,
770
- .uneditable-input {
771
- border: 1px solid $grayLight;
772
- }
773
- }
172
+ a.thumbnail:hover,
173
+ a.thumbnail:focus,
174
+ a.thumbnail.active {
175
+ border-color: $thumbnail-border;
774
176
  }
775
177
 
776
178
  .popover {
777
-
778
- padding: 0;
779
- @include border-radius(0);
780
- color: $grayDark;
781
-
782
- .popover-title {
783
- @include border-radius(0);
784
- color: $white;
785
- }
179
+ color: $gray-dark;
786
180
  }
787
-
788
- // MEDIA QUERIES
789
- // -----------------------------------------------------