From af3e8938214215b70170acfa34579d49676824b2 Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Tue, 30 Aug 2016 22:01:23 +0200 Subject: [PATCH] prettier index --- .../assets/stylesheets/includes/tiles.scss | 23 ++++++++++------ .../stylesheets/includes/variables.scss | 15 +++++++++-- content/assets/stylesheets/main.scss | 6 +---- content/index.erb | 26 ++++++++----------- layouts/partials/_tile.erb | 2 +- 5 files changed, 41 insertions(+), 31 deletions(-) diff --git a/content/assets/stylesheets/includes/tiles.scss b/content/assets/stylesheets/includes/tiles.scss index 14a3d75..e65d302 100644 --- a/content/assets/stylesheets/includes/tiles.scss +++ b/content/assets/stylesheets/includes/tiles.scss @@ -1,11 +1,18 @@ -.notification.is-info, -.notification.is-success, -.notification.is-primary { - .content { - color: white; - h1 { - color: white; - font-weight: bold; +a.box { + color: #000; +} + +.box { + background-color: $box-colour; + + &.highlighted { + background-color: $highlighted-box-colour; + color: $highlighted-text-colour; + + .content { + h1 { + color: white; + } } } } diff --git a/content/assets/stylesheets/includes/variables.scss b/content/assets/stylesheets/includes/variables.scss index 10f3021..f8b9d48 100644 --- a/content/assets/stylesheets/includes/variables.scss +++ b/content/assets/stylesheets/includes/variables.scss @@ -1,6 +1,17 @@ -$zeus_orange: #FF7F00; -$event-padding: 10px; +// Colours +$zeus-orange: #FF7F00; $navbar-border-color: #CCC; $event-border-color: #DDD; +$orange: $zeus-orange; +$primary: $orange; + +$link-visited: inherit; + +$box-colour: #EEE; +$highlighted-box-colour: $zeus-orange; +$highlighted-text-colour: white; +$highlighted-link-colour: #222324; $cammie-controls-color: rgba(0, 0, 0, 0.60); + +$event-padding: 10px; diff --git a/content/assets/stylesheets/main.scss b/content/assets/stylesheets/main.scss index a00ff64..09da219 100644 --- a/content/assets/stylesheets/main.scss +++ b/content/assets/stylesheets/main.scss @@ -1,8 +1,5 @@ -$zeus-orange: #FF7F00; -$orange: $zeus-orange; -$primary: $orange; -$link-visited: $orange; +@import "includes/variables"; @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,700); $family-sans-serif: 'Open Sans', sans-serif; @@ -14,7 +11,6 @@ $family-sans-serif: 'Open Sans', sans-serif; flex: none; } -@import "includes/variables"; @import "includes/cammie"; @import "includes/events"; @import "includes/tiles"; diff --git a/content/index.erb b/content/index.erb index 35b85b6..b1bea41 100644 --- a/content/index.erb +++ b/content/index.erb @@ -1,40 +1,36 @@
-
- <%= render '/partials/_tile.*', article: all_events[0] %> -
+ <%= render '/partials/_tile.*', article: all_events[0] %>
-
- <%= render '/partials/_tile.*', article: all_events[1] %> -
+ <%= render '/partials/_tile.*', article: all_events[1], htmlclass: "highlighted" %>
-
+
IDK LOL
-
+
<%= fa 'wikipedia-w' %>
-
+
<%= fa 'video-camera' %>
-
+
<%= fa 'github' %>
-
+
<%= fa 'facebook-official' %>
@@ -42,7 +38,7 @@
-
+

<%= sorted_articles.first[:title] %>

<%= sorted_articles.first[:description] %> @@ -51,7 +47,7 @@
-
+

Numero uno: @werthen

@@ -68,12 +64,12 @@
-
+
GITHUB
-
+
GITHUB
diff --git a/layouts/partials/_tile.erb b/layouts/partials/_tile.erb index a45783b..49cb075 100644 --- a/layouts/partials/_tile.erb +++ b/layouts/partials/_tile.erb @@ -1,4 +1,4 @@ - +