projects / web / CityofMI.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a3c6875)
subnav marker. misc styles and template
authorOve Klykken <ove@gaslightmedia.com>
Mon, 21 Jul 2014 15:17:28 +0000 (11:17 -0400)
committerOve Klykken <ove@gaslightmedia.com>
Mon, 21 Jul 2014 15:17:28 +0000 (11:17 -0400)
assets/subnavMarker.png [new file with mode: 0755] patch | blob
styles.css patch | blob | history
templates/template.html [changed mode: 0644->0755] patch | blob | history

diff --git a/assets/subnavMarker.png b/assets/subnavMarker.png
new file mode 100755 (executable)
index 0000000..aaabf1a
Binary files /dev/null and b/assets/subnavMarker.png differ
diff --git a/styles.css b/styles.css
index e3bc302..797d395 100755 (executable)
--- a/styles.css
+++ b/styles.css
@@ -10,6 +10,9 @@ body {
 #header {\r
     position: relative;\r
     }\r
+a {\r
+    text-decoration: underline;\r
+    }\r
 /* Logo */\r
 #logo {\r
     margin-left: -27px;\r
@@ -77,6 +80,7 @@ body {
     display: block;\r
     padding-left: 20px;\r
     padding-right: 20px;\r
+    text-decoration: none;\r
     }\r
 /* Slideshow */\r
 #homeSlide {\r
@@ -226,3 +230,59 @@ body {
 #eventItemWrapper .cEventCategory {\r
     display: block; \r
     }\r
+/* Subnav */\r
+#subnav {\r
+    width: 223px;\r
+    background-color: rgb(43, 133, 168);\r
+    border: 2px solid white;\r
+    box-shadow: 1px 1px 2px rgba(0, 0, 0, .5);\r
+    }\r
+#subnav h2 {\r
+    color: white;\r
+    font-family: 'Source Sans Pro', sans-serif;\r
+    font-weight: bold;\r
+    font-size: 22px;\r
+    text-align: center;\r
+    }\r
+#subnav a {\r
+    color: white;\r
+    display: block;\r
+    text-decoration: none;\r
+    }\r
+#subnav a:hover {\r
+    color: #9dc6af;\r
+    text-shadow: 1px 1px #000;\r
+    }\r
+#subnav a#current {\r
+    background: url(assets/subnavMarker.png) no-repeat center left;\r
+    padding-left: 14px;\r
+    }\r
+#subnav ul,\r
+#subnav li {\r
+    list-style-type: none;\r
+    margin: 0;\r
+    padding: 0;\r
+    }\r
+#subnav ul {\r
+    margin: 15px;\r
+    }\r
+#subnav li {\r
+    display: block;\r
+    }\r
+#main {\r
+    margin-top: 16px;\r
+    }\r
+#breadcrumbs {\r
+    font-size: 12px;\r
+    color: rgba(0, 0, 0, .5);\r
+    }\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
diff --git a/templates/template.html b/templates/template.html
old mode 100644 (file)
new mode 100755 (executable)
index 86948ca..460b7d3
--- a/templates/template.html
+++ b/templates/template.html
@@ -9,7 +9,7 @@
         <link rel="stylesheet" href="{mediaBaseURL:h}css/foundation.css">
         <link rel="stylesheet" href="{mediaBaseURL:h}styles.css">
         {topScripts:h}
-
+        <link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600' rel='stylesheet' type='text/css'>
     </head>
     {if:isHomePage}
     <body id="home">
@@ -63,9 +63,6 @@
                         </div>
                     </div>
 
-                    <div id="subnav">
-                        {sideNav:h}
-                    </div>
 
                     <div class="row" id="homeSlide" flexy:if="isHomePage">
                         <div class="large-9 columns">
@@ -77,7 +74,7 @@
                         <div class="large-3 columns">
                             <div id="homepage_events_wrapper" flexy:if="hasEvents">
                                 <div id="cEventMeetings">Meetings</div>
-                                <div id="cEventMore"><a href="{baseURLDefined:h}events-79/">More Events</a></div>
+                                <div id="cEventMore"><a href="{baseURLDefined:h}calendars-10/">More Events</a></div>
                                 <div id="eventCalendarWrapper">{smallCal:h}</div>
                                 <div id="eventItemWrapper">
                                     <a flexy:foreach="events,v" href="{v[href]:h}" class="cEventItem">
@@ -103,32 +100,41 @@
                         </div>
                     </div>
                     <div class="row">
-                        <div class="large-12 columns">
-                            <div id="toolbox">
-                                {toolboxContent:h}
-                            </div>
-                            <section id="hHlines" class="opensearchserver.ignore"  flexy:if="hasHeadlines">
-                                <ul class="small-block-grid-2 medium-block-grid-3">
-                                    <li flexy:foreach="headlines,v" class="hHlinesItem">
-                                {if:v[external]}
-                                <a href="{v[href]:h}" class="hHlinesHeaderLink" target="_blank">
-                                {else:}
-                                <a href="{v[href]:h}" class="hHlinesHeaderLink">
-                                {end:}
-                                {v[header]:h}</a>
-                                {if:v[img]}
-                                    {if:v[external]}
-                                    <a href="{v[href]:h}" class="hHlinesImageLink" target="_blank">
-                                    {else:}
-                                    <a href="{v[href]:h}" class="hHlinesImageLink" target="_blank">
-                                    {end:}
-                                    <img src="{v[img]:h}" alt="Home page headline image">
-                                </a>
-                                {end:}
-                                <p>{v[descr]:h}<span class="hHlinesMore"> <a href="{v[href]:h}" class="hHlinesMoreLink">More ></a></span></p>
-                            </li><!-- /.hHlinesItem -->
-                                </ul>
-                            </section>
+                        <div class="large-12 columns" id="main">
+                            <div class="row">
+                                <div class="large-3 columns">
+                                    <div id="subnav">
+                                        {sideNav:h}
+                                    </div>
+                                </div>
+                                <div class="large-9 columns">
+                                    <div id="toolbox">
+                                        {toolboxContent:h}
+                                    </div>
+                                    <section id="hHlines" class="opensearchserver.ignore"  flexy:if="hasHeadlines">
+                                        <ul class="small-block-grid-2 medium-block-grid-3">
+                                            <li flexy:foreach="headlines,v" class="hHlinesItem">
+                                        {if:v[external]}
+                                        <a href="{v[href]:h}" class="hHlinesHeaderLink" target="_blank">
+                                        {else:}
+                                        <a href="{v[href]:h}" class="hHlinesHeaderLink">
+                                        {end:}
+                                        {v[header]:h}</a>
+                                        {if:v[img]}
+                                            {if:v[external]}
+                                            <a href="{v[href]:h}" class="hHlinesImageLink" target="_blank">
+                                            {else:}
+                                            <a href="{v[href]:h}" class="hHlinesImageLink" target="_blank">
+                                            {end:}
+                                            <img src="{v[img]:h}" alt="Home page headline image">
+                                        </a>
+                                        {end:}
+                                        <p>{v[descr]:h}<span class="hHlinesMore"> <a href="{v[href]:h}" class="hHlinesMoreLink">More ></a></span></p>
+                                    </li><!-- /.hHlinesItem -->
+                                        </ul>
+                                    </section>
+                                </div>
+                            </div>
                         </div>
                     </div>