Skip to content

Commit 7fac266

Browse files
committed
newer colors from challenge
1 parent 6181a5c commit 7fac266

File tree

2 files changed

+17
-38
lines changed

2 files changed

+17
-38
lines changed

assets/css/main.css

Lines changed: 9 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -11,50 +11,24 @@
1111
*/
1212

1313
:root {
14-
/*
15-
Variable use
16-
color: var(--primary);
17-
background-color: rgba(var(--primary), 0.2)
18-
19-
my early purple color: #9b65bb
20-
--teal: rgb(71, 211, 229);
21-
--darkteal: rgb(30, 189, 209);
22-
23-
--dark-purple: #312744ff;
24-
--prussian-blue: #133653ff;
25-
--bright-navy-blue: #1874ddff;
26-
--viridian-green: #019aa5ff;
27-
--sunglow: #ffcc37ff;
28-
--pearly-purple: #b063aaff;
29-
--magenta-dye: #d0046fff;
30-
31-
/* CSS HSL */
32-
/* --dark-purple: hsla(261, 27%, 21%, 1);
33-
--prussian-blue: hsla(207, 63%, 20%, 1);
34-
--bright-navy-blue: hsla(212, 80%, 48%, 1);
35-
--viridian-green: hsla(184, 99%, 33%, 1);
36-
--sunglow: hsla(45, 100%, 61%, 1);
37-
--pearly-purple: hsla(305, 33%, 54%, 1);
38-
--magenta-dye: hsla(329, 96%, 42%, 1); */
39-
40-
/* CSS RGB
41-
--dark-purple: rgba(49, 39, 68, 1);
42-
--prussian-blue: rgba(19, 54, 83, 1);
43-
--bright-navy-blue: rgba(24, 116, 221, 1);
44-
--viridian-green: rgba(1, 154, 165, 1);
45-
--sunglow: rgba(255, 204, 55, 1);
46-
--pearly-purple: rgba(176, 99, 170, 1);
47-
--magenta-dye: rgba(208, 4, 111, 1); */
4814

4915
/* Challenge Colors */
5016
--learnmyog-purple: #3d3846ff;
5117
--dark-purple: #312744ff;
5218
--prussian-blue: #133653ff;
19+
--green-mountain: #2a3d37ff;
5320
--bright-navy-blue: #1874ddff;
5421
--viridian-green: #019aa5ff;
5522
--sunglow: #ffcc37ff;
5623
--pearly-purple: #b063aaff;
5724
--magenta-dye: #d0046fff;
25+
--silver-bullet: #c2c1c2ff;
26+
--barn-red: #4e0d0fff;
27+
--army-olive: #433818ff;
28+
--key-lime: #c5d929ff;
29+
--blue-wave: #375466ff;
30+
--avocado: #696f31ff;
31+
--bronze: #936621;
5832

5933
/* Original Html5 colors */
6034
--story-teal: rgb(71, 211, 229);
@@ -63,7 +37,7 @@
6337

6438
/* Variable Colors */
6539
--banner: var(--learnmyog-purple); /* changes with colorswitcher.js */
66-
--spotlight: #bbb; /* changes with colorswitcher.js */
40+
--spotlight: var(--silver-bullet); /* was #bbb changes with colorswitcher.js */
6741
--primary: var(--banner); /*link and button hover color */
6842
--primary-shadow: rgba(49,39,68,0.2);
6943
--discount: rgba(71, 211, 229, .2);

assets/js/colorswitcher.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,17 @@ window.onload=function(){
1717
"#312744",
1818
"#ffcc37",
1919
"#133653",
20+
"#2a3d37",
2021
"#b063aa",
2122
"#d0046f",
22-
"#3d3846"
23+
"#c5d929",
24+
"#4e0d0f",
25+
"#433818",
26+
"#375466",
27+
"#936621"
2328
];
2429

25-
let lightColors = ["#ffcc37"];
30+
let lightColors = ["#ffcc37", "#c5d929"];
2631

2732
// let rn = Math.floor(Math.random()*colors.length);
2833
var primary = colors[randomNumberInList(colors)];
@@ -36,7 +41,7 @@ window.onload=function(){
3641
// for light colored primary (e.g.) yellow remove invert class for text colors
3742
if( $.inArray(primary, lightColors) != -1){
3843
$('footer').removeClass('invert');
39-
console.log('priamry is light')
44+
console.log('primary is light')
4045
} else {
4146
console.log('primary is dark so invert');
4247
}

0 commit comments

Comments
 (0)