Skip to content
This repository was archived by the owner on Jun 25, 2019. It is now read-only.

Commit e610537

Browse files
author
Ben Centra
committed
working on navs, removed :focus selectors for now
1 parent adf15ea commit e610537

File tree

3 files changed

+124
-35
lines changed

3 files changed

+124
-35
lines changed

‎dev/members.css

Lines changed: 48 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@ a.btn {
4141
background-color: #4e8b12;
4242
border-color: #355e0c;
4343
}
44-
.btn.btn-info {
44+
.btn.color-info {
4545
background-color: #43afdf;
4646
border-color: #2398cc;
4747
}
48-
.btn.btn-info:hover {
48+
.btn.color-info:hover {
4949
background-color: #2da6db;
5050
border-color: #1f88b6;
5151
}
52-
.btn.btn-warning {
52+
.btn.color-warning {
5353
background-color: #ffb43f;
5454
border-color: #ffa00c;
5555
}
56-
.btn.btn-warning:hover {
56+
.btn.color-warning:hover {
5757
background-color: #ffaa25;
5858
border-color: #f29300;
5959
}
@@ -94,6 +94,33 @@ a.btn {
9494
background-color: #bbbbbb;
9595
}
9696
/*
97+
* Dropdowns
98+
*/
99+
.dropdown-menu li.active > a {
100+
background-color: #8b2c93;
101+
}
102+
.dropdown-menu li.active > a:hover {
103+
background-color: #66206c;
104+
}
105+
/*
106+
* Navs
107+
*/
108+
.nav-tabs li.active > a {
109+
color: #8b2c93;
110+
}
111+
.nav-tabs li.active > a:hover {
112+
color: #66206c;
113+
}
114+
.nav-pills li.active > a {
115+
background-color: #8b2c93;
116+
}
117+
.nav-pills li.active > a .badge {
118+
color: #888888;
119+
}
120+
.nav-pills li.active > a:hover {
121+
background-color: #66206c;
122+
}
123+
/*
97124
* Navbar
98125
*/
99126
.navbar {
@@ -104,33 +131,43 @@ a.btn {
104131
*/
105132
.navbar-inverse {
106133
background-color: #8b2c93;
134+
border-color: #66206c;
107135
}
108136
.navbar-inverse .navbar-brand {
109137
color: #ffffff;
110138
}
111139
.navbar-inverse .navbar-brand:hover {
112-
color: #d27fd9;
140+
color: #e0a6e5;
113141
}
114142
.navbar-inverse .navbar-nav li > a {
115143
color: #ffffff;
116144
}
117145
.navbar-inverse .navbar-nav li > a:hover {
118-
color: #d27fd9;
146+
color: #e0a6e5;
119147
}
120148
.navbar-inverse .navbar-nav li.active > a {
121149
background-color: #66206c;
122150
}
123151
.navbar-inverse .navbar-nav li.active > a:hover,
124-
.navbar-inverse .navbar-nav li.active > a:active,
125-
.navbar-inverse .navbar-nav li.active > a:focus {
152+
.navbar-inverse .navbar-nav li.active > a:active {
126153
background-color: #66206c;
127-
color: #d27fd9;
154+
color: #e0a6e5;
155+
}
156+
.navbar-inverse .navbar-nav li.dropdown a:hover,
157+
.navbar-inverse .navbar-nav li.dropdown a:active {
158+
background-color: #66206c;
159+
}
160+
.navbar-inverse .navbar-nav li.dropdown .dropdown-menu li > a {
161+
color: #222222;
162+
}
163+
.navbar-inverse .navbar-nav li.dropdown .dropdown-menu li > a:hover,
164+
.navbar-inverse .navbar-nav li.dropdown .dropdown-menu li > a:active {
165+
background-color: #eee;
128166
}
129167
.navbar-inverse .navbar-toggle {
130168
border-color: #66206c;
131169
}
132-
.navbar-inverse .navbar-toggle:hover,
133-
.navbar-inverse .navbar-toggle:focus {
170+
.navbar-inverse .navbar-toggle:hover {
134171
background-color: #66206c;
135172
}
136173
.navbar-inverse.navbar-fixed-top {

‎dev/members.less

Lines changed: 75 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Colors
22
@members-purple: #8b2c93;
33
@members-purple-dark: darken(@members-purple, 10%);
4-
@members-puprle-light: lighten(@members-purple, 30%);
4+
@members-puprle-light: lighten(@members-purple, 40%);
55
@members-pink: #df0051;
66
@charcoal: #222;
77
@gray: #bbb;
88
@white: #fff;
99

10-
@btn-success: #5ba215;
11-
@btn-info: #43afdf;
12-
@btn-warning: #ffb43f; //#dfa954;
10+
@color-success: #5ba215;
11+
@color-info: #43afdf;
12+
@color-warning: #ffb43f;
1313

1414
/*
1515
* General
@@ -54,27 +54,27 @@ a {
5454
}
5555
}
5656
&.btn-success {
57-
background-color: @btn-success;
58-
border-color: darken(@btn-success, 10%);
57+
background-color: @color-success;
58+
border-color: darken(@color-success, 10%);
5959
&:hover {
60-
background-color: darken(@btn-success, 5%);
61-
border-color: darken(@btn-success, 15%);
60+
background-color: darken(@color-success, 5%);
61+
border-color: darken(@color-success, 15%);
6262
}
6363
}
64-
&.btn-info {
65-
background-color: @btn-info;
66-
border-color: darken(@btn-info, 10%);
64+
&.color-info {
65+
background-color: @color-info;
66+
border-color: darken(@color-info, 10%);
6767
&:hover {
68-
background-color: darken(@btn-info, 5%);
69-
border-color: darken(@btn-info, 15%);
68+
background-color: darken(@color-info, 5%);
69+
border-color: darken(@color-info, 15%);
7070
}
7171
}
72-
&.btn-warning {
73-
background-color: @btn-warning;
74-
border-color: darken(@btn-warning, 10%);
72+
&.color-warning {
73+
background-color: @color-warning;
74+
border-color: darken(@color-warning, 10%);
7575
&:hover {
76-
background-color: darken(@btn-warning, 5%);
77-
border-color: darken(@btn-warning, 15%);
76+
background-color: darken(@color-warning, 5%);
77+
border-color: darken(@color-warning, 15%);
7878
}
7979
}
8080
&.btn-danger {
@@ -100,13 +100,13 @@ a {
100100
background-color: @members-purple;
101101
}
102102
&.label-success {
103-
background-color: @btn-success;
103+
background-color: @color-success;
104104
}
105105
&.label-info {
106-
background-color: @btn-info;
106+
background-color: @color-info;
107107
}
108108
&.label-warning {
109-
background-color: @btn-warning;
109+
background-color: @color-warning;
110110
}
111111
&.label-danger {
112112
background-color: @members-pink;
@@ -121,6 +121,44 @@ a {
121121
background-color: @gray;
122122
}
123123

124+
/*
125+
* Dropdowns
126+
*/
127+
128+
.dropdown-menu {
129+
li.active > a {
130+
background-color: @members-purple;
131+
&:hover {
132+
background-color: @members-purple-dark;
133+
}
134+
}
135+
}
136+
137+
/*
138+
* Navs
139+
*/
140+
141+
.nav-tabs {
142+
li.active > a {
143+
color: @members-purple;
144+
&:hover {
145+
color: @members-purple-dark;
146+
}
147+
}
148+
}
149+
150+
.nav-pills {
151+
li.active > a {
152+
background-color: @members-purple;
153+
.badge {
154+
color: darken(@gray, 20%);
155+
}
156+
&:hover {
157+
background-color: @members-purple-dark;
158+
}
159+
}
160+
}
161+
124162
/*
125163
* Navbar
126164
*/
@@ -135,6 +173,7 @@ a {
135173

136174
.navbar-inverse {
137175
background-color: @members-purple;
176+
border-color: @members-purple-dark;
138177
.navbar-brand {
139178
color: @white;
140179
&:hover {
@@ -150,15 +189,28 @@ a {
150189
}
151190
li.active > a {
152191
background-color: @members-purple-dark;
153-
&:hover, &:active, &:focus {
192+
&:hover, &:active {
154193
background-color: @members-purple-dark;
155194
color: @members-puprle-light;
156195
}
157196
}
197+
li.dropdown {
198+
a:hover, a:active {
199+
background-color: @members-purple-dark;
200+
}
201+
.dropdown-menu {
202+
li > a {
203+
color: @charcoal;
204+
&:hover, &:active {
205+
background-color: #eee;
206+
}
207+
}
208+
}
209+
}
158210
}
159211
.navbar-toggle {
160212
border-color: @members-purple-dark;
161-
&:hover, &:focus {
213+
&:hover {
162214
background-color: @members-purple-dark;
163215
}
164216
}

‎release/members.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)