Merge branch 'master' into relivew

Conflicts:
	31c3/assets/css/lustige-styles.css.map

1 files changed, 19 insertions, 6 deletions

diff --git a/assets/css/src/lustige-styles.scss b/assets/css/src/lustige-styles.scss
index 54da6c3..95201b8 100644
--- a/assets/css/src/lustige-styles.scss
+++ b/assets/css/src/lustige-styles.scss
@@ -31,7 +31,7 @@ body {
   width: 100%;
   overflow: hidden;
   overflow-y: initial;
-  margin-bottom: 20px;
+  margin-bottom: 55px;
 }
 
 .top-space {
@@ -334,10 +334,13 @@ a.inverted {
 
     &.recordings {
       text-align: center;
-      font-size: 3.25em;
-      padding: .75em;
-      a:hover {
-        text-decoration: none;
+      li a {
+        color: $brand-primary;
+        font-size: 4em;
+
+        &:hover {
+          text-decoration: none;
+        }
       }
     }
 
@@ -354,6 +357,12 @@ a.inverted {
     li {
       padding: 5px !important;
 
+      &.sendezentrum a .title {
+        left: 240px;
+        text-shadow: none;
+        font-weight: normal;
+      }
+
       a {
         background-color: $gray-dark;
         color: white;
@@ -809,12 +818,16 @@ a.inverted {
       color: $gray-lighter;
     }
 
+    h5 {
+      color: $gray-lighter;
+    }
+
     a {
       color: white;
     }
 
     &.event h3 {
-      height: 48px;
+      //height: 48px;
       overflow: hidden;
     }