From: Ove Klykken <ove@gaslightmedia.com>
Date: Fri, 25 Jul 2014 16:30:12 +0000 (-0400)
Subject: -Toolbox images not floating on Small
X-Git-Tag: VV1^2~69
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=852c79033c191ef82be33a1184599dfd56bdb632;p=web%2FCityofMI.git

-Toolbox images not floating on Small
-Large toolbox images from Medium down.
-Main menu forced below logo when needed.
-Stopped GLM blocks for opening up new windows.
-Newsletter header
-Tested HTML Newsletter
---

diff --git a/Toolkit/Events/templates/eventHomePage.html b/Toolkit/Events/templates/eventHomePage.html
old mode 100644
new mode 100755
index 4f4c34a..41f4972
--- a/Toolkit/Events/templates/eventHomePage.html
+++ b/Toolkit/Events/templates/eventHomePage.html
@@ -1,5 +1,5 @@
 <style>
-.slider-wrapper .nivoSlider {
+/* .slider-wrapper .nivoSlider {
 	position:relative;
 	height: 250px;
 	}
@@ -19,6 +19,7 @@
 .nivo-caption span {
 	float: right;
 	}
+    */
 </style>
 <div class="slider-wrapper theme-default" flexy:if="hasFeaturedEvents">
 	<div class="ribbon"></div>
diff --git a/admin/Contact/newsletter_template.html b/admin/Contact/newsletter_template.html
index 9a145a7..46a7528 100755
--- a/admin/Contact/newsletter_template.html
+++ b/admin/Contact/newsletter_template.html
@@ -10,7 +10,7 @@
       <table cellspacing="0" cellpadding="0" border="0" width="550" bgcolor="#ffffff">
       	<tr>
       		<td>
-						<a href="<!-- url -->"><img src="<!-- url -->assets/nHeader.jpg" width="550" height="114" alt="" style="border: 0; display: block;"></a>
+						<a href="<!-- url -->"><img src="<!-- url -->assets/nHeader.jpg" width="550" height="100" alt="" style="border: 0; display: block;"></a>
 					</td>
 				</tr>
 				<tr>
diff --git a/styles.css b/styles.css
index 183f674..8265378 100755
--- a/styles.css
+++ b/styles.css
@@ -73,8 +73,13 @@ a:hover {
     cursor: pointer;
     }
 /* Navigation */
+/* For larger than Small */
+@media only screen and (min-width: 53em) {
 #header nav {
     margin-top: -55px;
+        }
+    }
+#header nav {
     margin-left: -0.9375rem;
     margin-right: -0.9375rem;
     background-image: url(assets/navBg.png);
@@ -140,18 +145,25 @@ a:hover {
     font-size: 22px;
     color: #477645;
     }
-.imageleft {
-    margin: 0 20px 20px 0;
-    float: left;
-    }
-.imageright {
-    margin: 0 0 20px 20px;
-    float: right;
-    }
 /* For Small */
 @media only screen {
     .imageleft, .imageright {
         float: none;
+        width: 100% !important;
+        }
+
+    }
+/* For larger than Small */
+@media only screen and (min-width: 40.063em) {
+    .imageleft {
+        float: left;
+        width: 300px !important;
+        margin: 0 20px 20px 0;
+        }
+    .imageright {
+        float: right;
+        width: 300px !important;
+        margin: 0 0 20px 20px;
         }
     }
 .imagecaption {
@@ -317,6 +329,8 @@ a:hover {
     color: white;
     font-size: 22px;
     text-align: center;
+    margin: .5em 15px;
+    border-bottom: 1px solid #ddd;
     }
 #subnav a {
     color: white;
@@ -324,6 +338,7 @@ a:hover {
     text-decoration: none;
     line-height: 1.1em;
     padding: 3px 0;
+    font-size: 15px;
     }
 #subnav a:hover {
     color: #9dc6af;
diff --git a/templates/template.html b/templates/template.html
index 3af3270..8c4940a 100755
--- a/templates/template.html
+++ b/templates/template.html
@@ -67,13 +67,13 @@
 
 
                     <div class="row clearfix" id="homeSlide" flexy:if="isHomePage"  data-equalizer>
-                        <div class="large-9 columns" data-equalizer-watch>
+                        <div class="medium-9 columns" data-equalizer-watch>
                             <div id="slideshow" flexy:if="rotatingImages">
                                 {rotatingImages:h}
                             </div>
 
                         </div>
-                        <div class="large-3 columns">
+                        <div class="medium-3 columns">
                             <div id="homepage_events_wrapper" flexy:if="hasEvents" data-equalizer-watch>
                                 <div id="cEventMeetings">Meetings</div>
                                 <div id="cEventMore"><a href="{baseURLDefined:h}calendars-10/">Events</a></div>
@@ -134,11 +134,11 @@
                                             <li flexy:foreach="headlines,v" class="hHlinesItem">
                                                 {if:v[img]}
                                                 {if:v[external]}
-                                                <a href="{v[href]:h}" target="_blank">
+                                                <a href="{v[href]:h}">
                                                     {else:}
-                                                <a href="{v[href]:h}" target="_blank">
+                                                <a href="{v[href]:h}">
                                                     {end:}
-                                                    <img src="{v[img]:h}" alt="Home page headline image">
+                                                    <img src="{v[img]:h}" alt="">
                                                     <i>{v[header]:h}</i>
                                                 </a>
                                                 {end:}
diff --git a/userArea/Contact/newsletter_template.html b/userArea/Contact/newsletter_template.html
index 9a145a7..46a7528 100755
--- a/userArea/Contact/newsletter_template.html
+++ b/userArea/Contact/newsletter_template.html
@@ -10,7 +10,7 @@
       <table cellspacing="0" cellpadding="0" border="0" width="550" bgcolor="#ffffff">
       	<tr>
       		<td>
-						<a href="<!-- url -->"><img src="<!-- url -->assets/nHeader.jpg" width="550" height="114" alt="" style="border: 0; display: block;"></a>
+						<a href="<!-- url -->"><img src="<!-- url -->assets/nHeader.jpg" width="550" height="100" alt="" style="border: 0; display: block;"></a>
 					</td>
 				</tr>
 				<tr>