From 21dc9929f63aa96523cb698646884794d29c908e Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Mon, 3 Oct 2016 19:21:29 +0200 Subject: [PATCH] tetten --- .../assets/stylesheets/includes/general.scss | 4 +++ .../assets/stylesheets/includes/tiles.scss | 8 +++--- .../stylesheets/includes/variables.scss | 4 +++ content/assets/stylesheets/main.scss | 2 +- layouts/eventpost.erb | 27 +++++++++---------- package.json | 2 +- 6 files changed, 25 insertions(+), 22 deletions(-) diff --git a/content/assets/stylesheets/includes/general.scss b/content/assets/stylesheets/includes/general.scss index bc8d330..8946297 100644 --- a/content/assets/stylesheets/includes/general.scss +++ b/content/assets/stylesheets/includes/general.scss @@ -48,3 +48,7 @@ footer.footer { vertical-align: inherit; } } + +::selection { + background: $zeus-orange; /* WebKit/Blink Browsers */ +} diff --git a/content/assets/stylesheets/includes/tiles.scss b/content/assets/stylesheets/includes/tiles.scss index 694dc4a..cef3dbe 100644 --- a/content/assets/stylesheets/includes/tiles.scss +++ b/content/assets/stylesheets/includes/tiles.scss @@ -1,6 +1,3 @@ -a.box { - color: #000; -} #homepage { .box { @@ -8,11 +5,12 @@ a.box { &.highlighted { background-color: $highlighted-box-colour; - color: $highlighted-text-colour; .content { + color: $highlighted-text-colour; + h1, h2 { - color: white; + color: $highlighted-text-colour; } } } diff --git a/content/assets/stylesheets/includes/variables.scss b/content/assets/stylesheets/includes/variables.scss index f8b9d48..d66f101 100644 --- a/content/assets/stylesheets/includes/variables.scss +++ b/content/assets/stylesheets/includes/variables.scss @@ -1,10 +1,14 @@ // Colours $zeus-orange: #FF7F00; +$zeus-blue: #00C4FF; + $navbar-border-color: #CCC; $event-border-color: #DDD; $orange: $zeus-orange; +$blue: $zeus-blue; $primary: $orange; + $link-visited: inherit; $box-colour: #EEE; diff --git a/content/assets/stylesheets/main.scss b/content/assets/stylesheets/main.scss index d3f019c..59d0825 100644 --- a/content/assets/stylesheets/main.scss +++ b/content/assets/stylesheets/main.scss @@ -29,4 +29,4 @@ body.site { @import "includes/general"; @import "includes/eventpage"; @import "includes/404"; -@import "includes/projects"; \ No newline at end of file +@import "includes/projects"; diff --git a/layouts/eventpost.erb b/layouts/eventpost.erb index d895d83..d80bf83 100644 --- a/layouts/eventpost.erb +++ b/layouts/eventpost.erb @@ -5,36 +5,33 @@ <% end %> -
+
<%= render '/partials/_navbar.*', zeus_logo_color: :white %>
-
- +
-

- - <%= item[:title] %> - + + <%= item[:title] %> +

- <%= item[:description] %> + <%= item[:description] %>

-

    -
  • <%= fa 'clock-o', li: true %><%= item[:time] %>
  • -
  • <%= fa 'globe', li: true %><%= item[:location] %>
  • -
+
    +
  • <%= fa 'clock-o', li: true %><%= item[:time].strftime '%A %d %B %Y' %>
  • +
  • <%= fa 'globe', li: true %><%= item[:location] %>
  • +

-
@@ -43,7 +40,7 @@
-
+
<%= yield %>
diff --git a/package.json b/package.json index d102a9e..86c54e5 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,6 @@ "license": "MIT", "repository": "https://github.com/ZeusWPI/zeus.ugent.be", "dependencies": { - "bulma": "^0.1.2" + "bulma": "^0.2.1" } }