Merge pull request #7 from thewebplatform/master

Updating From Parent
thewebplatform · Jul 25, 2015 · 5053da3 · 5053da3
2 parents 0e43fd7 + 5511c91
commit 5053da3
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 19 deletions.
diff --git a/app/elements/about-us/about-us.html b/app/elements/about-us/about-us.html
@@ -9,6 +9,11 @@
 	</style>
 	<template>
 		<h1>About us Page</h1>
+		<p>About us Page</p>
+		<p>About us Page</p>
+		<p>About us Page</p>
+		<p>About us Page</p>
+		<p>About us Page</p>
 	</template>
 </dom-module>
 <script>

diff --git a/app/elements/elements.html b/app/elements/elements.html
@@ -27,6 +27,7 @@
 <link rel="import" href="../bower_components/paper-toolbar/paper-toolbar.html">
 <link rel="import" href="../bower_components/paper-tabs/paper-tabs.html" >
 <link rel="import" href="../bower_components/paper-tabs/paper-tab.html" >
+<link rel="import" href="../bower_components/paper-button/paper-button.html">
 
 <!-- Platinum elements -->
 <!--

diff --git a/app/elements/new-episode/new-episode.html b/app/elements/new-episode/new-episode.html
@@ -9,6 +9,12 @@
 	</style>
 	<template>
 		<h1>New Episode Page</h1>
+		<p>New Episode Page</p>
+		<p>New Episode Page</p>
+		<p>New Episode Page</p>
+		<p>New Episode Page</p>
+		<p>New Episode Page</p>
+		<p>New Episode Page</p>
 	</template>
 </dom-module>
 <script>

diff --git a/app/elements/previous-episodes/previous-episodes.html b/app/elements/previous-episodes/previous-episodes.html
@@ -9,6 +9,12 @@
 	</style>
 	<template>
 		<h1>Previous Episodes Page</h1>
+		<p>Previous Episodes Page</p>
+		<p>Previous Episodes Page</p>
+		<p>Previous Episodes Page</p>
+		<p>Previous Episodes Page</p>
+		<p>Previous Episodes Page</p>
+		<p>Previous Episodes Page</p>
 	</template>
 </dom-module>
 <script>

diff --git a/app/index.html b/app/index.html
@@ -99,18 +99,10 @@ <h3 class="paper-font-display2 flex center">The Web Platform Today</h3>
 
 				<!-- Footer -->
 				<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 multicol class="credits">
+						<div col center>
+							Made with <iron-icon class="crimson" icon="icons:favorite"></iron-icon> and <iron-icon class="mediumpurple" icon="icons:polymer"></iron-icon> by <paper-button raised class="webplatform-button" onclick="window.open('https://github.com/orgs/thewebplatform/people', '_blank');">The Web Platform Team</paper-button>
 						</div>
 					</div>
 					<div copyright-center>© 2015 The Web Platform Today</div>

diff --git a/app/styles/app-theme.html b/app/styles/app-theme.html
@@ -134,9 +134,7 @@
 		margin-top: 18px;
 		margin-left: 50px;
 	}
-	paper-tab {
-		min-width: 150px;
-	}
+
   /* Breakpoints */
 
   /* Small */
@@ -172,6 +170,16 @@
 		.multicol.universal-footer [multicol] > [col] {
 			flex: auto;
 		}
+
+		paper-tabs {
+			width: 100%;
+			margin-left: 0;
+		}
+
+
+		paper-tab {
+			min-width: calc( 30% - 11px );
+		}
 
   }
 
@@ -201,6 +209,10 @@
 		.multicol.universal-footer [multicol] > [col] {
 			flex: 1;
 		}
+
+		paper-tab {
+			min-width: 150px;
+		}
 
   }
 
@@ -227,9 +239,7 @@
 			font-size: 20px;
 		}
 
-		paper-toolbar paper-tabs {
-			display: none;
-		}
+
 	}
   /* mobile-small-landscape */
   @media all and (min-width: 0) and (max-width: 480px) and (orientation: landscape) { }

diff --git a/app/styles/main.css b/app/styles/main.css
@@ -27,4 +27,22 @@ body {
 
 .bottom {
 	height: 100%;
+}
+
+.credits {
+	color: white;
+	font-weight: 100;
+	margin: 30px auto 10px;
+}
+.crimson{
+	color: crimson;
+}
+
+.mediumpurple {
+	color: mediumpurple;
+}
+
+.webplatform-button {
+	background: #1976D2;
+	color: #BBDEFB;
 }
diff --git a/bower.json b/bower.json
@@ -26,7 +26,8 @@
     "universal-footer": "*",
     "podcast-player": "~1.0.1",
     "iron-image": "PolymerElements/iron-image#~1.0.2",
-    "paper-tabs": "PolymerElements/paper-tabs#~1.0.1"
+    "paper-tabs": "PolymerElements/paper-tabs#~1.0.1",
+    "paper-button": "PolymerElements/paper-button#~1.0.3"
   },
   "devDependencies": {
     "web-component-tester": "*",