Skip to content

Commit 0b7b9b8

Browse files
committed
change color scheme
1 parent 2a894b8 commit 0b7b9b8

File tree

5 files changed

+122
-8
lines changed

5 files changed

+122
-8
lines changed

app/stylesheets/Occupied.scss

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
@import './constants.scss';
2+
3+
.entireArea {
4+
height: 100vh;
5+
}
6+
27
// HEADER
38
.mainHeader {
49
display: flex;

app/stylesheets/Settings.scss

-5
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515
width: 100vw;
1616
height: 100vh;
1717
opacity: 1;
18-
animation: fadeIn ease 2s;
19-
-webkit-animation: fadeIn ease 2s;
20-
-moz-animation: fadeIn ease 2s;
21-
-o-animation: fadeIn ease 2s;
22-
-ms-animation: fadeIn ease 2s;
2318
}
2419

2520
.mode {

app/stylesheets/SidebarContainer.scss

+1-2
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,7 @@
177177
}
178178

179179
.sidebar {
180-
background-image: url("../../app/assets/mountain.png");
181-
background-size: cover;
180+
background: $darkblue;
182181
width: 140px;
183182
height: 100%;
184183
position: fixed;

app/stylesheets/constants.scss

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
// Chronos 6.0 colors
2+
$darkblue: #011325;
3+
$white: #ffffff;
4+
$black: #000000;
5+
$blue: #224281;
6+
$lightblue: #4267b2;
7+
$yellowwhite: #ffffe5;
8+
$gray: #c2c2c2;
9+
110
$yellow: #fce356;
211
$navy: #040819;
312
$background: #ffffff;
@@ -7,7 +16,7 @@ $header: #888888;
716
$darkgrey: #444d56;
817
$hover: rgba(255,255,255, 0.1);
918
$warningred: rgb(255, 0, 0); // #cc0000
10-
$lightblue: #b5d3e9;
19+
// $lightblue: #b5d3e9;
1120

1221
// Primary colors:
1322
$gblue: #3788fc;

client/stylesheets/constants.scss

+106
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
$box-shadow: 0px 3px 8px 3px;
2+
$dark-gradient: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5));
3+
$darkblue: #011325;
4+
$white: #ffffff;
5+
$black: #000000;
6+
$blue: #224281;
7+
$lightblue: #4267b2;
8+
$yellowwhite: #ffffe5;
9+
$gray: #c2c2c2;
10+
11+
@mixin center-with-flex($align: center, $justify: center, $direction: row) {
12+
display: flex;
13+
align-items: $align;
14+
justify-content: $justify;
15+
flex-direction: $direction;
16+
}
17+
18+
@mixin background-theme($mode) {
19+
@if $mode == 'light' {
20+
background: linear-gradient($gray, $white);
21+
22+
h1, h2, h3, p {
23+
color: $black;
24+
25+
a {
26+
color: $lightblue;
27+
28+
&:hover {
29+
color: $blue;
30+
}
31+
}
32+
}
33+
34+
ion-icon {
35+
color: $black;
36+
}
37+
}
38+
39+
@if $mode == 'dark' {
40+
background-image: linear-gradient($darkblue, $black);
41+
42+
h1, h2, h3, p {
43+
color: $white;
44+
45+
a {
46+
color: $lightblue;
47+
48+
&:hover {
49+
color: $blue;
50+
}
51+
}
52+
}
53+
54+
ion-icon {
55+
color: $white;
56+
}
57+
}
58+
}
59+
60+
@mixin section-header {
61+
width: 50%;
62+
text-align: center;
63+
margin-bottom: 100px;
64+
font-size: 135%;
65+
66+
h1 {
67+
font-weight: 300;
68+
font-size: 300%;
69+
margin-bottom: 15px;
70+
}
71+
72+
h2 {
73+
font-weight: 300;
74+
font-size: 225%;
75+
margin-bottom: 15px;
76+
}
77+
78+
p {
79+
font-size: 110%;
80+
line-height: 135%;
81+
}
82+
}
83+
84+
@keyframes twirl {
85+
0% {
86+
transform: rotate(0deg);
87+
}
88+
89+
50% {
90+
transform: rotate(180deg);
91+
}
92+
93+
100% {
94+
transform: rotate(360deg);
95+
}
96+
}
97+
98+
@keyframes appear {
99+
from {
100+
opacity: 0;
101+
}
102+
103+
to {
104+
opacity: 1;
105+
}
106+
}

0 commit comments

Comments
 (0)