bootswatch-rails 0.4.0 → 0.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (34) hide show
  1. checksums.yaml +15 -0
  2. data/CONVERSION.md +10 -0
  3. data/HISTORY.md +7 -1
  4. data/README.md +1 -0
  5. data/Rakefile +1 -0
  6. data/lib/bootswatch-rails/version.rb +1 -1
  7. data/rearranges +131 -0
  8. data/vendor/assets/stylesheets/bootswatch/amelia/_bootswatch.scss +86 -40
  9. data/vendor/assets/stylesheets/bootswatch/amelia/_variables.scss +22 -24
  10. data/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss +1 -1
  11. data/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss +1 -1
  12. data/vendor/assets/stylesheets/bootswatch/cosmo/_bootswatch.scss +1 -1
  13. data/vendor/assets/stylesheets/bootswatch/cosmo/_variables.scss +1 -1
  14. data/vendor/assets/stylesheets/bootswatch/cyborg/_bootswatch.scss +9 -1
  15. data/vendor/assets/stylesheets/bootswatch/cyborg/_variables.scss +1 -1
  16. data/vendor/assets/stylesheets/bootswatch/flatly/_bootswatch.scss +515 -0
  17. data/vendor/assets/stylesheets/bootswatch/flatly/_variables.scss +300 -0
  18. data/vendor/assets/stylesheets/bootswatch/journal/_bootswatch.scss +1 -1
  19. data/vendor/assets/stylesheets/bootswatch/journal/_variables.scss +2 -1
  20. data/vendor/assets/stylesheets/bootswatch/readable/_bootswatch.scss +1 -1
  21. data/vendor/assets/stylesheets/bootswatch/readable/_variables.scss +1 -1
  22. data/vendor/assets/stylesheets/bootswatch/simplex/_bootswatch.scss +11 -4
  23. data/vendor/assets/stylesheets/bootswatch/simplex/_variables.scss +1 -1
  24. data/vendor/assets/stylesheets/bootswatch/slate/_bootswatch.scss +14 -5
  25. data/vendor/assets/stylesheets/bootswatch/slate/_variables.scss +2 -2
  26. data/vendor/assets/stylesheets/bootswatch/spacelab/_bootswatch.scss +6 -2
  27. data/vendor/assets/stylesheets/bootswatch/spacelab/_variables.scss +1 -3
  28. data/vendor/assets/stylesheets/bootswatch/spruce/_bootswatch.scss +20 -12
  29. data/vendor/assets/stylesheets/bootswatch/spruce/_variables.scss +3 -3
  30. data/vendor/assets/stylesheets/bootswatch/superhero/_bootswatch.scss +43 -24
  31. data/vendor/assets/stylesheets/bootswatch/superhero/_variables.scss +3 -3
  32. data/vendor/assets/stylesheets/bootswatch/united/_bootswatch.scss +1 -1
  33. data/vendor/assets/stylesheets/bootswatch/united/_variables.scss +1 -1
  34. metadata +9 -9
@@ -0,0 +1,300 @@
1
+ // Flatness by Jenil (www.jgog.in)
2
+ // Bootswatch 2.3.2
3
+ // --------------------------------------------------
4
+
5
+
6
+ // Global values
7
+ // --------------------------------------------------
8
+
9
+ // Grays
10
+ // -------------------------
11
+ $black: #000 !default;
12
+ $grayDarker: #222 !default;
13
+ $grayDark: #7b8a8b !default;
14
+ $gray: #95A5A6 !default;
15
+ $grayLight: #b4bcc2 !default;
16
+ $grayLighter: #ECF0F1 !default;
17
+ $white: #fff !default;
18
+
19
+
20
+ // Accent colors
21
+ // -------------------------
22
+ $blue: #3498DB !default;
23
+ $blueDark: #2C3E50 !default;
24
+ $green: #18BC9C !default;
25
+ $red: #E74C3C !default;
26
+ $yellow: #e6bb0d !default;
27
+ $orange: #F39C12 !default;
28
+ $pink: #ff6699 !default;
29
+ $purple: #8E44AD !default;
30
+
31
+
32
+ // Scaffolding
33
+ // -------------------------
34
+ $bodyBackground: $white !default;
35
+ $textColor: $blueDark !default;
36
+
37
+
38
+ // Links
39
+ // -------------------------
40
+ $linkColor: #1ABC9C !default;
41
+ $linkColorHover: lighten($linkColor, 5%) !default;
42
+
43
+
44
+ // Typography
45
+ // -------------------------
46
+ $sansFontFamily: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif !default;
47
+ $serifFontFamily: Georgia, "Times New Roman", Times, serif !default;
48
+ $monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace !default;
49
+
50
+ $baseFontSize: 15px !default;
51
+ $baseFontFamily: $sansFontFamily !default;
52
+ $baseLineHeight: 21px !default;
53
+ $altFontFamily: $serifFontFamily !default;
54
+
55
+ $headingsFontFamily: inherit !default; // empty to use BS default, $baseFontFamily
56
+ $headingsFontWeight: bold !default; // instead of browser default, bold
57
+ $headingsColor: inherit !default; // empty to use BS default, $textColor
58
+
59
+
60
+ // Component sizing
61
+ // -------------------------
62
+ // Based on 14px font-size and 20px line-height
63
+
64
+ $fontSizeLarge: $baseFontSize * 1.25 !default; // ~18px
65
+ $fontSizeSmall: $baseFontSize * 0.85 !default; // ~12px
66
+ $fontSizeMini: $baseFontSize * 0.75 !default; // ~11px
67
+
68
+ $paddingLarge: 18px 36px !default; // 44px
69
+ $paddingSmall: 2px 12px !default; // 26px
70
+ $paddingMini: 1px 8px !default; // 24px
71
+
72
+ $baseBorderRadius: 6px !default;
73
+ $borderRadiusLarge: 10px !default;
74
+ $borderRadiusSmall: 3px !default;
75
+
76
+
77
+ // Tables
78
+ // -------------------------
79
+ $tableBackground: transparent !default; // overall background-color
80
+ $tableBackgroundAccent: #f9f9f9 !default; // for striping
81
+ $tableBackgroundHover: #f5f5f5 !default; // for hover
82
+ $tableBorder: #ddd !default; // table and cell border
83
+
84
+ // Buttons
85
+ // -------------------------
86
+ $btnBackground: $grayLight !default;
87
+ $btnBackgroundHighlight: lighten($btnBackground, 10%) !default;
88
+ $btnBorder: #ddd !default;
89
+
90
+ $btnPrimaryBackground: $textColor !default;
91
+ $btnPrimaryBackgroundHighlight: lighten($btnPrimaryBackground, 10%) !default;
92
+
93
+ $btnInfoBackground: $blue !default;
94
+ $btnInfoBackgroundHighlight: lighten($btnInfoBackground, 10%) !default;
95
+
96
+ $btnSuccessBackground: $green !default;
97
+ $btnSuccessBackgroundHighlight: lighten($btnSuccessBackground, 10%) !default;
98
+
99
+ $btnWarningBackground: $orange !default;
100
+ $btnWarningBackgroundHighlight: lighten($btnWarningBackground, 10%) !default;
101
+
102
+ $btnDangerBackground: $red !default;
103
+ $btnDangerBackgroundHighlight: lighten($btnDangerBackground, 10%) !default;
104
+
105
+ $btnInverseBackground: $grayDarker !default;
106
+ $btnInverseBackgroundHighlight: lighten($btnInverseBackground, 10%) !default;
107
+
108
+
109
+ // Forms
110
+ // -------------------------
111
+ $inputBackground: $white !default;
112
+ $inputBorder: #dce4ec !default;
113
+ $inputBorderRadius: $baseBorderRadius !default;
114
+ $inputDisabledBackground: #eaeded !default;
115
+ $formActionsBackground: #f5f5f5 !default;
116
+ $inputHeight: $baseLineHeight + 10px !default; // base line-height + 8px vertical padding + 2px top/bottom border
117
+
118
+
119
+ // Dropdowns
120
+ // -------------------------
121
+ $dropdownBackground: $blueDark !default;
122
+ $dropdownBorder: rgba(0,0,0,0) !default;
123
+ $dropdownDividerTop: rgba(0,0,0,0.2) !default;
124
+ $dropdownDividerBottom: rgba(0,0,0,0.2) !default;
125
+
126
+ $dropdownLinkColor: $white !default;
127
+ $dropdownLinkColorHover: $white !default;
128
+ $dropdownLinkColorActive: $dropdownLinkColor !default;
129
+
130
+ $dropdownLinkBackgroundActive: $green !default;
131
+ $dropdownLinkBackgroundHover: $green !default;
132
+
133
+
134
+
135
+ // COMPONENT VARIABLES
136
+ // --------------------------------------------------
137
+
138
+
139
+ // Z-index master list
140
+ // -------------------------
141
+ // Used for a bird's eye view of components dependent on the z-axis
142
+ // Try to avoid customizing these :)
143
+ $zindexDropdown: 1000 !default;
144
+ $zindexPopover: 1010 !default;
145
+ $zindexTooltip: 1030 !default;
146
+ $zindexFixedNavbar: 1030 !default;
147
+ $zindexModalBackdrop: 1040 !default;
148
+ $zindexModal: 1050 !default;
149
+
150
+
151
+ // Sprite icons path
152
+ // -------------------------
153
+ $iconSpritePath: image-path("glyphicons-halflings.png") !default;
154
+ $iconWhiteSpritePath: image-path("glyphicons-halflings-white.png") !default;
155
+
156
+
157
+ // Input placeholder text color
158
+ // -------------------------
159
+ $placeholderText: $grayLight !default;
160
+
161
+
162
+ // Hr border color
163
+ // -------------------------
164
+ $hrBorder: $grayLighter !default;
165
+
166
+
167
+ // Horizontal forms & lists
168
+ // -------------------------
169
+ $horizontalComponentOffset: 180px !default;
170
+
171
+
172
+ // Wells
173
+ // -------------------------
174
+ $wellBackground: $grayLighter !default;
175
+
176
+
177
+ // Navbar
178
+ // -------------------------
179
+ $navbarCollapseWidth: 979px !default;
180
+ $navbarCollapseDesktopWidth: $navbarCollapseWidth + 1 !default;
181
+
182
+ $navbarHeight: 50px !default;
183
+ $navbarBackgroundHighlight: $textColor !default;
184
+ $navbarBackground: $textColor !default;
185
+ $navbarBorder: darken($navbarBackground, 5%) !default;
186
+
187
+ $navbarText: $white !default;
188
+ $navbarLinkColor: $white !default;
189
+ $navbarLinkColorHover: $linkColor !default;
190
+ $navbarLinkColorActive: $linkColor !default;
191
+ $navbarLinkBackgroundHover: transparent !default;
192
+ $navbarLinkBackgroundActive: darken($navbarBackground, 5%) !default;
193
+
194
+ $navbarBrandColor: $navbarLinkColor !default;
195
+
196
+ // Inverted navbar
197
+ $navbarInverseBackground: $green !default;
198
+ $navbarInverseBackgroundHighlight: $green !default;
199
+ $navbarInverseBorder: darken($green, 5%) !default;
200
+
201
+ $navbarInverseText: $white !default;
202
+ $navbarInverseLinkColor: $white !default;
203
+ $navbarInverseLinkColorHover: $blueDark !default;
204
+ $navbarInverseLinkColorActive: $blueDark !default;
205
+ $navbarInverseLinkBackgroundHover: transparent !default;
206
+ $navbarInverseLinkBackgroundActive: darken($navbarInverseBackground, 5%) !default;
207
+
208
+ $navbarInverseSearchBackground: $white !default;
209
+ $navbarInverseSearchBackgroundFocus: $white !default;
210
+ $navbarInverseSearchBorder: $grayLight !default;
211
+ $navbarInverseSearchPlaceholderColor: $gray !default;
212
+
213
+ $navbarInverseBrandColor: $navbarInverseLinkColor !default;
214
+
215
+
216
+ // Pagination
217
+ // -------------------------
218
+ $paginationBackground: #fff !default;
219
+ $paginationBorder: #ddd !default;
220
+ $paginationActiveBackground: $grayLighter !default;
221
+
222
+
223
+ // Hero unit
224
+ // -------------------------
225
+ $heroUnitBackground: $grayLighter !default;
226
+ $heroUnitHeadingColor: inherit !default;
227
+ $heroUnitLeadColor: inherit !default;
228
+
229
+
230
+ // Form states and alerts
231
+ // -------------------------
232
+ $warningText: $yellow !default;
233
+ $warningBackground: desaturate(lighten($yellow,45%),30%) !default;
234
+ $warningBorder: transparent !default;
235
+
236
+ $errorText: $red !default;
237
+ $errorBackground: desaturate(lighten($red,45%),30%) !default;
238
+ $errorBorder: transparent !default;
239
+
240
+ $successText: $green !default;
241
+ $successBackground: desaturate(lighten($green,45%),30%) !default;
242
+ $successBorder: transparent !default;
243
+
244
+ $infoText: $blue !default;
245
+ $infoBackground: desaturate(lighten($blue,43%),30%) !default;
246
+ $infoBorder: transparent !default;
247
+
248
+
249
+ // Tooltips and popovers
250
+ // -------------------------
251
+ $tooltipColor: #fff !default;
252
+ $tooltipBackground: $blueDark !default;
253
+ $tooltipArrowWidth: 5px !default;
254
+ $tooltipArrowColor: $tooltipBackground !default;
255
+
256
+ $popoverBackground: $blueDark !default;
257
+ $popoverArrowWidth: 10px !default;
258
+ $popoverArrowColor: $blueDark !default;
259
+ $popoverTitleBackground: $blueDark !default;
260
+
261
+ // Special enhancement for popovers
262
+ $popoverArrowOuterWidth: $popoverArrowWidth + 1 !default;
263
+ $popoverArrowOuterColor: rgba(0,0,0,.25) !default;
264
+
265
+
266
+
267
+ // GRID
268
+ // --------------------------------------------------
269
+
270
+
271
+ // Default 940px grid
272
+ // -------------------------
273
+ $gridColumns: 12 !default;
274
+ $gridColumnWidth: 60px !default;
275
+ $gridGutterWidth: 20px !default;
276
+ $gridRowWidth: ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1)) !default;
277
+
278
+ // 1200px min
279
+ $gridColumnWidth1200: 70px !default;
280
+ $gridGutterWidth1200: 30px !default;
281
+ $gridRowWidth1200: ($gridColumns * $gridColumnWidth1200) + ($gridGutterWidth1200 * ($gridColumns - 1)) !default;
282
+
283
+ // 768px-979px
284
+ $gridColumnWidth768: 42px !default;
285
+ $gridGutterWidth768: 20px !default;
286
+ $gridRowWidth768: ($gridColumns * $gridColumnWidth768) + ($gridGutterWidth768 * ($gridColumns - 1)) !default;
287
+
288
+
289
+ // Fluid grid
290
+ // -------------------------
291
+ $fluidGridColumnWidth: percentage($gridColumnWidth/$gridRowWidth) !default;
292
+ $fluidGridGutterWidth: percentage($gridGutterWidth/$gridRowWidth) !default;
293
+
294
+ // 1200px min
295
+ $fluidGridColumnWidth1200: percentage($gridColumnWidth1200/$gridRowWidth1200) !default;
296
+ $fluidGridGutterWidth1200: percentage($gridGutterWidth1200/$gridRowWidth1200) !default;
297
+
298
+ // 768px-979px
299
+ $fluidGridColumnWidth768: percentage($gridColumnWidth768/$gridRowWidth768) !default;
300
+ $fluidGridGutterWidth768: percentage($gridGutterWidth768/$gridRowWidth768) !default;
@@ -1,4 +1,4 @@
1
- // Journal 2.3.0
1
+ // Journal 2.3.2
2
2
  // Bootswatch
3
3
  // -----------------------------------------------------
4
4
 
@@ -1,4 +1,4 @@
1
- // Journal 2.3.0
1
+ // Journal 2.3.2
2
2
  // Variables
3
3
  // --------------------------------------------------
4
4
 
@@ -132,6 +132,7 @@ $dropdownLinkBackgroundHover: $grayLighter !default;
132
132
  $dropdownLinkBackgroundActive: $dropdownLinkBackgroundHover !default;
133
133
 
134
134
 
135
+
135
136
  // COMPONENT VARIABLES
136
137
  // --------------------------------------------------
137
138
 
@@ -1,4 +1,4 @@
1
- // Readable 2.3.0
1
+ // Readable 2.3.2
2
2
  // Bootswatch
3
3
  // -----------------------------------------------------
4
4
 
@@ -1,4 +1,4 @@
1
- // Readable 2.3.0
1
+ // Readable 2.3.2
2
2
  // Variables
3
3
  // --------------------------------------------------
4
4
 
@@ -1,4 +1,4 @@
1
- // Simplex 2.3.0
1
+ // Simplex 2.3.2
2
2
  // Bootswatch.less
3
3
  // -----------------------------------------------------
4
4
 
@@ -192,6 +192,11 @@ div.subnav {
192
192
  background-color: $bodyBackground;
193
193
  }
194
194
 
195
+ & > li.disabled > a:hover {
196
+ background-color: darken($bodyBackground, 3%);
197
+ color: $grayLight;
198
+ }
199
+
195
200
  .dropdown {
196
201
 
197
202
  .dropdown-toggle .caret {
@@ -265,6 +270,10 @@ div.subnav {
265
270
  color: $linkColor;
266
271
  }
267
272
 
273
+ & > li.disabled > a:hover {
274
+ color: $grayLight;
275
+ }
276
+
268
277
  .dropdown .dropdown-toggle .caret {
269
278
  border-top-color: $textColor;
270
279
  border-bottom-color: $textColor;
@@ -401,11 +410,9 @@ legend {
401
410
  // -----------------------------------------------------
402
411
 
403
412
  .label {
404
- padding: 4px 4px 3px;
413
+ padding: 6px 12px;
405
414
  margin-left: 1px;
406
415
  margin-right: 1px;
407
- line-height: 26px;
408
- font-weight: normal;
409
416
  }
410
417
 
411
418
  // MISCELLANEOUS
@@ -1,4 +1,4 @@
1
- // Simplex 2.3.0
1
+ // Simplex 2.3.2
2
2
  // Variables
3
3
  // --------------------------------------------------
4
4
 
@@ -1,4 +1,4 @@
1
- // Slate 2.3.0
1
+ // Slate 2.3.2
2
2
  // Bootswatch
3
3
  // -----------------------------------------------------
4
4
 
@@ -19,10 +19,12 @@ code, pre {
19
19
  // SCAFFOLDING
20
20
  // -----------------------------------------------------
21
21
 
22
- hr, legend, .page-header {
23
- border-top: none;
24
- border-bottom: 1px solid darken($grayDarker, 5%);
25
- background-color: transparent;
22
+ legend, .page-header {
23
+ border-bottom: 1px solid $hrBorder;
24
+ }
25
+
26
+ hr {
27
+ border-bottom: none;
26
28
  }
27
29
 
28
30
  // NAVBAR
@@ -224,6 +226,11 @@ div.subnav {
224
226
  color: $white;
225
227
  }
226
228
 
229
+ & > li.disabled > a,
230
+ & > li.disabled > a:hover {
231
+ color: $gray;
232
+ }
233
+
227
234
  li > a:hover {
228
235
  background-color: transparent;
229
236
  color: $grayLighter;
@@ -350,6 +357,7 @@ div.subnav {
350
357
 
351
358
  li > a,
352
359
  li > span {
360
+
353
361
  border: 1px solid transparent;
354
362
  @include box-shadow('0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)');
355
363
  @include gradient-vertical-three-colors($gray, $grayDark, 70%, $grayDark);
@@ -363,6 +371,7 @@ div.subnav {
363
371
  .disabled a,
364
372
  .disabled a:hover {
365
373
  background-color: transparent;
374
+ @include gradient-vertical-three-colors($gray, $grayDark, 70%, $grayDark);
366
375
  }
367
376
  }
368
377
 
@@ -1,4 +1,4 @@
1
- // Slate 2.3.0
1
+ // Slate 2.3.2
2
2
  // Variables
3
3
  // --------------------------------------------------
4
4
 
@@ -162,7 +162,7 @@ $placeholderText: $grayLight !default;
162
162
 
163
163
  // Hr border color
164
164
  // -------------------------
165
- $hrBorder: $grayLighter !default;
165
+ $hrBorder: darken($grayDarker, 5%) !default;
166
166
 
167
167
 
168
168
  // Horizontal forms & lists