diff --git a/content/assets/stylesheets/includes/404.scss b/content/assets/stylesheets/includes/404.scss
deleted file mode 100644
index 4f870ea..0000000
--- a/content/assets/stylesheets/includes/404.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.img-center {
- display:block;
- margin:auto;
-}
diff --git a/content/assets/stylesheets/includes/blogpost.scss b/content/assets/stylesheets/includes/blogpost.scss
index c36b3c4..4e64842 100644
--- a/content/assets/stylesheets/includes/blogpost.scss
+++ b/content/assets/stylesheets/includes/blogpost.scss
@@ -31,25 +31,8 @@ $sel: '';
}
}
-// Definition list is not defined in bulma
-dl {
- dt {
- display: inline;
- font-weight: bold;
- }
-
- dd {
- display: inline;
-
- &::after {
- content: "\A";
- white-space: pre;
- }
- }
-}
-
@keyframes lineAnimation {
- 100% {
+ to {
width: 80px;
opacity: 1;
}
@@ -83,6 +66,7 @@ dl {
}
}
+ // Under title line
&::after {
content: '';
opacity: 0;
@@ -96,12 +80,14 @@ dl {
background: $zeus-orange;
animation: lineAnimation 2s ease-in-out 1 normal forwards;
+ animation-delay: 0.5s;
}
}
.blog-preview {
position: relative;
+ // Fadeout
&::after {
content: '';
position: absolute;
diff --git a/content/assets/stylesheets/includes/cammie.scss b/content/assets/stylesheets/includes/cammie.scss
index ea844e7..54cb13d 100644
--- a/content/assets/stylesheets/includes/cammie.scss
+++ b/content/assets/stylesheets/includes/cammie.scss
@@ -3,7 +3,6 @@
#cammie-ctrls {
display: flex;
- justify-content: space-between;
flex-direction: column;
height: 100%;
width: 100%;
@@ -14,7 +13,6 @@
position: absolute;
top: 0;
- left: 0;
.columns {
margin: 0;
diff --git a/content/assets/stylesheets/includes/eventpage.scss b/content/assets/stylesheets/includes/eventpage.scss
index f4e28b8..711111c 100644
--- a/content/assets/stylesheets/includes/eventpage.scss
+++ b/content/assets/stylesheets/includes/eventpage.scss
@@ -1,17 +1,3 @@
-.google-maps {
- position: relative;
- height: 400px;
- overflow: hidden;
-
- iframe {
- position: absolute;
- top: 0;
- left: 0;
- width: 100% !important;
- height: 400px;
- }
-}
-
.banner-image{
justify-content: center;
display: flex;
@@ -35,7 +21,6 @@
}
.header-text {
- float: left;
padding: 20px;
&.light-background {
diff --git a/content/assets/stylesheets/includes/events.scss b/content/assets/stylesheets/includes/events.scss
index 908e3dc..b49f710 100644
--- a/content/assets/stylesheets/includes/events.scss
+++ b/content/assets/stylesheets/includes/events.scss
@@ -1,10 +1,3 @@
-.divider {
- align-items:flex-start;
- border: 1px solid lighten(gray, 45%);
- width: 67%;
- margin: 0 30% 0 3%;
-}
-
.box.event-preview {
border-radius: 0px;
display: flex;
@@ -13,10 +6,7 @@
padding:20px;
padding-top:0px;
- // border-top: 1px solid lighten(gray, 40%);
-
.image-holder {
- //border-radius: 50%;
padding: 10px;
border: 1px solid lighten(gray, 30%);
width: 15%;
@@ -24,7 +14,6 @@
}
.image {
- //border-radius: 50%;
vertical-align: baseline;
border: 1px solid gray;
}
@@ -35,7 +24,8 @@
box-shadow : none;
width: 60%;
//for better spacing on mobile
- @media screen and (max-width: 768px) {
+
+ @include mobile {
width: 100%;
}
.title {
@@ -74,8 +64,6 @@
border-radius: 0px;
box-shadow: none;
height: 8em;
- // display: flex;
- // align-items: center;
ul {
padding-left: .7em;
diff --git a/content/assets/stylesheets/includes/general.scss b/content/assets/stylesheets/includes/general.scss
index 9abc4ed..00f9cc0 100644
--- a/content/assets/stylesheets/includes/general.scss
+++ b/content/assets/stylesheets/includes/general.scss
@@ -152,3 +152,8 @@ footer.footer {
float: right;
margin: 15px;
}
+
+// Bold definition types in
+dt {
+ font-weight: bold;
+}
diff --git a/content/assets/stylesheets/includes/tiles.scss b/content/assets/stylesheets/includes/tiles.scss
index 1245168..4a680ad 100644
--- a/content/assets/stylesheets/includes/tiles.scss
+++ b/content/assets/stylesheets/includes/tiles.scss
@@ -18,10 +18,11 @@ a.box {
.centering {
display: flex;
+
justify-content: center;
align-items: center;
}
-.highlighted{
+.highlighted {
background: $tile-orange;
.content {
color: white;
@@ -34,9 +35,6 @@ a.box {
}
}
}
-#quote{
- font-style: italic;
-}
.icon a{
color:$tile-orange;
@@ -44,60 +42,59 @@ a.box {
#gamification-coders {
display: flex;
+
justify-content: center;
table {
position: relative;
tr:first-child {
- height: $top_coder_size;
width: $top_coder_size;
+ height: $top_coder_size;
.picture img {
- height: $top_coder_size;
width: $top_coder_size !important;
+ height: $top_coder_size;
box-shadow: 0 0 0 3px #fff, 0 0 0 4px #999, 0 2px 5px 4px rgba(0,0,0,0.2);
}
}
td {
+ padding: 0;
vertical-align: middle;
text-align: center;
- padding: 0;
&.picture {
width: $top_coder_size !important;
}
&.score {
- text-align: right;
padding-right: 10px;
+ text-align: right;
}
}
}
.picture img {
- height: 40px;
- width: 40px !important;
- vertical-align: middle;
- margin: 10px 0;
- border-radius: 50px;
z-index: 1;
+ margin: 10px 0;
+ width: 40px !important;
+ height: 40px;
+ border-radius: 50px;
+ vertical-align: middle;
}
}
#blokmap-tile {
position: relative;
-
height: 200px;
//background-image: url("https://i.imgur.com/PMaIG7X.jpg");
background-image: url("https://cldup.com/-FmSDFbd07.jpg");
-
background-position: center;
.overlay {
- left: 0;
- top: 0;
position: absolute;
- height: 100%;
+ top: 0;
+ left: 0;
width: 100%;
+ height: 100%;
background-color: rgba(0, 0, 0, 0.2);
}
diff --git a/content/assets/stylesheets/main.scss b/content/assets/stylesheets/main.scss
index 405bb4a..35cd4c0 100644
--- a/content/assets/stylesheets/main.scss
+++ b/content/assets/stylesheets/main.scss
@@ -29,7 +29,6 @@ body.site {
@import "includes/blogpost";
@import "includes/general";
@import "includes/eventpage";
-@import "includes/404";
@import "includes/projects";
@import "includes/navbar";
@import "includes/search";
diff --git a/content/cammie.erb b/content/cammie.erb
index a70ab7d..20c7b75 100644
--- a/content/cammie.erb
+++ b/content/cammie.erb
@@ -2,6 +2,10 @@
navigable: true
title: Cammie
---
+<% content_for :scripts do %>
+<%= asset :js, :cammie %>
+<% end %>
+
@@ -59,6 +63,3 @@ title: Cammie
-
-
-<%= asset :js, :cammie %>
diff --git a/layouts/eventpost.erb b/layouts/eventpost.erb
index 25e2b24..7611e1e 100644
--- a/layouts/eventpost.erb
+++ b/layouts/eventpost.erb
@@ -68,11 +68,7 @@
<%= yield %>
-
-
-
diff --git a/package.json b/package.json
index 4494d80..a255e50 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,6 @@
"license": "MIT",
"repository": "https://github.com/ZeusWPI/zeus.ugent.be",
"dependencies": {
- "bulma": "0.4.0"
+ "bulma": "0.4.1"
}
}