less-rails-bootswatch 0.2.9 → 0.2.10

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,7 +1,7 @@
1
1
  module Less
2
2
  module Rails
3
3
  module Bootswatch
4
- VERSION = "0.2.9"
4
+ VERSION = "0.2.10"
5
5
  end
6
6
  end
7
7
  end
@@ -19,15 +19,19 @@
19
19
  #gradient > .vertical-three-colors(@navbarBackground, @navbarBackground, 90%, @navbarBackgroundHighlight);
20
20
  }
21
21
 
22
+ .brand {
23
+ padding: 15px 20px;
24
+ }
25
+
26
+ .nav > li > a {
27
+ padding: 16px 10px 14px;
28
+ }
29
+
22
30
  .nav li.dropdown.active > .dropdown-toggle,
23
31
  .nav li.dropdown.active.open > .dropdown-toggle {
24
32
  background-color: @navbarLinkBackgroundActive;
25
33
  }
26
34
 
27
- .search-query {
28
- border: 1px solid darken(@linkColor, 10%);
29
- }
30
-
31
35
  .nav-collapse.in > .nav > li .dropdown-menu a {
32
36
  color: @white;
33
37
 
@@ -44,9 +48,20 @@
44
48
  }
45
49
  }
46
50
 
51
+ .search-query {
52
+ border: 1px solid darken(@linkColor, 10%);
53
+ }
54
+
47
55
  .btn-navbar:hover {
48
56
  background-color: darken(@white, 20%);
49
57
  }
58
+
59
+ .navbar-text {
60
+ padding: 19px 10px 18px;
61
+ line-height: 13px;
62
+ color: rgba(0, 0, 0, 0.5);
63
+ text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.25);
64
+ }
50
65
  }
51
66
 
52
67
  div.subnav {
@@ -145,7 +145,7 @@
145
145
 
146
146
  // Navbar
147
147
  // -------------------------
148
- @navbarHeight: 40px;
148
+ @navbarHeight: 50px;
149
149
  @navbarBackground: @linkColor;
150
150
  @navbarBackgroundHighlight: lighten(@linkColor, 10%);
151
151
 
@@ -6,21 +6,59 @@
6
6
  // TYPOGRAPHY
7
7
  // -----------------------------------------------------
8
8
 
9
- @import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700');
9
+ @import url('https://fonts.googleapis.com/css?family=News+Cycle:400,700');
10
10
 
11
- h1, h2, h3, h4, h5, h6, .navbar .brand {
12
- font-weight: 700;
11
+ h1, h2, h3, h4, h5, h6 {
12
+ line-height: 1.5em;
13
+
14
+ a {
15
+ color: @headingsColor;
16
+ }
17
+ }
18
+
19
+ h1 {
20
+ font-size: 48px;
21
+ }
22
+
23
+ h2 {
24
+ font-size: 36px;
25
+ }
26
+
27
+ h3 {
28
+ font-size: 28px;
29
+ }
30
+
31
+ h4 {
32
+ font-size: 20px;
33
+ }
34
+
35
+ h5 {
36
+ font-size: 13px;
37
+ }
38
+
39
+ h6 {
40
+ color: @black;
41
+ font-weight: bold;
13
42
  }
14
43
 
15
44
  // SCAFFOLDING
16
45
  // -----------------------------------------------------
17
46
 
18
- a {
19
- text-decoration: underline;
47
+ p > a,
48
+ address > a,
49
+ .breadcrumb a,
50
+ abbr[title] {
51
+ text-decoration: none;
52
+ border-bottom: 1px dotted;
53
+
54
+ &:hover {
55
+ text-decoration: none;
56
+ border-bottom: 1px solid;
57
+ }
20
58
  }
21
59
 
22
- .nav a, .navbar .brand, .subnav a, a.btn, .dropdown-menu a {
23
- text-decoration: none;
60
+ .page-header {
61
+ border-bottom: 2px solid @grayLighter;
24
62
  }
25
63
 
26
64
  // NAVBAR
@@ -28,106 +66,145 @@ a {
28
66
 
29
67
  .navbar {
30
68
 
69
+ font-family: @sansFontFamily;
70
+ font-weight: bold;
71
+
31
72
  .navbar-inner {
32
- @shadow: 0 2px 4px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
33
- .box-shadow(@shadow);
34
- border-top: 1px solid #E5E5E5;
73
+ border-top: 2px solid @grayLighter;
74
+ border-bottom: 2px solid @grayLighter;
35
75
  .border-radius(0);
76
+ .box-shadow(none);
36
77
  }
37
78
 
38
79
  .brand {
80
+ padding: 16px 20px 20px;
81
+ font-size: 24px;
82
+ font-weight: bold;
39
83
  text-shadow: none;
40
-
41
- &:hover {
42
- background-color: #EEEEEE;
43
- }
44
- }
45
-
46
- .navbar-text {
47
- line-height: 68px;
84
+ text-transform: uppercase;
48
85
  }
49
86
 
50
87
  .nav > li > a {
88
+ padding: 20px 10px 21px;
89
+ font-size: 18px;
51
90
  text-shadow: none;
91
+ text-transform: uppercase;
52
92
  }
53
93
 
54
- .dropdown-menu {
55
- .border-radius(0);
94
+ .nav > li.active > a {
95
+ background-color: transparent;
96
+ color: @headingsColor;
56
97
  }
57
98
 
58
- .nav li.dropdown.active > .dropdown-toggle,
59
- .nav li.dropdown.active > .dropdown-toggle:hover,
60
- .nav li.dropdown.open > .dropdown-toggle,
61
- .nav li.dropdown.active.open > .dropdown-toggle,
62
- .nav li.dropdown.active.open > .dropdown-toggle:hover {
63
- background-color: @grayLighter;
64
- color: @linkColor;
99
+ .navbar-text {
100
+ margin-top: 21px;
101
+ padding-left: 10px;
102
+ padding-right: 10px;
103
+ font-size: 18px;
104
+ line-height: 18px;
65
105
  }
66
106
 
67
- .nav li.dropdown .dropdown-toggle .caret,
68
- .nav .open .caret,
69
- .nav .open .dropdown-toggle:hover .caret {
70
- border-top-color: @black;
71
- opacity: 1;
107
+ .nav li.dropdown > .dropdown-toggle:hover,
108
+ .nav li.dropdown.active > .dropdown-toggle:hover {
109
+ color: @black;
72
110
  }
73
111
 
74
- .nav-collapse.in .nav li > a:hover {
75
- background-color: @grayLighter;
112
+ .nav li.dropdown > .dropdown-toggle .caret,
113
+ .nav li.dropdown.open > .dropdown-toggle:hover .caret {
114
+ border-top-color: @headingsColor;
115
+ border-bottom-color: @headingsColor;
76
116
  }
77
117
 
78
- .nav-collapse .nav li > a {
79
- color: @textColor;
80
- text-decoration: none;
81
- font-weight: normal;
118
+ .dropdown-menu {
119
+
120
+ top: 85%;
121
+ .border-radius(0);
122
+
123
+ a {
124
+ font-size: 15px;
125
+ font-weight: bold;
126
+ }
82
127
  }
83
128
 
84
- .nav-collapse .navbar-form,
85
- .nav-collapse .navbar-search {
86
- border-color: transparent;
129
+ .nav-collapse.collapse {
130
+
131
+ .nav li > a {
132
+ color: @headingsColor;
133
+
134
+ &:hover {
135
+ background-color: @dropdownLinkBackgroundHover;
136
+ }
137
+ }
138
+
139
+ .navbar-text {
140
+ margin-top: 0;
141
+ }
87
142
  }
88
143
 
89
144
  .navbar-search .search-query,
90
145
  .navbar-search .search-query:hover {
91
- border: 1px solid @grayLighter;
146
+ border: 2px solid @grayLighter;
92
147
  color: @textColor;
93
148
  .placeholder(@gray);
94
149
  }
95
150
  }
96
151
 
97
152
  div.subnav {
153
+
154
+ height: 54px;
98
155
  background-color: @bodyBackground;
99
156
  background-image: none;
100
- @shadow: 0 1px 2px rgba(0,0,0,.25);
101
- .box-shadow(@shadow);
157
+ .box-shadow(none);
158
+ border: 2px solid @grayLighter;
159
+ border-left: none;
160
+ border-right: none;
102
161
  .border-radius(0);
103
162
 
104
163
  &.subnav-fixed {
105
164
  top: @navbarHeight;
106
165
  }
107
166
 
108
- .nav > li > a:hover,
109
- .nav > .active > a,
110
- .nav > .active > a:hover {
111
- color: @textColor;
112
- text-decoration: none;
113
- font-weight: normal;
167
+ .nav > li > a,
168
+ .nav > li:first-child > a,
169
+ .nav > li.active > a {
170
+ padding: 20px 15px;
171
+ border-left: none;
172
+ border-right: none;
173
+ background-color: transparent;
174
+ .box-shadow(none);
175
+ font-family: @sansFontFamily;
176
+ color: @headingsColor;
177
+ font-size: 15px;
178
+ font-weight: bold;
179
+
180
+ &:hover {
181
+ padding: 20px 15px;
182
+ background-color: transparent;
183
+ .box-shadow(none);
184
+ color: @headingsColor;
185
+ }
114
186
  }
115
187
 
116
- .nav > li:first-child > a,
117
- .nav > li:first-child > a:hover {
118
- .border-radius(0);
188
+ li.dropdown > .dropdown-toggle .caret ,
189
+ li.dropdown > .dropdown-toggle:hover .caret,
190
+ li.dropdown.open > .dropdown-toggle .caret {
191
+ border-top-color: @headingsColor;
192
+ border-bottom-color: @headingsColor;
193
+ opacity: 1;
194
+ }
195
+
196
+ li.dropdown.open .dropdown-toggle,
197
+ li.dropdown.open .dropdown-toggle:hover {
198
+ background-color: @bodyBackground;
199
+ color: @headingsColor;
119
200
  }
120
201
  }
121
202
 
122
203
  // BUTTONS
123
204
  // -----------------------------------------------------
124
205
 
125
- .btn-primary {
126
- .buttonBackground(lighten(@linkColor, 5%), @linkColor);
127
- }
128
-
129
206
  [class^="icon-"], [class*=" icon-"] {
130
- vertical-align: -2px;
207
+ vertical-align: baseline;
131
208
  }
132
209
 
133
210
  // MODALS
@@ -142,30 +219,97 @@ div.subnav {
142
219
  border-bottom: none;
143
220
  }
144
221
 
145
- .modal-header .close {
146
- text-decoration: none;
147
- }
148
-
149
222
  .modal-footer {
150
223
  background: transparent;
151
224
  .box-shadow(none);
152
225
  border-top: none;
153
226
  }
154
227
 
228
+ .close,
229
+ .close:hover {
230
+ border-bottom: none;
231
+ }
155
232
 
156
233
  // MISC
157
234
  // -----------------------------------------------------
158
235
 
159
- code, pre, pre.prettyprint, .well {
236
+ .hero-unit {
237
+ .box-shadow(none);
238
+ border: 1px solid rgba(0,0,0,.05);
239
+ .border-radius(0);
240
+
241
+ h1 {
242
+ line-height: 1.5em;
243
+ }
244
+ }
245
+
246
+ .well {
247
+ .border-radius(0);
160
248
  background-color: @grayLighter;
249
+ .box-shadow(none);
250
+
161
251
  }
162
252
 
163
- .hero-unit {
164
- .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
165
- border: 1px solid rgba(0,0,0,.05);
253
+ .table-bordered {
166
254
  .border-radius(0);
255
+ .box-shadow(none);
167
256
  }
168
257
 
169
- .table-bordered, .well, .prettyprint {
258
+
259
+ legend {
260
+ border-bottom: 2px solid @grayLighter;
261
+ font-family: @headingsFontFamily;
262
+ font-weight: @headingsFontWeight;
263
+ color: @headingsColor;
264
+ }
265
+
266
+ a.thumbnail:hover {
267
+ .box-shadow(0 1px 3px 1px rgba(0, 0, 0, 0.3));
268
+ border-color: #ddd;
269
+ }
270
+
271
+ code, pre, pre.prettyprint {
170
272
  .border-radius(0);
273
+ background-color: @grayLighter;
274
+ .box-shadow(none);
275
+ }
276
+
277
+ hr {
278
+ border-bottom: 1px solid @grayLighter;
279
+ }
280
+
281
+ @media (max-width: 768px) {
282
+
283
+ div.subnav {
284
+ height: auto;
285
+
286
+ .nav > li.active > a {
287
+ border-top: none;
288
+ }
289
+
290
+ .nav > li:hover > a,
291
+ .nav > li:first-child:hover > a,
292
+ .nav > li.active:hover > a,
293
+ .nav > li.dropdown.open .dropdown-toggle,
294
+ .nav > li.dropdown.open .dropdown-toggle:hover {
295
+ background-color: @dropdownLinkBackgroundHover;
296
+ }
297
+ }
298
+
299
+ .nav-tabs .open .dropdown-toggle,
300
+ .nav-pills .open .dropdown-toggle,
301
+ .nav > li.dropdown.open.active > a:hover {
302
+ border-color: #e5e5e5;
303
+ }
304
+ }
305
+
306
+ @media (max-width: 979px) {
307
+
308
+ .nav-collapse .navbar-form,
309
+ .nav-collapse .navbar-search {
310
+ margin-bottom: 0;
311
+ border-top: 2px solid @grayLighter;
312
+ border-bottom: 2px solid @grayLighter;
313
+ }
314
+
171
315
  }
@@ -12,9 +12,9 @@
12
12
  // -------------------------
13
13
  @black: #000;
14
14
  @grayDarker: #222;
15
- @grayDark: #333;
16
- @gray: #888;
17
- @grayLight: #999;
15
+ @grayDark: #888;
16
+ @gray: #999;
17
+ @grayLight: #bbb;
18
18
  @grayLighter: #eee;
19
19
  @white: #fff;
20
20
 
@@ -33,37 +33,37 @@
33
33
 
34
34
  // Scaffolding
35
35
  // -------------------------
36
- @bodyBackground: #FCFBFD;
37
- @textColor: @grayDarker;
36
+ @bodyBackground: @white;
37
+ @textColor: @grayDark;
38
38
 
39
39
 
40
40
  // Links
41
41
  // -------------------------
42
42
  @linkColor: @textColor;
43
- @linkColorHover: @gray;
43
+ @linkColorHover: @linkColor;
44
44
 
45
45
 
46
46
  // Typography
47
47
  // -------------------------
48
- @sansFontFamily: 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif;
48
+ @sansFontFamily: "News Cycle", "Arial Narrow Bold", sans-serif;
49
49
  @serifFontFamily: Georgia, "Times New Roman", Times, serif;
50
50
  @monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace;
51
51
 
52
- @baseFontSize: 14px;
53
- @baseFontFamily: @sansFontFamily;
52
+ @baseFontSize: 13px;
53
+ @baseFontFamily: @serifFontFamily;
54
54
  @baseLineHeight: 18px;
55
- @altFontFamily: @serifFontFamily;
55
+ @altFontFamily: @sansFontFamily;
56
56
 
57
- @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
57
+ @headingsFontFamily: @sansFontFamily; // empty to use BS default, @baseFontFamily
58
58
  @headingsFontWeight: bold; // instead of browser default, bold
59
- @headingsColor: inherit; // empty to use BS default, @textColor
59
+ @headingsColor: @black; // empty to use BS default, @textColor
60
60
 
61
61
 
62
62
  // Tables
63
63
  // -------------------------
64
64
  @tableBackground: transparent; // overall background-color
65
- @tableBackgroundAccent: @grayLighter; // for striping
66
- @tableBackgroundHover: #f5f5f5; // for hover
65
+ @tableBackgroundAccent: #f5f5f5; // for striping
66
+ @tableBackgroundHover: @grayLighter; // for hover
67
67
  @tableBorder: #ddd; // table and cell border
68
68
 
69
69
 
@@ -71,25 +71,25 @@
71
71
  // -------------------------
72
72
  @btnBackground: @white;
73
73
  @btnBackgroundHighlight: darken(@white, 10%);
74
- @btnBorder: darken(@white, 20%);
74
+ @btnBorder: darken(@white, 15%);
75
75
 
76
- @btnPrimaryBackground: @linkColor;
77
- @btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%);
76
+ @btnPrimaryBackground: lighten(@linkColor, 5%);
77
+ @btnPrimaryBackgroundHighlight: @linkColor;
78
78
 
79
- @btnInfoBackground: #5bc0de;
80
- @btnInfoBackgroundHighlight: #2f96b4;
79
+ @btnInfoBackground: lighten(@blue, 5%);
80
+ @btnInfoBackgroundHighlight: @blue;
81
81
 
82
- @btnSuccessBackground: #62c462;
83
- @btnSuccessBackgroundHighlight: #51a351;
82
+ @btnSuccessBackground: lighten(@green, 5%);
83
+ @btnSuccessBackgroundHighlight: @green;
84
84
 
85
85
  @btnWarningBackground: lighten(@orange, 10%);
86
86
  @btnWarningBackgroundHighlight: @orange;
87
87
 
88
- @btnDangerBackground: #ee5f5b;
89
- @btnDangerBackgroundHighlight: #bd362f;
88
+ @btnDangerBackground: lighten(@red, 10%);
89
+ @btnDangerBackgroundHighlight: @red;
90
90
 
91
- @btnInverseBackground: @linkColor;
92
- @btnInverseBackgroundHighlight: darken(@linkColor, 5%);
91
+ @btnInverseBackground: lighten(@grayDark, 5%);
92
+ @btnInverseBackgroundHighlight: @grayDark;
93
93
 
94
94
 
95
95
  // Forms
@@ -104,11 +104,11 @@
104
104
  // -------------------------
105
105
  @dropdownBackground: @bodyBackground;
106
106
  @dropdownBorder: rgba(0,0,0,.2);
107
- @dropdownLinkColor: @textColor;
108
- @dropdownLinkColorHover: @textColor;
109
- @dropdownLinkBackgroundHover: #eee;
110
- @dropdownDividerTop: #e5e5e5;
111
- @dropdownDividerBottom: @white;
107
+ @dropdownLinkColor: @headingsColor;
108
+ @dropdownLinkColorHover: @headingsColor;
109
+ @dropdownLinkBackgroundHover: @grayLighter;
110
+ @dropdownDividerTop: @grayLighter;
111
+ @dropdownDividerBottom: @grayLighter;
112
112
 
113
113
 
114
114
 
@@ -145,16 +145,16 @@
145
145
 
146
146
  // Navbar
147
147
  // -------------------------
148
- @navbarHeight: 70px;
148
+ @navbarHeight: 60px;
149
149
  @navbarBackground: @bodyBackground;
150
150
  @navbarBackgroundHighlight: @bodyBackground;
151
151
 
152
152
  @navbarText: @textColor;
153
- @navbarLinkColor: @linkColor;
154
- @navbarLinkColorHover: @linkColor;
155
- @navbarLinkColorActive: @navbarLinkColorHover;
156
- @navbarLinkBackgroundHover: @grayLighter;
157
- @navbarLinkBackgroundActive: @grayLighter;
153
+ @navbarLinkColor: @headingsColor;
154
+ @navbarLinkColorHover: @headingsColor;
155
+ @navbarLinkColorActive: @headingsColor;
156
+ @navbarLinkBackgroundHover: transparent;
157
+ @navbarLinkBackgroundActive: transparent;
158
158
 
159
159
  @navbarSearchBackground: lighten(@navbarBackground, 25%);
160
160
  @navbarSearchBackgroundFocus: @white;
@@ -166,7 +166,7 @@
166
166
  // Hero unit
167
167
  // -------------------------
168
168
  @heroUnitBackground: @grayLighter;
169
- @heroUnitHeadingColor: inherit;
169
+ @heroUnitHeadingColor: @headingsColor;
170
170
  @heroUnitLeadColor: inherit;
171
171
 
172
172
 
@@ -69,7 +69,7 @@ footer.footer {
69
69
  font-size: @baseFontSize;
70
70
  font-weight: bold;
71
71
  line-height: 1em;
72
- padding: 10px 10px 11px;
72
+ padding: 11px 10px;
73
73
 
74
74
  &:hover {
75
75
  color: @linkColorHover;
@@ -3,12 +3,14 @@
3
3
  // Version: 2.0.4
4
4
  // -----------------------------------------------------
5
5
 
6
- @boxShadow: 0 1px 1px rgba(0, 0, 0, 0.3);
6
+ @import url('https://fonts.googleapis.com/css?family=Josefin+Sans:300,400,700');
7
+
8
+ @boxShadow: 1px 1px 1px rgba(0, 0, 0, 0.2);
7
9
 
8
10
  // TYPOGRAPHY
9
11
  // -----------------------------------------------------
10
12
 
11
- h6, .hero-unit {
13
+ h6 {
12
14
  color: @headingsColor;
13
15
  }
14
16
 
@@ -19,32 +21,35 @@ h6, .hero-unit {
19
21
 
20
22
  .navbar-inner {
21
23
  .box-shadow(inset 0 -1px #CFCACA);
22
- border-bottom: 1px solid #FFF;
23
- border-bottom: none;
24
24
  }
25
25
 
26
26
  .brand {
27
- padding-top: 10px;
28
- color: @headingsColor;
27
+ padding: 12px 20px 8px;
28
+ font-weight: bold;
29
+
30
+ &:hover {
31
+ color: @orange;
32
+ }
29
33
  }
30
34
 
31
35
  .navbar-text {
32
- padding: 14px 10px 11px;
33
- text-shadow: none;
34
- font-weight: normal;
35
- font-size: 11px;
36
+ padding: 14px 15px 7px;
36
37
  line-height: 19px;
38
+ color: @grayLight;
39
+ }
40
+
41
+ .divider-vertical {
42
+ height: @navbarHeight - 1;
43
+ background-color: @hrBorder;
37
44
  }
38
45
 
39
46
  .nav > li > a {
40
- padding-top: 14px;
47
+ padding: 14px 15px 7px;
41
48
  text-shadow: none;
42
- font-weight: normal;
43
- font-size: 11px;
44
- }
45
49
 
46
- .nav > li > a:hover {
47
- text-decoration: underline;
50
+ &:hover {
51
+ text-decoration: none;
52
+ }
48
53
  }
49
54
 
50
55
  .nav .active > a,
@@ -52,24 +57,41 @@ h6, .hero-unit {
52
57
  background-color: transparent;
53
58
  }
54
59
 
55
- .nav-collapse .nav li.dropdown > .dropdown-toggle:hover {
56
- color: @textColor;
60
+ .navbar-search {
61
+ margin-top: 5px;
62
+
63
+ input[type="text"] {
64
+ margin-bottom: 5px;
65
+ }
57
66
  }
58
67
 
59
- .nav li.dropdown .dropdown-toggle .caret,
60
- .nav li.open.dropdown .dropdown-toggle .caret {
68
+ .nav li.dropdown.open > .dropdown-toggle,
69
+ .nav li.dropdown.active > .dropdown-toggle:hover {
70
+ color: @linkColor;
71
+ }
72
+
73
+ .nav li.dropdown .dropdown-toggle .caret {
61
74
  border-top-color: @textColor;
75
+ border-bottom-color: @textColor;
76
+ opacity: 1;
62
77
  }
63
78
 
64
- .nav-collapse .nav li > a {
65
- color: @headingsColor;
66
- font-weight: normal;
79
+ .nav li.dropdown .dropdown-toggle:hover .caret,
80
+ .nav li.dropdown.active > .dropdown-toggle .caret,
81
+ .nav li.dropdown.open .dropdown-toggle .caret {
82
+ border-top-color: @linkColor;
83
+ border-bottom-color: @linkColor;
67
84
  }
68
85
 
69
- .nav-collapse .nav li > a:hover {
70
- background-color: transparent;
71
- color: @black;
72
- text-decoration: underline;
86
+ .nav-collapse.collapse {
87
+
88
+ .nav li > a {
89
+ color: @textColor;
90
+
91
+ &:hover {
92
+ background-color: @grayLighter;
93
+ }
94
+ }
73
95
  }
74
96
  }
75
97
 
@@ -85,21 +107,50 @@ div.subnav {
85
107
  }
86
108
 
87
109
  .nav > li > a {
88
- padding-top: 12px;
110
+ padding: 14px 12px 10px;
89
111
  color: @navbarText;
90
- font-weight: normal;
91
- font-size: 11px;
112
+ border-left-color: transparent;
113
+ border-right-color: transparent;
92
114
 
93
115
  &:hover {
94
- text-decoration: underline;
116
+ background-color: transparent;
117
+ color: @linkColor;
95
118
  }
96
119
  }
97
120
 
98
- .nav > li.open > a,
99
- .nav > li.open > a:hover {
121
+ .nav > li.active > a,
122
+ .nav > li.active > a:hover {
123
+ border-left-color: transparent;
124
+ border-right-color: transparent;
125
+ background-color: transparent;
126
+ .box-shadow(none);
127
+ color: @linkColor;
128
+ }
129
+
130
+ .nav > li.dropdown.open > a,
131
+ .nav > li.dropdown.open > a:hover {
132
+ border-left-color: transparent;
133
+ border-right-color: transparent;
134
+ background-color: transparent;
135
+ color: @linkColor;
136
+ }
137
+
138
+ .nav li.dropdown .dropdown-toggle .caret {
139
+ border-top-color: @textColor;
140
+ border-bottom-color: @textColor;
141
+ opacity: 1;
142
+ }
143
+
144
+ .nav li.dropdown .dropdown-toggle:hover .caret,
145
+ .nav li.dropdown.active .dropdown-toggle .caret,
146
+ .nav li.dropdown.open .dropdown-toggle .caret {
147
+ border-top-color: @linkColor;
148
+ border-bottom-color: @linkColor;
149
+ opacity: 1;
150
+ }
151
+
152
+ .dropdown.open:hover .dropdown-toggle {
100
153
  background-color: transparent;
101
- border-left: 1px solid whiteSmoke;
102
- border-right: 1px solid #E5E5E5;
103
154
  }
104
155
  }
105
156
 
@@ -114,49 +165,142 @@ div.subnav {
114
165
  // -----------------------------------------------------
115
166
 
116
167
  .nav .nav-header {
168
+ font-size: 13px;
117
169
  font-weight: normal;
118
170
  text-transform: none;
119
171
  }
120
172
 
121
- .nav > li > a {
122
- font-size: 11px;
123
- border-width: 1px;
124
- }
173
+ .nav-tabs {
125
174
 
126
- .dropdown-menu {
127
- .border-radius(0);
128
- font-size: 11px;
129
- }
175
+ & > li > a {
176
+ background-color: darken(@bodyBackground, 3%);
177
+ border: 1px solid #ccc;
178
+ color: @textColor;
130
179
 
131
- .dropdown.open .dropdown-toggle {
132
- color: @headingsColor;
133
- }
180
+ &:hover {
181
+ border: 1px solid #ccc;
182
+ background-color: @dropdownLinkBackgroundHover;
183
+ color: @linkColor;
184
+ }
185
+ }
134
186
 
135
- .nav-tabs > li > a,
136
- .nav-tabs > li > a:hover,
137
- .tabbable > .nav-tabs > li > a,
138
- .tabbable > .nav-tabs > li > a:hover {
139
- background-color: darken(@bodyBackground, 3%);
140
- border: 1px solid #ccc;
141
- }
187
+ & > li.active > a,
188
+ & > li.active > a:hover {
189
+ background-color: @bodyBackground;
190
+ }
142
191
 
143
- .tabbable > .nav-tabs > li.active > a {
144
- border-bottom: 1px solid transparent;
192
+ .dropdown {
193
+
194
+ .dropdown-toggle .caret {
195
+ border-top-color: @textColor;
196
+ border-bottom-color: @textColor;
197
+ opacity: 1;
198
+ }
199
+
200
+ &:hover .dropdown-toggle .caret {
201
+ border-top-color: @linkColor;
202
+ border-bottom-color: @linkColor;
203
+ }
204
+ }
205
+
206
+ .dropdown.open .dropdown-toggle {
207
+
208
+ background-color: @dropdownLinkBackgroundHover;
209
+ border-color: #ccc;
210
+ color: @linkColor;
211
+
212
+ .caret,
213
+ &:hover .caret {
214
+ border-top-color: @linkColor;
215
+ border-bottom-color: @linkColor;
216
+ opacity: 1;
217
+ }
218
+ }
219
+
220
+ .dropdown-menu {
221
+
222
+ .border-radius(0);
223
+
224
+ a {
225
+ padding: 8px 15px 3px;
226
+ }
227
+ }
145
228
  }
146
229
 
147
- .tabbable.tabs-below > .nav-tabs > li.active > a,
148
- .tabbable.tabs-left > .nav-tabs > li.active > a,
149
- .tabbable.tabs-right > .nav-tabs > li.active > a {
150
- border-bottom: 1px solid #ccc;
230
+ .tabbable {
231
+
232
+ .nav-tabs > li > a,
233
+ .nav-tabs > li > a:hover {
234
+ border: 1px solid #ccc;
235
+ }
236
+
237
+ .nav-tabs > li.active > a {
238
+ border-bottom: 1px solid transparent;
239
+ }
240
+
241
+ &.tabs-below > .nav-tabs > li.active > a,
242
+ &.tabs-left > .nav-tabs > li.active > a,
243
+ &.tabs-right > .nav-tabs > li.active > a {
244
+ border-bottom: 1px solid #ccc;
245
+ }
151
246
  }
152
247
 
153
- .nav-pills > li > a:hover {
154
- background-color: transparent;
248
+ .nav-pills {
249
+
250
+ li > a {
251
+ color: @textColor;
252
+
253
+ &:hover {
254
+ background-color: @dropdownLinkBackgroundHover;
255
+ color: @linkColor;
256
+ }
257
+ }
258
+
259
+ li.active > a,
260
+ li.active > a:hover {
261
+ background-color: @dropdownLinkBackgroundHover;
262
+ color: @linkColor;
263
+ }
264
+
265
+ .dropdown .dropdown-toggle .caret {
266
+ border-top-color: @textColor;
267
+ border-bottom-color: @textColor;
268
+ opacity: 1;
269
+ }
270
+
271
+ .dropdown .dropdown-toggle:hover .caret {
272
+ border-top-color: @linkColor;
273
+ border-bottom-color: @linkColor;
274
+ }
275
+
276
+ .dropdown.open .dropdown-toggle,
277
+ .dropdown.open:hover .dropdown-toggle {
278
+ background-color: @dropdownLinkBackgroundHover;
279
+ color: @linkColor;
280
+
281
+ .caret {
282
+ border-top-color: @linkColor;
283
+ border-bottom-color: @linkColor;
284
+ }
285
+ }
155
286
  }
156
287
 
157
- .nav-tabs > li.active > a,
158
- .nav-tabs > li.active > a:hover {
159
- background-color: @bodyBackground;
288
+ .nav-list {
289
+
290
+ li > a {
291
+ color: @textColor;
292
+
293
+ &:hover {
294
+ background-color: @dropdownLinkBackgroundHover;
295
+ color: @linkColor;
296
+ }
297
+ }
298
+
299
+ li.active > a,
300
+ li.active > a:hover {
301
+ background-color: @dropdownLinkBackgroundHover;
302
+ color: @linkColor;
303
+ }
160
304
  }
161
305
 
162
306
  // FORMS
@@ -174,55 +318,31 @@ legend {
174
318
  }
175
319
 
176
320
  .help-inline, .help-block {
177
- font-size: 11px;
321
+ font-size: 13px;
178
322
  }
179
323
 
180
- // TABLES
181
- // -----------------------------------------------------
182
-
183
-
184
324
  // BUTTONS
185
325
  // -----------------------------------------------------
186
326
 
187
327
  .btn {
188
- .border-radius(2px);
189
- font-weight: bold;
190
- #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%));
328
+ padding: 6px 10px 2px;
191
329
  }
192
330
 
193
- .btn-primary {
194
- .buttonBackground(lighten(@btnPrimaryBackground, 5%), @btnPrimaryBackground);
331
+ .btn-large {
332
+ padding: 11px 14px 8px;
195
333
  }
196
334
 
197
- .btn-warning {
198
- .buttonBackground(lighten(@orange, 5%), @orange);
335
+ .btn-small {
336
+ padding: 5px 9px 3px;
199
337
  }
200
338
 
201
- .btn-danger {
202
- .buttonBackground(lighten(@red, 5%), @red);
203
- }
204
-
205
- .btn-success {
206
- .buttonBackground(lighten(@green, 5%), @green);
207
- }
208
-
209
- .btn-info {
210
- .buttonBackground(lighten(#5bc0de, 5%), #5bc0de);
211
- }
212
-
213
- .btn-inverse {
214
- .buttonBackground(lighten(@purple, 5%), @purple);
339
+ .btn-micro {
340
+ padding: 3px 6px 1px;
215
341
  }
216
342
 
217
343
  // MODALS
218
344
  // -----------------------------------------------------
219
345
 
220
- .modal,
221
- .modal-header,
222
- .modal-footer {
223
- .border-radius(0);
224
- }
225
-
226
346
  .modal-header {
227
347
  border-bottom: none;
228
348
  }
@@ -240,12 +360,12 @@ legend {
240
360
  // -----------------------------------------------------
241
361
 
242
362
  i[class^="icon-"]{
243
- opacity: 0.6;
363
+ opacity: 0.5;
244
364
  vertical-align: -2px;
245
365
  }
246
366
 
247
- .alert, .alert p, .alert-heading {
248
- font-size: 11px;
367
+ hr {
368
+ border-bottom: none;
249
369
  }
250
370
 
251
371
  .progress {
@@ -253,27 +373,70 @@ i[class^="icon-"]{
253
373
  }
254
374
 
255
375
  .label {
256
- font-size: 11px;
376
+ padding: 4px 4px 3px;
377
+ margin-left: 1px;
378
+ margin-right: 1px;
379
+ line-height: 26px;
257
380
  font-weight: normal;
258
381
  }
259
382
 
260
383
  .hero-unit {
261
- background-color: @white;
262
- .box-shadow(@boxShadow);
384
+ background-color: @navbarBackground;
385
+ .box-shadow(@boxShadow~", "-1px -1px 0 rgba(0, 0, 0, 0.1));
263
386
  }
264
387
 
265
388
  .well {
266
- .box-shadow(@boxShadow);
389
+ .box-shadow(@boxShadow~", "-1px -1px 0 rgba(0, 0, 0, 0.1));
267
390
  background-color: @white;
268
391
  border: none;
269
392
  }
270
393
 
394
+ .thumbnail {
395
+ padding: 10px;
396
+ background-color: @white;
397
+ }
398
+
271
399
  .breadcrumb {
272
- .box-shadow(@boxShadow);
400
+ .box-shadow(@boxShadow~", "-1px -1px 0 rgba(0, 0, 0, 0.1));
273
401
  border: 0px solid transparent;
274
- font-size: 11px;
402
+
403
+ li {
404
+ padding-top: 5px;
405
+ text-shadow: none;
406
+ }
407
+
408
+ a {
409
+ text-shadow: none;
410
+ }
411
+
412
+ a:hover {
413
+ text-decoration: none;
414
+ }
415
+ }
416
+
417
+ .pagination {
418
+
419
+ li > a {
420
+ padding: 4px 14px 0;
421
+ color: @textColor;
422
+
423
+ &:hover {
424
+ background-color: @dropdownLinkBackgroundHover;
425
+ color: @linkColor;
426
+ }
427
+ }
428
+
429
+ li.active > a {
430
+ background-color: @dropdownLinkBackgroundHover;
431
+ color: @linkColor;
432
+ }
275
433
  }
276
434
 
277
- footer.footer p {
278
- font-size: 11px;
435
+ @media (max-width: 979px) {
436
+
437
+ .nav-collapse.collapse .navbar-form,
438
+ .nav-collapse.collapse .navbar-search {
439
+ border-top: 1px solid @grayLighter;
440
+ border-bottom: 1px solid @grayLighter;
441
+ }
279
442
  }
@@ -21,42 +21,42 @@
21
21
 
22
22
  // Accent colors
23
23
  // -------------------------
24
- @blue: #15C;
24
+ @blue: #029ACF;
25
25
  @blueDark: #043755;
26
26
  @green: #3D9400;
27
27
  @red: #E32C3B;
28
28
  @yellow: #FFCA27;
29
- @orange: #FF6600;
29
+ @orange: #DA370F;
30
30
  @pink: #ED2590;
31
31
  @purple: #9B479F;
32
32
 
33
33
 
34
34
  // Scaffolding
35
35
  // -------------------------
36
- @bodyBackground: #F3F3F3;
36
+ @bodyBackground: #F7F7F7;
37
37
  @textColor: @gray;
38
38
 
39
39
 
40
40
  // Links
41
41
  // -------------------------
42
- @linkColor: #366DDC;
43
- @linkColorHover: darken(@linkColor, 15%);
42
+ @linkColor: @orange;
43
+ @linkColorHover: @linkColor;
44
44
 
45
45
 
46
46
  // Typography
47
47
  // -------------------------
48
- @sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
48
+ @sansFontFamily: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
49
49
  @serifFontFamily: Georgia, "Times New Roman", Times, serif;
50
50
  @monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace;
51
51
 
52
- @baseFontSize: 13px;
52
+ @baseFontSize: 15px;
53
53
  @baseFontFamily: @sansFontFamily;
54
- @baseLineHeight: 18px;
54
+ @baseLineHeight: 20px;
55
55
  @altFontFamily: @serifFontFamily;
56
56
 
57
57
  @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
58
58
  @headingsFontWeight: bold; // instead of browser default, bold
59
- @headingsColor: @grayDark; // empty to use BS default, @textColor
59
+ @headingsColor: inherit; // empty to use BS default, @textColor
60
60
 
61
61
 
62
62
  // Tables
@@ -73,20 +73,20 @@
73
73
  @btnBackgroundHighlight: darken(@white, 10%);
74
74
  @btnBorder: darken(@white, 20%);
75
75
 
76
- @btnPrimaryBackground: @linkColor;
77
- @btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%);
76
+ @btnPrimaryBackground: lighten(@linkColor, 5%);
77
+ @btnPrimaryBackgroundHighlight: @linkColor;
78
78
 
79
- @btnInfoBackground: #5bc0de;
80
- @btnInfoBackgroundHighlight: #2f96b4;
79
+ @btnInfoBackground: lighten(#5bc0de, 5%);
80
+ @btnInfoBackgroundHighlight: #5bc0de;
81
81
 
82
- @btnSuccessBackground: #62c462;
83
- @btnSuccessBackgroundHighlight: #51a351;
82
+ @btnSuccessBackground: lighten(@green, 5%);
83
+ @btnSuccessBackgroundHighlight: @green;
84
84
 
85
- @btnWarningBackground: lighten(@orange, 15%);
86
- @btnWarningBackgroundHighlight: @orange;
85
+ @btnWarningBackground: lighten(@yellow, 5%);
86
+ @btnWarningBackgroundHighlight: @yellow;
87
87
 
88
- @btnDangerBackground: #ee5f5b;
89
- @btnDangerBackgroundHighlight: #bd362f;
88
+ @btnDangerBackground: lighten(@red, 5%);
89
+ @btnDangerBackgroundHighlight: @red;
90
90
 
91
91
  @btnInverseBackground: @gray;
92
92
  @btnInverseBackgroundHighlight: @grayDarker;
@@ -104,9 +104,9 @@
104
104
  // -------------------------
105
105
  @dropdownBackground: @white;
106
106
  @dropdownBorder: rgba(0,0,0,.2);
107
- @dropdownLinkColor: @grayDark;
108
- @dropdownLinkColorHover: @white;
109
- @dropdownLinkBackgroundHover: @linkColor;
107
+ @dropdownLinkColor: @textColor;
108
+ @dropdownLinkColorHover: @linkColor;
109
+ @dropdownLinkBackgroundHover: #FBEBE9;
110
110
  @dropdownDividerTop: #e5e5e5;
111
111
  @dropdownDividerBottom: @white;
112
112
 
@@ -146,13 +146,13 @@
146
146
  // Navbar
147
147
  // -------------------------
148
148
  @navbarHeight: 40px;
149
- @navbarBackground: #F8F8F8;
149
+ @navbarBackground: #fefefe;
150
150
  @navbarBackgroundHighlight: @navbarBackground;
151
151
 
152
152
  @navbarText: @gray;
153
153
  @navbarLinkColor: @gray;
154
- @navbarLinkColorHover: @grayDark;
155
- @navbarLinkColorActive: @navbarLinkColorHover;
154
+ @navbarLinkColorHover: @orange;
155
+ @navbarLinkColorActive: @orange;
156
156
  @navbarLinkBackgroundHover: transparent;
157
157
  @navbarLinkBackgroundActive: @navbarBackground;
158
158
 
@@ -43,7 +43,7 @@
43
43
  border: 1px solid darken(@navbarBackground, 15%);
44
44
  }
45
45
 
46
- .nav-collapse.in > .nav li > a {
46
+ .nav-collapse.collapse > .nav li > a {
47
47
  color: @white;
48
48
  border-left: 0px solid @orange;
49
49
  border-right: 0px solid @orange;
@@ -53,8 +53,8 @@
53
53
  }
54
54
  }
55
55
 
56
- .nav-collapse.in .navbar-form,
57
- .nav-collapse.in .navbar-search {
56
+ .nav-collapse.collapse .navbar-form,
57
+ .nav-collapse.collapse .navbar-search {
58
58
  border-top: 0px solid @orange;
59
59
  border-bottom: 0px solid @orange;
60
60
  .box-shadow(none);
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: less-rails-bootswatch
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.9
4
+ version: 0.2.10
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-08-04 00:00:00.000000000 Z
12
+ date: 2012-08-06 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: less-rails-bootstrap