Skip to content

Commit a248f54

Browse files
committed
footer sass vars, better parallel naming for variables
1 parent 4a34521 commit a248f54

File tree

7 files changed

+14
-11
lines changed

7 files changed

+14
-11
lines changed

civictechprojects/static/css/_vars.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33

44
//colors
55
$color-orange: #f79e02; // brand
6-
$color-orange-darker: #de8e01; // for button hover, border, whatever
6+
$color-orange-dark: #de8e01; // accent/button borders
7+
$color-orange-light: #f7cf88; // footer button hover
78
$color-green: #86c232; //confirm-role buttons
89
$color-green-dark: #61892f; //tag selectors and selected tags
910
$color-text-light: #ffffff;

civictechprojects/static/css/partials/_AboutProject.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
text-decoration: none;
1818
}
1919
a:hover {
20-
color: $color-orange-darker;
20+
color: $color-orange-dark;
2121
text-decoration: underline;
2222
}
2323
}

civictechprojects/static/css/partials/_DonateController.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
background: none;
3232
}
3333
&:focus {
34-
box-shadow: 0 0 0 .2rem rgba($color-orange-darker, 0.5)
34+
box-shadow: 0 0 0 .2rem rgba($color-orange-dark, 0.5)
3535
}
3636
}
3737

3838
.checked .radio-button {
39-
color: $color-orange-darker;
40-
border-color: $color-orange-darker;
39+
color: $color-orange-dark;
40+
border-color: $color-orange-dark;
4141
}
4242

4343
@media (min-width: 900px) {

civictechprojects/static/css/partials/_Global.scss

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,24 @@ body {
55
// footer buttons are difficult to theme in Bootstrap, so define manually
66
//TODO: Sass variables
77
.btn-footer {
8-
background-color: #fff;
8+
background-color: $color-background-light;
99
color: $color-text-dark;
1010
}
1111
.btn-footer a, .btn-footer a[type="button"] {
1212
color: $color-text-dark;
1313
text-decoration: none;
1414
}
1515
.btn-footer:hover, .btn-footer:active {
16-
background-color: #f7cf88;
16+
background-color: $color-orange-light;
1717
color: $color-text-dark;
18-
border-color: $color-orange-darker;
18+
border-color: $color-orange-dark;
1919
}
2020
a.btn-footer:hover, a.btn-footer:active, a[type="button"].btn-footer:hover, a[type="button"].btn-footer:active {
2121
text-decoration: none;
2222
}
23+
2324
//Sets button states to be our specific values instead of default computed by Bootstrap
25+
//I don't think we're going to call these colors manually at any point so no vars here
2426
.btn-success:active, .btn-success:hover {
2527
background-color: #395e00;
2628
}

civictechprojects/static/css/partials/_PartnerWithUsController.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
}
1818

1919
.PartnerWithUsController-sponsorAmount {
20-
color: $color-orange-darker;
20+
color: $color-orange-dark;
2121
}
2222

2323
.PartnerWithUsController-partners {

civictechprojects/static/css/partials/_Press.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
font-size: 20px;
2525
color: $color-orange;
2626
&:hover {
27-
color: $color-orange-darker;
27+
color: $color-orange-dark;
2828
}
2929
}
3030
.press-presslink {

civictechprojects/static/css/partials/_ProjectTag.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
.ProjectTag-closeButton {
1313
align-items: center;
14-
background-color: $color-orange-darker;
14+
background-color: $color-orange-dark;
1515
border-radius: 50%;
1616
cursor: pointer;
1717
display: inline-flex;

0 commit comments

Comments
 (0)