From 6b5cfa3916f008c3469f2c4b0d36b1a3ef61dfa6 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Mon, 3 Oct 2016 20:52:01 +0200 Subject: [PATCH] so much css --- .../assets/stylesheets/includes/projects.css | 25 ------------------- .../assets/stylesheets/includes/projects.scss | 15 +++++------ .../assets/stylesheets/includes/tiles.scss | 19 +++++--------- .../stylesheets/includes/variables.scss | 2 ++ layouts/eventpost.erb | 2 +- 5 files changed, 15 insertions(+), 48 deletions(-) delete mode 100644 content/assets/stylesheets/includes/projects.css diff --git a/content/assets/stylesheets/includes/projects.css b/content/assets/stylesheets/includes/projects.css deleted file mode 100644 index 7d8a5da..0000000 --- a/content/assets/stylesheets/includes/projects.css +++ /dev/null @@ -1,25 +0,0 @@ -/*# sourceMappingURL=projects.css.map */ -/* line 4, /Users/mehmet/Projects/zeus.ugent.be/content/assets/stylesheets/includes/projects.scss */ -.imgspace { - display: flex; - justify-content: space-around; - width: 100%; - text-align: center; } - -/* line 11, /Users/mehmet/Projects/zeus.ugent.be/content/assets/stylesheets/includes/projects.scss */ -.imgcenter { - display: flex; - justify-content: center; - /* align horizontal */ - align-items: center; - /* align vertical */ } - -/* line 18, /Users/mehmet/Projects/zeus.ugent.be/content/assets/stylesheets/includes/projects.scss */ -.padbot { - padding-bottom: 15px; } - -/* line 24, /Users/mehmet/Projects/zeus.ugent.be/content/assets/stylesheets/includes/projects.scss */ -.padtop { - padding-top: 25px; } - -/*# sourceMappingURL=projects.css.map */ \ No newline at end of file diff --git a/content/assets/stylesheets/includes/projects.scss b/content/assets/stylesheets/includes/projects.scss index c2bd649..bd80dec 100644 --- a/content/assets/stylesheets/includes/projects.scss +++ b/content/assets/stylesheets/includes/projects.scss @@ -1,6 +1,3 @@ - -/*# sourceMappingURL=projects.css.map */ - .imgspace { display: flex; justify-content: space-around; @@ -12,17 +9,17 @@ display: flex; justify-content: center; /* align horizontal */ align-items: center; /* align vertical */ - + } .padbot { - + padding-bottom: 15px; - + } .padtop { - + padding-top: 25px; - -} \ No newline at end of file + +} diff --git a/content/assets/stylesheets/includes/tiles.scss b/content/assets/stylesheets/includes/tiles.scss index cef3dbe..8f8d27a 100644 --- a/content/assets/stylesheets/includes/tiles.scss +++ b/content/assets/stylesheets/includes/tiles.scss @@ -1,19 +1,12 @@ +a.box { + &:hover { + box-shadow: 0 2px 3px rgba($black, 0.1), 0 0 0 1px $blue + } +} #homepage { .box { - background-color: $box-colour; - - &.highlighted { - background-color: $highlighted-box-colour; - - .content { - color: $highlighted-text-colour; - - h1, h2 { - color: $highlighted-text-colour; - } - } - } + border-radius: 0; } } diff --git a/content/assets/stylesheets/includes/variables.scss b/content/assets/stylesheets/includes/variables.scss index d66f101..b832aff 100644 --- a/content/assets/stylesheets/includes/variables.scss +++ b/content/assets/stylesheets/includes/variables.scss @@ -11,6 +11,8 @@ $primary: $orange; $link-visited: inherit; +$border_hover: $blue; + $box-colour: #EEE; $highlighted-box-colour: $zeus-orange; $highlighted-text-colour: white; diff --git a/layouts/eventpost.erb b/layouts/eventpost.erb index d80bf83..1875e0a 100644 --- a/layouts/eventpost.erb +++ b/layouts/eventpost.erb @@ -5,7 +5,7 @@ <% end %> -
+
<%= render '/partials/_navbar.*', zeus_logo_color: :white %>