From 749f0da09ab9b18cc759a05bc5f235a748044e82 Mon Sep 17 00:00:00 2001
From: William Zhang <willzhang05@gmail.com>
Date: Wed, 6 Apr 2016 23:16:10 -0400
Subject: [PATCH] Cleaned up calendar in signage and realigned nav buttons

---
 intranet/static/css/signage.base.scss  | 14 +++++++++++++-
 intranet/static/css/signage.touch.scss | 13 ++++++++-----
 intranet/templates/signage/touch.html  | 14 +++++++++-----
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/intranet/static/css/signage.base.scss b/intranet/static/css/signage.base.scss
index 3afd66ac845..4c2f1b50de0 100644
--- a/intranet/static/css/signage.base.scss
+++ b/intranet/static/css/signage.base.scss
@@ -69,10 +69,22 @@ body {
     }
 }
 
+.iframe-wrapper {
+    width: 100%;
+    height: calc(100% - 55px);
+    position: relative;
+    overflow: hidden;
+    display: block;
+}
 .iframe {
     position: absolute;
     top: 32px;
     left: 0;
     width: 100%;
     height: calc(100% - 40px);
-}
\ No newline at end of file
+}
+
+.iframe.calendar {
+    margin-top: -80px;
+    height: calc(100% + 80px);
+}   
diff --git a/intranet/static/css/signage.touch.scss b/intranet/static/css/signage.touch.scss
index 17ad196d6e6..f4bdaff2aae 100644
--- a/intranet/static/css/signage.touch.scss
+++ b/intranet/static/css/signage.touch.scss
@@ -18,7 +18,6 @@ body, * {
 .nav {
     position: static;
     margin: 0 10px;
-    width: 100%;
     width: calc(100% - 20px);
 }
 
@@ -26,16 +25,20 @@ body, * {
     position: relative;
     margin-top: -2px;
     display: inline-block;
-    width: 25%;
-    width: calc(25% + 1px);
+    width: calc(25% - 0.75px);
     float: left;
     border: none;
+    margin-left: 1px;
     border-right: 1px solid rgb(0, 72, 171);
     cursor: pointer;
 }
 
+.nav li:first-child {
+    margin-left: 0;
+}
+
 .nav li:last-child {
-    border-right: none;
+    border-right: 0;
 }
 
 section {
@@ -85,4 +88,4 @@ section {
 #info .announcements .announcement {
     text-align: left;
     width: 100%;
-}
\ No newline at end of file
+}
diff --git a/intranet/templates/signage/touch.html b/intranet/templates/signage/touch.html
index 64a6dd800f5..5419266ca34 100644
--- a/intranet/templates/signage/touch.html
+++ b/intranet/templates/signage/touch.html
@@ -64,9 +64,10 @@
         $("a[data-link]").click(function() {
             var link = $(this).attr("data-link");
             var section = $("section#" + link);
+            //$("section").fadeOut(400);
             $("section").hide();
-            section.show();
-            
+            //section.fadeIn(400);
+            section.show();            
         });
 
         var default_page = "{{ default_page }}";
@@ -111,8 +112,9 @@
                     {% include "schedule/view.html" %}
                 </div>
             </div>
-
-            <iframe class="iframe" src="{{ eighth_url }}"></iframe>
+            <div class="iframe-wrapper"></div>
+                <iframe class="iframe" src="{{ eighth_url }}"></iframe>
+            </div>
         </section>
 
         <section id="calendar">
@@ -125,7 +127,9 @@
             </div>
 
             <div class="iframe-hide"></div>
-            <iframe class="iframe" src="{{ calendar_url }}"></iframe>
+            <div class="iframe-wrapper">    
+                <iframe class="iframe calendar" src="{{ calendar_url }}"></iframe>
+            </div>
         </section>
 
         <section id="info">