Skip to content

Commit 8c0a07c

Browse files
committed
Defined variables and package.json properly
1 parent 4760c29 commit 8c0a07c

File tree

3 files changed

+45
-36
lines changed

3 files changed

+45
-36
lines changed

webpack/package-lock.json

+12-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webpack/package.json

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"name": "lektor-example",
2+
"name": "creative-commons",
33
"version": "1.0.0",
4-
"main": "index.js",
4+
"main": "main.js",
55
"scripts": {
66
"test": "echo \"Error: no test specified\" && exit 1"
77
},
88
"author": "",
9-
"license": "ISC",
9+
"license": "MIT",
1010
"devDependencies": {
1111
"autoprefixer": "^9.4.10",
1212
"babel-core": "^6.26.3",
@@ -24,5 +24,9 @@
2424
"webpack-cli": "^3.2.3"
2525
},
2626
"dependencies": {},
27-
"description": ""
27+
"description": "www.creativecommons.github.io",
28+
"repository": {
29+
"type": "git",
30+
"url": "https://github.com/creativecommons/creativecommons.github.io-source"
31+
}
2832
}

webpack/sass/main.scss

+25-20
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
1-
2-
3-
$orange1 : #EE5B32;
4-
$orange2 : #e25803;
5-
$orange3: #FB7928;
1+
//Color Variables
2+
$pumpkin: #e15803;
3+
$orange: #FB7928;
4+
$candy: #EE5B32;
5+
$jet-black: #333333;
6+
$grey: rgba(255, 255, 255, 0.6);
67
$blue: #00b5da;
7-
$light_grey: rgba(255, 255, 255, 0.6);
88
$white: #fff;
9-
$grey: #333333;
109

10+
//Color Configs
11+
$brand-theme: $candy;
12+
$brand-theme-dark: $pumpkin;
13+
$brand-theme-light: $orange;
1114

15+
$text-color: $jet-black;
16+
$project-card-theme: $blue;
1217

1318
body {
1419
font-family: 'Source Sans Pro', sans-serif;
15-
color: $grey;
20+
color: $text-color;
1621
}
1722

1823
h2 {
@@ -48,12 +53,12 @@ h2 {
4853
}
4954

5055
.main-header {
51-
background-color: $orange1;
56+
background-color: $brand-theme;
5257
}
5358

5459
.navbar {
5560
background: {
56-
image: linear-gradient(90deg, $orange1, $orange3 , $orange1);
61+
image: linear-gradient(90deg, $brand-theme, $brand-theme-light , $brand-theme);
5762
size: 100% 130px;
5863
position-y: bottom;
5964
}
@@ -63,24 +68,24 @@ h2 {
6368
background-color: $white;
6469
border: {
6570
bottom-style: solid;
66-
color: $orange1;
71+
color: $brand-theme;
6772
width: 10px;
6873
}
6974
padding-left: 0px;
7075
font-weight: 600;
71-
color: $grey;
76+
color: $text-color;
7277
}
7378

7479
@mixin style {
75-
background-orange3: $white;
80+
background-color: $white;
7681
border: {
77-
left-orange3: $blue !important;
82+
left-color: $project-card-theme !important;
7883
left-width: 10px;
7984
}
8085
padding-left: 0px;
8186
}
8287

83-
.featuorange1-project-card {
88+
.featured-project-card {
8489
@include style();
8590
min-width: 20rem;
8691
max-width: 20rem;
@@ -92,7 +97,7 @@ h2 {
9297
}
9398

9499
.badge-featured-project {
95-
background-color: $blue;
100+
background-color: $project-card-theme;
96101
color: $white;
97102
font-size: 0.8rem;
98103
}
@@ -121,20 +126,20 @@ h2 {
121126
}
122127

123128
.nav-item:hover {
124-
background: $orange2 !important;
129+
background: $brand-theme-dark !important;
125130
}
126131

127132
.navbar-dark {
128133
.navbar-nav .nav-item .nav-link {
129-
color: white;
134+
color: $white;
130135
line-height: 1rem;
131-
border-left: 1px solid $light_grey;
136+
border-left: 1px solid $grey;
132137
}
133138
.navbar-toggler {
134139
border-color: $white;
135140
}
136141
.navbar-nav .nav-item.active .nav-link {
137-
background: $orange2 !important;
142+
background: $brand-theme-dark !important;
138143
}
139144
}
140145

0 commit comments

Comments
 (0)