Skip to content

Commit c7becda

Browse files
committed
merged issues
2 parents 5b507a3 + f7ae834 commit c7becda

11 files changed

+896
-105
lines changed

assets/css/about.css

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

assets/css/about.css.map

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

assets/css/about.scss

+11
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@ a {
66
text-decoration: none;
77
}
88

9+
#about-us {
10+
padding: 0;
11+
margin: 0;
12+
width: 100%;
13+
background: url('../img/about/about_banner.jpeg') no-repeat center center;
14+
background-size: cover;
15+
display: flex;
16+
flex-direction: column;
17+
justify-content: space-between;
18+
}
19+
920
#about-title {
1021
height: 200px;
1122
width: 100%;

assets/css/global.css

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

assets/css/global.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
padding: 0;
44
margin: 0;
55
box-sizing: border-box;
6-
font-family: "Open Sans", sans-serif;
6+
font-family: 'Open Sans', sans-serif;
77
color: white;
88
// outline: 1px solid white; //uncomment this line to diagnose position issues
99
}
@@ -132,7 +132,7 @@ p {
132132
margin-left: 0px;
133133

134134
&::before {
135-
content: "";
135+
content: '';
136136
height: 30px;
137137
width: 9px;
138138
background-color: $accent-color;

assets/css/volunteer.css

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

assets/css/volunteer.css.map

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

assets/css/volunteer.scss

+113
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
// GLOBAL VARIABLES
2+
$body-color: #222222;
3+
$accent-color: #399fd3;
4+
5+
a {
6+
text-decoration: none;
7+
}
8+
9+
h3 {
10+
font-size: 40px;
11+
}
12+
13+
img {
14+
margin: 0 !important;
15+
}
16+
17+
#volunteer {
18+
padding: 0;
19+
margin: 0 0 10vh 0;
20+
height: 40vh;
21+
width: 100%;
22+
background: url('../img/volunteer/volunteer_banner.jpg') no-repeat center
23+
center;
24+
background-size: 100%;
25+
}
26+
27+
#volunteer-title {
28+
height: 100px;
29+
width: 100%;
30+
background-image: linear-gradient(
31+
rgba(53, 53, 53, 0.7),
32+
rgba(17, 17, 17, 0.7)
33+
);
34+
position: relative;
35+
top: 15%;
36+
37+
h1 {
38+
font-size: 50px;
39+
padding-top: 15px;
40+
}
41+
}
42+
43+
.getting_started {
44+
display: inline-block;
45+
padding-right: 2vw;
46+
vertical-align: top;
47+
48+
img {
49+
max-height: 100px;
50+
max-width: 100px;
51+
}
52+
}
53+
54+
.volunteer-btns {
55+
font-size: 20px;
56+
color: $accent-color;
57+
border-color: $accent-color;
58+
border-radius: 10px;
59+
background-color: Transparent;
60+
padding: 10px 35px;
61+
margin-left: 30px;
62+
}
63+
64+
@media (max-width: 1800px) {
65+
.getting_started {
66+
padding-right: 12%;
67+
img {
68+
max-height: 80px;
69+
max-width: 80px;
70+
}
71+
}
72+
}
73+
74+
@media (max-width: 1665px) {
75+
.getting_started {
76+
padding-right: 8%;
77+
}
78+
}
79+
80+
@media (max-width: 1391px) {
81+
.getting_started {
82+
padding-right: 5%;
83+
}
84+
}
85+
86+
@media (max-width: 1238px) {
87+
.getting_started {
88+
padding-right: 1%;
89+
}
90+
}
91+
92+
@media (max-width: 1080px) {
93+
.getting_started {
94+
padding: 0;
95+
display: block;
96+
text-align: center;
97+
98+
img {
99+
max-height: 60px;
100+
max-width: 60px;
101+
}
102+
}
103+
}
104+
105+
@media (max-width: 665px) {
106+
#volunteer {
107+
margin: 0;
108+
}
109+
110+
#volunteer-title h1 {
111+
font-size: 40px;
112+
}
113+
}

0 commit comments

Comments
 (0)