Merge pull request #5 from thewebplatform/master

Updating From Parent
thewebplatform · Jul 19, 2015 · b24c267 · b24c267
2 parents 16b319c + cd30895
commit b24c267
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 5 deletions.
diff --git a/app/elements/elements.html b/app/elements/elements.html
@@ -26,8 +26,13 @@
 <link rel="import" href="../bower_components/paper-toolbar/paper-toolbar.html">
 
 <!-- Platinum elements -->
+<!--
 <link rel="import" href="../bower_components/platinum-sw/platinum-sw-cache.html">
 <link rel="import" href="../bower_components/platinum-sw/platinum-sw-register.html">
+-->
+
+<!-- Other public elements -->
+<link rel="import" href="../bower_components/universal-footer/universal-footer.html" />
 
 <!-- Add your elements here -->
 <link rel="import" href="../styles/app-theme.html">

diff --git a/app/index.html b/app/index.html
@@ -167,6 +167,23 @@ <h2 class="paper-font-display2">Contact</h2>
             </section>
 
           </iron-pages>
+					<universal-footer>
+						<div multicol>
+							<div col>
+								<div row title>About the Web Platform Podcast</div>
+								<div row longtext>
+									Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer porta urna massa, vel gravida nulla hendrerit vel. Etiam sit amet tellus pretium, faucibus libero vitae, facilisis orci. Maecenas sed imperdiet ipsum. Integer imperdiet dignissim magna ut malesuada. Morbi vulputate lobortis odio a suscipit. Pellentesque sodales justo varius, blandit magna vel, aliquet sapien. Fusce nibh magna, porttitor a eleifend sit amet, commodo id dolor. Vivamus lobortis orci nec condimentum porta. Curabitur odio tortor, vestibulum cursus mauris semper, aliquam ultrices velit. Etiam tincidunt vulputate euismod. Suspendisse vitae dolor at libero lobortis tincidunt quis ac purus. Donec sed commodo leo, quis pellentesque nunc. Ut vestibulum arcu sed est vulputate, vel molestie sem accumsan. Proin ultrices tempus massa. Morbi feugiat nisi id hendrerit mollis. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
+								</div>
+							</div>
+							<div col>
+								<div row title>About the Web Platform Podcast</div>
+								<div row longtext>
+									Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer porta urna massa, vel gravida nulla hendrerit vel. Etiam sit amet tellus pretium, faucibus libero vitae, facilisis orci. Maecenas sed imperdiet ipsum. Integer imperdiet dignissim magna ut malesuada. Morbi vulputate lobortis odio a suscipit. Pellentesque sodales justo varius, blandit magna vel, aliquet sapien. Fusce nibh magna, porttitor a eleifend sit amet, commodo id dolor. Vivamus lobortis orci nec condimentum porta. Curabitur odio tortor, vestibulum cursus mauris semper, aliquam ultrices velit. Etiam tincidunt vulputate euismod. Suspendisse vitae dolor at libero lobortis tincidunt quis ac purus. Donec sed commodo leo, quis pellentesque nunc. Ut vestibulum arcu sed est vulputate, vel molestie sem accumsan. Proin ultrices tempus massa. Morbi feugiat nisi id hendrerit mollis. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
+								</div>
+							</div>
+						</div>
+						<div copyright-center>© 2015 The Web Platform Today</div>
+					</universal-footer>
         </div>
       </paper-header-panel>
     </paper-drawer-panel>

diff --git a/app/styles/app-theme.html b/app/styles/app-theme.html
@@ -114,6 +114,13 @@
   .content {
     height: 900px;
   }
+
+	universal-footer {
+		--universal-footer-background-color: black;
+		--universal-footer-text-color: gray;
+		--universal-footer-col-title-color: #0170ba;
+		--universal-footer-padding: 40px;
+	}
 
   /* Breakpoints */
 
@@ -146,6 +153,10 @@
     .bg {
       background: white;
     }
+
+		.multicol.universal-footer [multicol] > [col] {
+			flex: auto;
+		}
 
   }
 
@@ -159,13 +170,22 @@
       padding-right: 30px;
     }
 
-    #drawer.paper-drawer-panel > [drawer] {
-      border-right: 1px solid rgba(0, 0, 0, 0.14);
-    }
+    paper-drawer-panel {
+			--paper-drawer-panel-left-drawer-container: {
+				display: none;
+			};
+			--paper-drawer-panel-main-container: {
+				left: 0px !important;
+			};
+		}
 
     iron-pages {
       padding: 48px 62px;
     }
+
+		.multicol.universal-footer [multicol] > [col] {
+			flex: 1;
+		}
 
   }
 

diff --git a/bower.json b/bower.json
@@ -9,7 +9,7 @@
   "main": "index.html",
   "license": "MIT",
   "private": true,
-	"ignore": [
+  "ignore": [
     "**/.*",
     "node_modules",
     "bower_components",
@@ -22,7 +22,8 @@
     "paper-elements": "PolymerElements/paper-elements#1.0.1",
     "platinum-elements": "PolymerElements/platinum-elements#1.0.1",
     "neon-elements": "PolymerElements/neon-elements#1.0.0",
-    "page": "visionmedia/page.js#~1.6.3"
+    "page": "visionmedia/page.js#~1.6.3",
+    "universal-footer": "*"
   },
   "devDependencies": {
     "web-component-tester": "*",