Skip to content

Commit 84ec974

Browse files
roshlaroshroshlarosh
authored
Merge pull request #24 from fac18/ccs_update
css update
2 parents 6303850 + 5f6f6e9 commit 84ec974

File tree

9 files changed

+202
-15
lines changed

9 files changed

+202
-15
lines changed

‎.DS_Store

6 KB
Binary file not shown.

‎public/.DS_Store

6 KB
Binary file not shown.

‎public/css/reset.css

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
/* Box sizing rules */
2+
*,
3+
*::before,
4+
*::after {
5+
box-sizing: border-box;
6+
}
7+
8+
/* Remove default padding */
9+
ul[class],
10+
ol[class] {
11+
padding: 0;
12+
}
13+
14+
/* Remove default margin */
15+
body,
16+
h1,
17+
h2,
18+
h3,
19+
h4,
20+
p,
21+
ul[class],
22+
ol[class],
23+
li,
24+
figure,
25+
figcaption,
26+
blockquote,
27+
dl,
28+
dd {
29+
margin: 0;
30+
}
31+
32+
/* Set core body defaults */
33+
body {
34+
min-height: 100vh;
35+
scroll-behavior: smooth;
36+
text-rendering: optimizeSpeed;
37+
line-height: 1.5;
38+
}
39+
40+
/* Remove list styles on ul, ol elements with a class attribute */
41+
ul[class],
42+
ol[class] {
43+
list-style: none;
44+
}
45+
46+
/* A elements that don't have a class get default styles */
47+
a:not([class]) {
48+
text-decoration-skip-ink: auto;
49+
}
50+
51+
/* Make images easier to work with */
52+
img {
53+
max-width: 100%;
54+
display: block;
55+
}
56+
57+
/* Natural flow and rhythm in articles by default */
58+
article > * + * {
59+
margin-top: 1em;
60+
}
61+
62+
/* Inherit fonts for inputs and buttons */
63+
input,
64+
button,
65+
textarea,
66+
select {
67+
font: inherit;
68+
}
69+
70+
/* Remove all animations and transitions for people that prefer not to see them */
71+
@media (prefers-reduced-motion: reduce) {
72+
* {
73+
animation-duration: 0.01ms !important;
74+
animation-iteration-count: 1 !important;
75+
transition-duration: 0.01ms !important;
76+
scroll-behavior: auto !important;
77+
}
78+
}

‎public/css/style.css

+105-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,34 @@
11
body {
2-
/* background-image: url("images/christmas_1.jpg"); */
3-
background-color: gold;
4-
display: flex;
2+
background-color: red;
3+
4+
display: flex;
55
flex-direction: column;
66
align-items: center;
77
justify-content: center;
8+
font-family: 'Gelasio', cursive;
9+
;
10+
}
11+
12+
h1 {
13+
font-family: 'Mountains of Christmas', cursive;
14+
margin-left: 1em;
15+
color: red;
16+
font-size: 2.5em;;
817
}
918

1019
form {
1120
padding-top: 100px;
21+
background-color: white;
22+
margin: 3em;
23+
box-shadow: 20px 20px 0px 0px darkred;
24+
}
25+
26+
27+
28+
.name{
29+
margin: 1em;
30+
padding: 1em;
31+
border: 1px solid darkred;
1232
}
1333

1434
p {
@@ -18,3 +38,85 @@ p {
1838
label {
1939
font-size: 20px;
2040
}
41+
42+
footer {
43+
width: 100%;
44+
margin-top: 5em;
45+
background-color: green;
46+
color: white;
47+
padding: 3em;
48+
display: flex;
49+
flex-direction: column;
50+
justify-content: center;
51+
align-items: center;
52+
53+
}
54+
55+
.searchBy{
56+
margin-right: 1em;
57+
}
58+
59+
.dropdown {
60+
margin: 1em;
61+
display: flex;
62+
flex-direction: row;
63+
}
64+
65+
.category{
66+
padding: 1em;
67+
}
68+
69+
.button {
70+
margin-top: 2em;
71+
padding: 1em 3em;
72+
background-color: red;;
73+
border: none;
74+
margin: 1em 1em 3em 1em;
75+
opacity: 0.5;
76+
transition: 0.3s all ease-in;
77+
color: white;
78+
79+
}
80+
81+
.button:hover{
82+
opacity: 1;
83+
}
84+
85+
form {
86+
display: flex;
87+
flex-direction: column;
88+
opacity: 0.8;
89+
}
90+
91+
.question{
92+
margin: 1em;
93+
padding-bottom: 1em;
94+
border-bottom: 2px darkred solid ;
95+
}
96+
97+
98+
th {
99+
text-transform: uppercase;
100+
font-size: 1.9;;
101+
border: 2px solid darkred;
102+
}
103+
tr, th, td {
104+
padding: 1em;
105+
color: white;
106+
}
107+
108+
tr:nth-child(even) {
109+
background-color: rgb(189, 19, 19);
110+
}
111+
112+
table {
113+
display: flex;
114+
flex-direction: column;
115+
justify-content: center;
116+
align-items: center;
117+
padding: 2em;
118+
box-shadow: 20px 20px 0px 0px darkred;
119+
border: 3px solid darkred;
120+
margin-top: 2em;
121+
122+
}

‎src/views/home.hbs

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<form method="POST" action="/create-user">
2-
<input name='username' id='createusername' class='entry' aria-label="enter your name" placeholder='name here'
3-
required />
2+
<h1>Santa, what will I get for X-mas?</h1>
3+
<input class="name" name='username' id='createusername' class='entry' aria-label="enter your name" placeholder='name here' required />
44
{{!-- create input for password when we get there strech goaL --}}
55

66

7-
<label for='category' name='category'>
8-
Search by category
7+
<label class="dropdown" for='category' name='category'>
8+
<p class="searchBy">Search by category </p>
99
<select class="category" name="category" required>
1010
<option value="Sports"> Sports </option>
1111
<option value="Food"> Food </option>
@@ -15,16 +15,18 @@
1515
</label>
1616

1717
{{#each questions}}
18-
19-
<p>{{question}}</p>
20-
<input name={{name}} type='radio' aria-label="Yes" value=1 required>Yes</input>
21-
<input name={{name}} type='radio' aria-label="No" value=0 required>No</input>
18+
<section class="question">
19+
<p>{{question}}</p>
20+
<input name={{name}} type='radio' aria-label="Yes" value=1 required>Yes</input>
21+
<input name={{name}} type='radio' aria-label="No" value=0 required>No</input>
22+
</section>
2223
{{/each}}
2324

2425
<br>
2526
<br>
2627

27-
<input type="submit" aria-label="submit button" />
28+
<input class="button" type="submit" aria-label="submit button" />
2829

2930

3031
</form>
32+

‎src/views/layouts/main.hbs

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
</head>
77

88
<body>
9+
10+
{{{h1}}}
911
<main class="main">
10-
{{{body}}}
12+
{{{body}}}
1113
</main>
1214

1315
<footer>

‎src/views/partials/footer.hbs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
<p>© 2019 FruitMarket</p>
2-
<p>intellectual property of Alex X Ayub X Pat X Roshan</p>
1+
<p>© 2019 Santa Claus's Little Helpers</p>
2+
<p>intellectual property of Alex X Ayub X Pat X Roshan</p>
3+

‎src/views/partials/head.hbs

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<meta charset="UTF-8">
22
<meta name="viewport" content="width=device-width, initial-scale=1.0">
33
<meta http-equiv="X-UA-Compatible" content="ie=edge">
4+
<link href="https://fonts.googleapis.com/css?family=Mountains+of+Christmas|Gelasio&display=swap" rel="stylesheet">
5+
<link rel="stylesheet" href="/css/reset.css">
46
<link rel="stylesheet" href="/css/style.css">
57
<title>Presents</title>

‎src/views/partials/nav.hbs

Whitespace-only changes.

0 commit comments

Comments
 (0)