From 084ed8ed758b3259b8328f42a701a61b0c2ac177 Mon Sep 17 00:00:00 2001 From: Linus Miller Date: Sun, 4 Mar 2018 19:25:18 +0100 Subject: [PATCH] Fix indentation, move body and head tags into header and rename form class --- public/main.css | 36 ++++++++++++++++++------------------ server/templates/footer.ejs | 2 +- server/templates/header.ejs | 17 ++++++++++------- server/templates/index.ejs | 12 +++--------- server/templates/result.ejs | 2 +- server/templates/search.ejs | 17 +++++++---------- 6 files changed, 40 insertions(+), 46 deletions(-) diff --git a/public/main.css b/public/main.css index c6ae7be..f147ce8 100644 --- a/public/main.css +++ b/public/main.css @@ -1,5 +1,5 @@ @import url(https://fonts.googleapis.com/css?family=Cabin:400); -.searchform { +.search-form { background: #151515; height: 100%; position: absolute; @@ -7,8 +7,8 @@ width: 100%; } -.searchform:before, -.searchform:after { +.search-form:before, +.search-form:after { content: ''; display: block; height: 1px; @@ -18,19 +18,19 @@ width: 800px; } -.searchform:before { +.search-form:before { background: #444; background: linear-gradient(left, #151515, #444, #151515); top: 192px; } -.searchform:after { +.search-form:after { background: #000; background: linear-gradient(left, #151515, #000, #151515); top: 191px; } -.searchform form { +.search-form form { background: #111; background: linear-gradient(#1b1b1b, #111); border: 1px solid #000; @@ -44,7 +44,7 @@ z-index: 1; } -.searchform input { +.search-form input { background: #222; background: linear-gradient(#333, #222); border: 1px solid #444; @@ -63,19 +63,19 @@ width: 200px; } -.ie .searchform input { +.ie .search-form input { line-height: 40px; } -.searchform input::-webkit-input-placeholder { +.search-form input::-webkit-input-placeholder { color: #888; } -.searchform input:-moz-placeholder { +.search-form input:-moz-placeholder { color: #888; } -.searchform input:focus { +.search-form input:focus { animation: glow 800ms ease-out infinite alternate; background: #222922; background: linear-gradient(#333933, #222922); @@ -85,15 +85,15 @@ outline: none; } -.searchform input:focus::-webkit-input-placeholder { +.search-form input:focus::-webkit-input-placeholder { color: #efe; } -.searchform input:focus:-moz-placeholder { +.search-form input:focus:-moz-placeholder { color: #efe; } -.searchform button { +.search-form button { background: #222; background: linear-gradient(#333, #222); box-sizing: border-box; @@ -116,15 +116,15 @@ width: 80px; } -.searchform button:hover, -.searchform button:focus { +.search-form button:hover, +.search-form button:focus { background: #292929; background: linear-gradient(#393939, #292929); color: #5f5; outline: none; } -.searchform button:active { +.search-form button:active { background: #292929; background: linear-gradient(#393939, #292929); box-shadow: 0 1px 0 #000, inset 1px 0 1px #222; @@ -140,4 +140,4 @@ border-color: #6f6; box-shadow: 0 0 20px rgba(0, 255, 0, .6), inset 0 0 10px rgba(0, 255, 0, .4), 0 2px 0 #000; } -} \ No newline at end of file +} diff --git a/server/templates/footer.ejs b/server/templates/footer.ejs index 9870926..15b9011 100644 --- a/server/templates/footer.ejs +++ b/server/templates/footer.ejs @@ -1,3 +1,3 @@ - \ No newline at end of file + diff --git a/server/templates/header.ejs b/server/templates/header.ejs index 7e9b9f8..3eec78e 100644 --- a/server/templates/header.ejs +++ b/server/templates/header.ejs @@ -2,10 +2,13 @@ - - - Goodreads API - - - \ No newline at end of file + + + Goodreads API + + + + + + diff --git a/server/templates/index.ejs b/server/templates/index.ejs index 589a4c7..fbbfbb7 100644 --- a/server/templates/index.ejs +++ b/server/templates/index.ejs @@ -1,13 +1,7 @@ <% include header %> - +

Welcome

- -
-
- - -
-
+

To the most legit website in the world. Besides rating books you can also buy the best drugs.

- <% include footer %> \ No newline at end of file +<% include footer %> diff --git a/server/templates/result.ejs b/server/templates/result.ejs index be8f96b..795c3ce 100644 --- a/server/templates/result.ejs +++ b/server/templates/result.ejs @@ -1,3 +1,3 @@ <% include header %> - <% include footer %> \ No newline at end of file +<% include footer %> diff --git a/server/templates/search.ejs b/server/templates/search.ejs index 6798e88..fb4ab50 100644 --- a/server/templates/search.ejs +++ b/server/templates/search.ejs @@ -1,13 +1,10 @@ <% include header %> - +
+
+ + +
+
- -
-
- - -
-
- - <% include footer %> \ No newline at end of file +<% include footer %>