Skip to content

Commit 5053da3

Browse files
prateekjadhwaniprateekjadhwani
committed
Merge pull request #7 from thewebplatform/master
Updating From Parent
2 parents 0e43fd7 + 5511c91 commit 5053da3

File tree

8 files changed

+58
-19
lines changed

8 files changed

+58
-19
lines changed

‎app/elements/about-us/about-us.html

+5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
</style>
1010
<template>
1111
<h1>About us Page</h1>
12+
<p>About us Page</p>
13+
<p>About us Page</p>
14+
<p>About us Page</p>
15+
<p>About us Page</p>
16+
<p>About us Page</p>
1217
</template>
1318
</dom-module>
1419
<script>

‎app/elements/elements.html

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<link rel="import" href="../bower_components/paper-toolbar/paper-toolbar.html">
2828
<link rel="import" href="../bower_components/paper-tabs/paper-tabs.html" >
2929
<link rel="import" href="../bower_components/paper-tabs/paper-tab.html" >
30+
<link rel="import" href="../bower_components/paper-button/paper-button.html">
3031

3132
<!-- Platinum elements -->
3233
<!--

‎app/elements/new-episode/new-episode.html

+6
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@
99
</style>
1010
<template>
1111
<h1>New Episode Page</h1>
12+
<p>New Episode Page</p>
13+
<p>New Episode Page</p>
14+
<p>New Episode Page</p>
15+
<p>New Episode Page</p>
16+
<p>New Episode Page</p>
17+
<p>New Episode Page</p>
1218
</template>
1319
</dom-module>
1420
<script>

‎app/elements/previous-episodes/previous-episodes.html

+6
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@
99
</style>
1010
<template>
1111
<h1>Previous Episodes Page</h1>
12+
<p>Previous Episodes Page</p>
13+
<p>Previous Episodes Page</p>
14+
<p>Previous Episodes Page</p>
15+
<p>Previous Episodes Page</p>
16+
<p>Previous Episodes Page</p>
17+
<p>Previous Episodes Page</p>
1218
</template>
1319
</dom-module>
1420
<script>

‎app/index.html

+4-12
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,10 @@ <h3 class="paper-font-display2 flex center">The Web Platform Today</h3>
9999

100100
<!-- Footer -->
101101
<universal-footer>
102-
<div multicol>
103-
<div col>
104-
<div row title>About the Web Platform Podcast</div>
105-
<div row longtext>
106-
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.
107-
</div>
108-
</div>
109-
<div col>
110-
<div row title>About the Web Platform Podcast</div>
111-
<div row longtext>
112-
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.
113-
</div>
102+
103+
<div multicol class="credits">
104+
<div col center>
105+
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>
114106
</div>
115107
</div>
116108
<div copyright-center>© 2015 The Web Platform Today</div>

‎app/styles/app-theme.html

+16-6
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,7 @@
134134
margin-top: 18px;
135135
margin-left: 50px;
136136
}
137-
paper-tab {
138-
min-width: 150px;
139-
}
137+
140138
/* Breakpoints */
141139

142140
/* Small */
@@ -172,6 +170,16 @@
172170
.multicol.universal-footer [multicol] > [col] {
173171
flex: auto;
174172
}
173+
174+
paper-tabs {
175+
width: 100%;
176+
margin-left: 0;
177+
}
178+
179+
180+
paper-tab {
181+
min-width: calc( 30% - 11px );
182+
}
175183

176184
}
177185

@@ -201,6 +209,10 @@
201209
.multicol.universal-footer [multicol] > [col] {
202210
flex: 1;
203211
}
212+
213+
paper-tab {
214+
min-width: 150px;
215+
}
204216

205217
}
206218

@@ -227,9 +239,7 @@
227239
font-size: 20px;
228240
}
229241

230-
paper-toolbar paper-tabs {
231-
display: none;
232-
}
242+
233243
}
234244
/* mobile-small-landscape */
235245
@media all and (min-width: 0) and (max-width: 480px) and (orientation: landscape) { }

‎app/styles/main.css

+18
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,22 @@ body {
2727

2828
.bottom {
2929
height: 100%;
30+
}
31+
32+
.credits {
33+
color: white;
34+
font-weight: 100;
35+
margin: 30px auto 10px;
36+
}
37+
.crimson{
38+
color: crimson;
39+
}
40+
41+
.mediumpurple {
42+
color: mediumpurple;
43+
}
44+
45+
.webplatform-button {
46+
background: #1976D2;
47+
color: #BBDEFB;
3048
}

‎bower.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
"universal-footer": "*",
2727
"podcast-player": "~1.0.1",
2828
"iron-image": "PolymerElements/iron-image#~1.0.2",
29-
"paper-tabs": "PolymerElements/paper-tabs#~1.0.1"
29+
"paper-tabs": "PolymerElements/paper-tabs#~1.0.1",
30+
"paper-button": "PolymerElements/paper-button#~1.0.3"
3031
},
3132
"devDependencies": {
3233
"web-component-tester": "*",

0 commit comments

Comments
 (0)