From ad7cd5eea9c6434809a2f8e1b517b9ccb5e98d2c Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Tue, 5 Jul 2016 22:13:14 +0200 Subject: [PATCH] srs bsns --- content/index.erb | 113 +++++++++++++++++++++++------- content/stylesheet.scss | 151 ++++++++++++++++++---------------------- layouts/index.erb | 1 + 3 files changed, 156 insertions(+), 109 deletions(-) diff --git a/content/index.erb b/content/index.erb index ac4b337..cbd58c1 100644 --- a/content/index.erb +++ b/content/index.erb @@ -1,26 +1,91 @@ -
- -
-
-
- is awesome! -
-
- -
-
-
-
- - Geeks, Attack! +
+
+
+
+
+ +
+ + + +
-
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quasi hic id a enim natus, doloribus explicabo quis. Nostrum, odit. Aperiam.
-
Similique molestiae, repudiandae sequi tempora modi beatae, doloremque est fugit totam veniam ad impedit dolore excepturi dolorum officia adipisci reprehenderit.
-
Quaerat a quos recusandae voluptates provident dolore tenetur possimus, mollitia sapiente accusamus veritatis natus deleniti quibusdam odit, explicabo! Non, earum.
-
+ + + +
+
+ Main event +
+
+
+
+
+ Lorem ipsum dolor sit amet. +
+
+
+
+ Lorem ipsum dolor sit amet. +
+
+
+
+ Lorem ipsum dolor sit amet. +
+
+
+
+ Lorem ipsum dolor sit amet. +
+
+
+
+ Lorem ipsum dolor sit amet. +
+
+
+
+ Lorem ipsum dolor sit amet. +
+
+
+
+ Lorem ipsum dolor sit amet. +
+
+
+
+ Lorem ipsum dolor sit amet. +
+
+
+
+ Lorem ipsum dolor sit amet. +
+
+
+
+ Lorem ipsum dolor sit amet. +
+
+
+
+ Lorem ipsum dolor sit amet. +
+
+
+
+ Lorem ipsum dolor sit amet. +
+
+
+
+
-
-
    -
    -
    - + diff --git a/content/stylesheet.scss b/content/stylesheet.scss index 4aef85f..397abc3 100644 --- a/content/stylesheet.scss +++ b/content/stylesheet.scss @@ -1,95 +1,76 @@ -$zeus_orange: rgb(255, 109, 0); +$zeus_orange: #FF7F00; +$event-padding: 10px; +$navbar-border-color: #CCC; -header { - position: absolute; - top: 0; - height: 75px; - line-height: 75px; - - background-color: $zeus_orange; - color: white; - - width: 100%; +#container { + height: 700px; + margin-top: 35px; } -header #logo { - position: absolute; - margin-top: 15px; - margin-left: 15px; - height: 45px; +#logo { + height: 150px; } -main { - padding: 15px; - position: absolute; - top: 75px; - /* header-height, footer-height, padding-top, padding-bottom */ - height: calc(100% - 75px - 30px - 15px - 15px); +#logos { + display: inline-block; + color: black; + + .logo-link { + margin-left: 10px; + } + .logo-link:hover { + color: $zeus_orange; + } } -footer { - position: absolute; - bottom: 0; - width: 100%; - height: 30px; - line-height: 30px; - background-color: red; + +.header-top { + display: flex; + justify-content: space-between;; + align-items: flex-end; + } -#events { - padding-right: 15px; + +#navbar { + border-top: 1px solid $navbar-border-color; + border-bottom: 1px solid $navbar-border-color; + padding-top: 10px; + padding-bottom: 10px; + + color: black; + + display: flex; + justify-content: space-around; + + margin-bottom: $event-padding * 2; + margin-top: $event-padding * 2; + + .navlink:hover { + color: $zeus_orange; + } } -#event-main { - position: relative; - width: 100%; - background-color: black; - color: white; - padding: 20px; + +.main-event { + background: #8e9eab; /* fallback for old browsers */ + background: -webkit-linear-gradient(to left, #8e9eab , #eef2f3); /* Chrome 10-25, Safari 5.1-6 */ + background: linear-gradient(to left, #8e9eab , #eef2f3); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ + + height: 250px; + padding: 10px; + margin-bottom: $event-padding; +} + +#all-events { + margin-left: -10px; + margin-right: -10px; + + .event { + background: #8e9eab; /* fallback for old browsers */ + background: -webkit-linear-gradient(to left, #8e9eab , #eef2f3); /* Chrome 10-25, Safari 5.1-6 */ + background: linear-gradient(to left, #8e9eab , #eef2f3); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ + + padding: 10px; + height: 200px; - - overflow: hidden; - - border: 1px solid rgb(100, 100, 100); -} - -.event { - background: black; - color: white; - - padding: 20px; -} - -.event-bg { - position: absolute; - width: 100%; - top: 0; - left: 0; -} -.event-title { - position: absolute; - top: 60px; - right: 20px; - font-size: 35px; - height: 40px; - line-height: 40px; - padding: 15px; - z-index: 1; - background-color: rgba(0, 0, 0, 0.7); - -} - -#github-feed ul { - height: 100%; -} -#github-feed { - overflow: auto; -} - -/* Fixes adding borders and padding, but breaks IE7 */ -.pure-g > div { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.l-box { - border: 2px solid black; + margin: $event-padding; + } } diff --git a/layouts/index.erb b/layouts/index.erb index 24b4ac5..d5908a9 100644 --- a/layouts/index.erb +++ b/layouts/index.erb @@ -9,6 +9,7 @@ +