less-rails-bootswatch 0.2.8 → 0.2.9

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.8"
4
+ VERSION = "0.2.9"
5
5
  end
6
6
  end
7
7
  end
@@ -8,9 +8,8 @@
8
8
 
9
9
  .navbar {
10
10
 
11
- border-bottom: 1px solid #CACACA;
12
-
13
11
  .navbar-inner {
12
+ border-bottom: 1px solid #CACACA;
14
13
  .box-shadow(0 1px 0 rgba(255,255,255,0.4)~", "0 0 10px rgba(0,0,0,0.1));
15
14
  }
16
15
 
@@ -22,34 +21,33 @@
22
21
  }
23
22
  }
24
23
 
25
- .navbar-text {
26
- line-height: 38px;
27
- padding: 0 10px;
28
- }
24
+ .nav > li.active > a,
25
+ .nav > li.dropdown > .dropdown-toggle,
26
+ .nav > li.dropdown.active > .dropdown-toggle,
27
+ .nav > li.dropdown.open > .dropdown-toggle,
28
+ .nav > li.dropdown.open.active > .dropdown-toggle {
29
29
 
30
- .nav > li > a {
31
- font-weight: bold;
32
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
33
- }
34
-
35
- .nav .active > a {
36
- background-color: transparent;
37
30
  color: @textColor;
38
31
 
39
32
  &:hover {
40
- background-color: transparent;
41
33
  color: @linkColor;
42
34
  }
35
+
36
+ .caret {
37
+ border-top-color: @textColor;
38
+ }
43
39
  }
44
40
 
45
- .nav > li > a:hover,
46
- .nav li.open.dropdown .dropdown-toggle {
47
- color: @linkColor;
41
+ .navbar-text {
42
+ margin-top: 2px;
43
+ padding: 0 10px;
44
+ line-height: 38px;
48
45
  }
49
46
 
50
- .nav .dropdown-toggle .caret {
51
- border-top-color: @textColor;
52
- opacity: 1;
47
+ .nav > li > a {
48
+ padding: 11px 10px 9px;
49
+ font-weight: bold;
50
+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
53
51
  }
54
52
 
55
53
  .navbar-search .search-query,
@@ -75,27 +73,15 @@
75
73
 
76
74
  color: @textColor;
77
75
 
78
- .caret {
79
- border-top-color: @grayLight;
80
- }
81
76
  }
82
77
 
83
78
  .nav-collapse.in > .nav li > a:hover {
84
79
  text-shadow: none;
85
80
  color: @linkColor;
86
81
  background-color: transparent;
87
-
88
- .caret {
89
- border-top-color: @white;
90
- }
91
82
  }
92
83
  }
93
84
 
94
- .nav li.open.dropdown .caret,
95
- .nav .dropdown-toggle:hover .caret {
96
- border-top-color: @linkColor;
97
- }
98
-
99
85
  div.subnav {
100
86
 
101
87
  .nav > li > a {
@@ -111,22 +97,39 @@ div.subnav {
111
97
  color: @textColor;
112
98
 
113
99
  &:hover {
114
- color: @grayDark;
100
+ color: @textColor;
115
101
  }
116
102
  }
117
103
 
118
- .nav > li > .dropdown-toggle {
104
+ .nav > li.dropdown > .dropdown-toggle {
119
105
  background-color: transparent;
120
106
  }
121
107
 
122
108
  .nav > li.dropdown.open > .dropdown-toggle {
123
109
  border-left: 1px solid whiteSmoke;
124
110
  border-right: 1px solid #E5E5E5;
125
- color: @linkColor;
111
+ color: @textColor;
112
+
113
+ &:hover {
114
+ color: @linkColor;
115
+ }
116
+ }
117
+ }
118
+
119
+ .nav > li.dropdown > .dropdown-toggle,
120
+ .nav > li.dropdown.active > .dropdown-toggle,
121
+ .nav > li.dropdown.open > .dropdown-toggle,
122
+ .nav > li.dropdown.open.active > .dropdown-toggle {
123
+
124
+ .caret {
125
+ border-top: 4px solid @textColor;
126
+ border-top-color: @textColor;
127
+ opacity: 1;
126
128
  }
127
129
 
128
- .nav > .open > .dropdown-toggle:hover .caret {
129
- border-top-color: @linkColor;
130
+ &:hover .caret {
131
+ border-top: 4px solid @linkColorHover;
132
+ border-top-color: @linkColorHover;
130
133
  }
131
134
  }
132
135
 
@@ -180,10 +183,10 @@ div.subnav {
180
183
  // MISC
181
184
  // -----------------------------------------------------
182
185
 
183
- .label-important { background-color: #BD2C00; }
184
- .label-warning { background-color: #E3E84D; }
185
- .label-success { background-color: #6CC644; }
186
- .label-info { background-color: #4183C4; }
186
+ .label-important, .badge-important { background-color: #BD2C00; }
187
+ .label-warning, .badge-warning { background-color: #E3E84D; }
188
+ .label-success, .badge-success { background-color: #6CC644; }
189
+ .label-info, .badge-info { background-color: #4183C4; }
187
190
 
188
191
  .hero-unit {
189
192
  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
@@ -104,7 +104,7 @@
104
104
  // -------------------------
105
105
  @dropdownBackground: @white;
106
106
  @dropdownBorder: rgba(0,0,0,.2);
107
- @dropdownLinkColor: @grayDark;
107
+ @dropdownLinkColor: @textColor;
108
108
  @dropdownLinkColorHover: @white;
109
109
  @dropdownLinkBackgroundHover: @linkColor;
110
110
  @dropdownDividerTop: #e5e5e5;
@@ -149,12 +149,12 @@
149
149
  @navbarBackground: #EAEAEA;
150
150
  @navbarBackgroundHighlight: lighten(@navbarBackground, 15%);
151
151
 
152
- @navbarText: @grayDarker;
153
- @navbarLinkColor: @grayDarker;
152
+ @navbarText: @textColor;
153
+ @navbarLinkColor: @textColor;
154
154
  @navbarLinkColorHover: @linkColor;
155
- @navbarLinkColorActive: @navbarLinkColorHover;
155
+ @navbarLinkColorActive: @linkColor;
156
156
  @navbarLinkBackgroundHover: transparent;
157
- @navbarLinkBackgroundActive: @navbarBackground;
157
+ @navbarLinkBackgroundActive: transparent;
158
158
 
159
159
  @navbarSearchBackground: lighten(@navbarBackground, 25%);
160
160
  @navbarSearchBackgroundFocus: @white;
@@ -86,7 +86,7 @@ code, pre {
86
86
 
87
87
  .navbar-text {
88
88
  font-size: 20px;
89
- padding-top: 12px;
89
+ padding: 11px 10px 0;
90
90
  }
91
91
 
92
92
  .navbar-search {
@@ -141,9 +141,10 @@ div.subnav {
141
141
  font-size: 18px;
142
142
 
143
143
  .nav > li > a {
144
- color: @linkColor;
144
+ padding: 13px 12px 9px;
145
145
  border-color: transparent;
146
146
  background-color: transparent;
147
+ color: @linkColor;
147
148
  }
148
149
 
149
150
  .nav > li + li > a {
@@ -451,6 +452,7 @@ legend {
451
452
  // --------------------------------------------------
452
453
 
453
454
  .modal-header {
455
+ padding: 12px 15px 6px;
454
456
  background-color: @green;
455
457
  }
456
458
 
@@ -459,6 +461,10 @@ legend {
459
461
  background-color: @linkColor;
460
462
  border: none;
461
463
  .box-shadow(none);
464
+
465
+ label {
466
+ color: @textColor;
467
+ }
462
468
  }
463
469
 
464
470
  .modal-footer {
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.8
4
+ version: 0.2.9
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-07-11 00:00:00.000000000 Z
12
+ date: 2012-08-04 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: less-rails-bootstrap