This commit is contained in:
Lorin Werthen 2016-10-04 22:04:34 +02:00
parent e41070aca9
commit 32cb7aea72
12 changed files with 88 additions and 18 deletions

View file

@ -8,9 +8,19 @@
margin-bottom:10px; margin-bottom:10px;
} }
.bolder a{ .bolder {
> * {
color:#565C5E; color:#565C5E;
font-weight: bold; font-weight: bold;
font-size: 20pt; font-size: 20pt;
font-family: 'Avenir'; font-family: 'Avenir';
border-left: 3px solid $zeus-orange;
padding-left: 10px;
}
a {
border-left: none;
}
} }

View file

@ -19,3 +19,7 @@
height: 256px; height: 256px;
} }
} }
.event-attributes {
font-size: 1.3em;
}

View file

@ -58,7 +58,6 @@
.description { .description {
font-size: 1.7em; font-size: 1.7em;
font-weight: 200; font-weight: 200;
color: #FF7F00;
} }
.time { .time {

View file

@ -53,3 +53,49 @@ footer.footer {
color: white; color: white;
background: rgba(255, 127, 0, 0.99); background: rgba(255, 127, 0, 0.99);
} }
<<<<<<< Updated upstream
=======
.imgcenter {
display: flex;
justify-content: center;
align-items: center;
}
.hydra-tile {
background-color: #1E64C8;
}
.lana-tile {
background-color: $tile-orange;
}
#tipue_search_input {
background: none;
padding: 12px;
font: inherit;
color: inherit;
display: flex;
flex-direction: row;
input {
background: none;
border: none;
-moz-appearance: none;
-webkit-appearance: none;
box-shadow: none;
outline: 0;
margin: 0;
color: inherit;
}
&::before {
font: normal normal normal 14px/1 FontAwesome;
content: "\f002 ";
color: inherit;
padding-right: 5px;
}
}
>>>>>>> Stashed changes

View file

@ -13,6 +13,7 @@ a.box {
.centering { .centering {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center;
} }
.highlighted{ .highlighted{
background: $tile-orange; background: $tile-orange;

View file

@ -4,7 +4,7 @@ banner: https://emergingtechblog.emc.com/wp-content/uploads/2015/10/AdobeStock_8
description: Zeus bezoekt het datacenter en de supercomputer in S10! description: Zeus bezoekt het datacenter en de supercomputer in S10!
created_at: 3-10-2016 created_at: 3-10-2016
time: 10-10-2016 time: 10-10-2016
location: hpc gent location: Datacenter UGent, S10, Sterre
locationlink: 51.023650, 3.712018 locationlink: 51.023650, 3.712018
--- ---

View file

@ -14,10 +14,9 @@
<%= render '/partials/_tile.*', article: all_events[1], small_text: "Upcoming event" %> <%= render '/partials/_tile.*', article: all_events[1], small_text: "Upcoming event" %>
</div> </div>
<div class="tile is-parent is-4"> <div class="tile is-parent is-4">
<div class="tile is-child box "> <div class="tile is-child box centering">
<div class="content has-text-centered"> <div class="content has-text-centered">
<div id="quote" > <div id="quote" >
<!--<img src="//thecatapi.com/api/images/get?format=src&type=gif&size=small"> -->
<!-- INTENTIONALLY LEFT BLANK --> <!-- INTENTIONALLY LEFT BLANK -->
</div> </div>
</div> </div>
@ -39,6 +38,7 @@
</a> </a>
</div> </div>
</div> </div>
<<<<<<< Updated upstream
<div class="tile is-vertical is-2"> <div class="tile is-vertical is-2">
<div class="tile is-parent"> <div class="tile is-parent">
<a class="tile box" href="https://github.com/ZeusWPI"> <a class="tile box" href="https://github.com/ZeusWPI">
@ -54,6 +54,12 @@
</div> </div>
</a> </a>
</div> </div>
=======
<div class="tile is-parent is-2">
<a class="tile is-child imgcenter box hydra-tile" href="//student.ugent.be/hydra">
<%= asset :img, 'hydra-logo.png' %>
</a>
>>>>>>> Stashed changes
</div> </div>
</div> </div>
<div class="tile"> <div class="tile">

View file

@ -18,13 +18,13 @@ title: Search
</div> </div>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$('#tipue_search_input').tipuesearch({ $('#tipue_search_input_field').tipuesearch({
'mode': 'json', 'mode': 'json',
'showTitleCount': false, 'showTitleCount': false,
'tipue_search_content': '#blog_results', 'tipue_search_content': '#blog_results',
'contentLocation': '../blog_search.json' 'contentLocation': '../blog_search.json'
}); });
$('#tipue_search_input').tipuesearch({ $('#tipue_search_input_field').tipuesearch({
'mode': 'json', 'mode': 'json',
'showTitleCount': false, 'showTitleCount': false,
'tipue_search_content': '#event_results', 'tipue_search_content': '#event_results',

View file

@ -6,8 +6,8 @@
<article class="media"> <article class="media">
<div class="media-content"> <div class="media-content">
<div class="content"> <div class="content">
<h2><%= post[:title] %></h2> <h2><%= post[:title] %> <small> <%= post[:created_at] %></small></h2>
<%= excerptize(post.reps[:text].compiled_content, length: 200) %> <%= post[:description] %>
</div> </div>
</div> </div>
</article> </article>
@ -19,7 +19,7 @@
<ul class = "archive_list"> <ul class = "archive_list">
<% academic_years_items.each do |year, item| %> <% academic_years_items.each do |year, item| %>
<li class="bolder"> <li class="bolder">
<%= link_to pretty_year(year), item %> <%= link_to_unless_current pretty_year(year), item %>
</li> </li>
<% end %> <% end %>
</ul> </ul>

View file

@ -15,7 +15,6 @@
<link rel="stylesheet" href="https://code.cdn.mozilla.net/fonts/fira.css"> <link rel="stylesheet" href="https://code.cdn.mozilla.net/fonts/fira.css">
<%= asset :css, :main %>
<link rel="icon" href="/assets/images/favicon32.png" type="image/x-icon" /> <link rel="icon" href="/assets/images/favicon32.png" type="image/x-icon" />
@ -35,6 +34,8 @@
<!-- Place this tag in your head or just before your close body tag. --> <!-- Place this tag in your head or just before your close body tag. -->
<script async defer src="https://buttons.github.io/buttons.js"></script> <script async defer src="https://buttons.github.io/buttons.js"></script>
<%= asset :css, :main %>
<%= content_for(@item, :head) %> <%= content_for(@item, :head) %>
</head> </head>
<body class="site"> <body class="site">

View file

@ -16,13 +16,14 @@
<p class="title is-1"> <p class="title is-1">
<b> <b>
<%= item[:title] %> <%= item[:title] %>
<%= fa :search %>
</b> </b>
</p> </p>
<p class="subtitle is-3"> <p class="subtitle is-3">
<%= item[:description] %> <%= item[:description] %>
</p> </p>
<p class="subtitle is-3"> <p class="subtitle is-3">
<ul class="fa-ul"> <ul class="fa-ul event-attributes">
<li><%= fa 'clock-o', li: true %><%= item[:time].strftime '%A %d %B %Y' %></li> <li><%= fa 'clock-o', li: true %><%= item[:time].strftime '%A %d %B %Y' %></li>
<li><%= fa 'map-marker', li: true %><%= item[:location] %></li> <li><%= fa 'map-marker', li: true %><%= item[:location] %></li>
</ul> </ul>

View file

@ -18,7 +18,9 @@
<% end %> <% end %>
</div> </div>
<form action="/search/?" method="get"> <form action="/search/?" method="get">
<input type="text" name="q" id="tipue_search_input" autocomplete="off"> <div id="tipue_search_input">
<input type="text" name="q" id="tipue_search_input_field" autocomplete="off">
</div>
</form> </form>