aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Bidelman2012-04-09 23:35:39 -0700
committerEric Bidelman2012-04-09 23:35:39 -0700
commit10b9ae9cd661540c377b5e598cd1f38b7f79cc2d (patch)
tree597303be5d80cd1c1a52f5034984e9a211d17188
parente14c8eaca6aa822bdac44de2147ad2b6285532bc (diff)
downloadio-slides-remote-10b9ae9cd661540c377b5e598cd1f38b7f79cc2d.tar.gz
Tables that kick azz
-rw-r--r--template.html85
-rw-r--r--theme/css/default.css168
-rw-r--r--theme/sass/default.scss50
3 files changed, 217 insertions, 86 deletions
diff --git a/template.html b/template.html
index d6a03ae..a86bf46 100644
--- a/template.html
+++ b/template.html
@@ -178,6 +178,91 @@ function helloWorld(world) {
178 </article> 178 </article>
179 </slide> 179 </slide>
180 180
181 <slide>
182 <hgroup>
183 <h2>Table Option A</h2>
184 <h3>Subtitle Placeholder</h3>
185 </hgroup>
186 <article>
187 <table>
188 <tr>
189 <th></th><th>Column 1</th><th>Column 2</th><th>Column 3</th><th>Column 4</th>
190 </tr>
191 <tr>
192 <td>Row 1</td><td>placeholder</td><td class="highlight">placeholder</td><td>placeholder</td><td>placeholder</td>
193 </tr>
194 <tr>
195 <td>Row 2</td><td>placeholder</td><td>placeholder</td><td>placeholder</td><td>placeholder</td>
196 </tr>
197 <tr>
198 <td>Row 3</td><td>placeholder</td><td>placeholder</td><td>placeholder</td><td>placeholder</td>
199 </tr>
200 <tr>
201 <td>Row 4</td><td>placeholder</td><td>placeholder</td><td>placeholder</td><td>placeholder</td>
202 </tr>
203 <tr>
204 <td>Row 5</td><td>placeholder</td><td>placeholder</td><td>placeholder</td><td>placeholder</td>
205 </tr>
206 </table>
207 </article>
208 </slide>
209
210 <slide>
211 <hgroup>
212 <h2>Table Option A (small text)</h2>
213 <h3>Subtitle Placeholder</h3>
214 </hgroup>
215 <article class="smaller">
216 <table>
217 <tr>
218 <th></th><th>Column 1</th><th>Column 2</th><th>Column 3</th><th>Column 4</th>
219 </tr>
220 <tr>
221 <td>Row 1</td><td>placeholder</td><td class="highlight">placeholder</td><td>placeholder</td><td>placeholder</td>
222 </tr>
223 <tr>
224 <td>Row 2</td><td>placeholder</td><td>placeholder</td><td>placeholder</td><td>placeholder</td>
225 </tr>
226 <tr>
227 <td>Row 3</td><td>placeholder</td><td>placeholder</td><td>placeholder</td><td>placeholder</td>
228 </tr>
229 <tr>
230 <td>Row 4</td><td>placeholder</td><td>placeholder</td><td>placeholder</td><td>placeholder</td>
231 </tr>
232 <tr>
233 <td>Row 5</td><td>placeholder</td><td>placeholder</td><td>placeholder</td><td>placeholder</td>
234 </tr>
235 </table>
236 </article>
237 </slide>
238
239 <slide>
240 <hgroup>
241 <h2>Table Option B</h2>
242 <h3>Subtitle Placeholder</h3>
243 </hgroup>
244 <article>
245 <table class="rows">
246 <tr>
247 <th>Header 1</th><td>placeholder</td><td class="highlight">placeholder</td><td>placeholder</td>
248 </tr>
249 <tr>
250 <th>Header 2</th><td>placeholder</td><td>placeholder</td><td>placeholder</td>
251 </tr>
252 <tr>
253 <th>Header 3</th><td>placeholder</td><td>placeholder</td><td>placeholder</td>
254 </tr>
255 <tr>
256 <th>Header 4</th><td>placeholder</td><td>placeholder</td><td>placeholder</td>
257 </tr>
258 <tr>
259 <th>Header 5</th><td>placeholder</td><td>placeholder</td><td>placeholder</td>
260 </tr>
261 </table>
262 </article>
263 </slide>
264
265
181 <slide class="segue dark nobackground"> 266 <slide class="segue dark nobackground">
182 <aside class="gdbar"><img src="images/google_developers_icon_128.png"></aside> 267 <aside class="gdbar"><img src="images/google_developers_icon_128.png"></aside>
183 <hgroup class="auto-fadein"> 268 <hgroup class="auto-fadein">
diff --git a/theme/css/default.css b/theme/css/default.css
index 75984cd..63c72a8 100644
--- a/theme/css/default.css
+++ b/theme/css/default.css
@@ -771,43 +771,71 @@ img.centered {
771/* line 442, ../sass/default.scss */ 771/* line 442, ../sass/default.scss */
772table { 772table {
773 width: 100%; 773 width: 100%;
774 border-collapse: collapse; 774 border-collapse: -moz-initial;
775 margin-top: 40px; 775 border-collapse: initial;
776 border-spacing: 2px;
777 border-bottom: 1px solid #797979;
776} 778}
777 779/* line 449, ../sass/default.scss */
778/* line 448, ../sass/default.scss */ 780table tr > td:first-child, table th {
779th {
780 font-weight: 600; 781 font-weight: 600;
781 text-align: left; 782 color: #515151;
782} 783}
783
784/* line 454, ../sass/default.scss */ 784/* line 454, ../sass/default.scss */
785td, 785table tr:nth-child(odd) {
786th { 786 background-color: #e6e6e6;
787 border: 1px solid #e0e0e0; 787}
788 padding: 5px 10px; 788/* line 458, ../sass/default.scss */
789 vertical-align: top; 789table th {
790 color: white;
791 font-size: 18px;
792 background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(40%, #4387fd), color-stop(80%, #2a7cdf)) no-repeat;
793 background: -webkit-linear-gradient(top, #4387fd 40%, #2a7cdf 80%) no-repeat;
794 background: -moz-linear-gradient(top, #4387fd 40%, #2a7cdf 80%) no-repeat;
795 background: -o-linear-gradient(top, #4387fd 40%, #2a7cdf 80%) no-repeat;
796 background: -ms-linear-gradient(top, #4387fd 40%, #2a7cdf 80%) no-repeat;
797 background: linear-gradient(top, #4387fd 40%, #2a7cdf 80%) no-repeat;
798}
799/* line 464, ../sass/default.scss */
800table td, table th {
801 font-size: 18px;
802 padding: 1em 0.5em;
803}
804/* line 469, ../sass/default.scss */
805table td.highlight {
806 color: #515151;
807 background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(40%, #ffd14d), color-stop(80%, #f6c000)) no-repeat;
808 background: -webkit-linear-gradient(top, #ffd14d 40%, #f6c000 80%) no-repeat;
809 background: -moz-linear-gradient(top, #ffd14d 40%, #f6c000 80%) no-repeat;
810 background: -o-linear-gradient(top, #ffd14d 40%, #f6c000 80%) no-repeat;
811 background: -ms-linear-gradient(top, #ffd14d 40%, #f6c000 80%) no-repeat;
812 background: linear-gradient(top, #ffd14d 40%, #f6c000 80%) no-repeat;
813}
814/* line 474, ../sass/default.scss */
815table.rows {
816 border-bottom: none;
817 border-right: 1px solid #797979;
790} 818}
791 819
792/* line 460, ../sass/default.scss */ 820/* line 480, ../sass/default.scss */
793q { 821q {
794 font-size: 45px; 822 font-size: 45px;
795 line-height: 72px; 823 line-height: 72px;
796} 824}
797/* line 464, ../sass/default.scss */ 825/* line 484, ../sass/default.scss */
798q:before { 826q:before {
799 content: '“'; 827 content: '“';
800 position: absolute; 828 position: absolute;
801 margin-left: -0.5em; 829 margin-left: -0.5em;
802} 830}
803/* line 469, ../sass/default.scss */ 831/* line 489, ../sass/default.scss */
804q:after { 832q:after {
805 content: '”'; 833 content: '”';
806 position: absolute; 834 position: absolute;
807 margin-left: 0.1em; 835 margin-left: 0.1em;
808} 836}
809 837
810/* line 476, ../sass/default.scss */ 838/* line 496, ../sass/default.scss */
811slide.fill { 839slide.fill {
812 -moz-border-radius: 5px; 840 -moz-border-radius: 5px;
813 -webkit-border-radius: 5px; 841 -webkit-border-radius: 5px;
@@ -816,7 +844,7 @@ slide.fill {
816 -khtml-border-radius: 5px; 844 -khtml-border-radius: 5px;
817 border-radius: 5px; 845 border-radius: 5px;
818} 846}
819/* line 479, ../sass/default.scss */ 847/* line 499, ../sass/default.scss */
820slide.fill h3 { 848slide.fill h3 {
821 background: rgba(255, 255, 255, 0.75); 849 background: rgba(255, 255, 255, 0.75);
822 padding-top: .2em; 850 padding-top: .2em;
@@ -827,7 +855,7 @@ slide.fill h3 {
827 margin-right: -60px; 855 margin-right: -60px;
828 padding-right: 60px; 856 padding-right: 60px;
829} 857}
830/* line 490, ../sass/default.scss */ 858/* line 510, ../sass/default.scss */
831slide.fill h4 { 859slide.fill h4 {
832 display: inline; 860 display: inline;
833 position: absolute; 861 position: absolute;
@@ -836,91 +864,89 @@ slide.fill h4 {
836} 864}
837 865
838/* Size variants */ 866/* Size variants */
839/* line 501, ../sass/default.scss */ 867/* line 521, ../sass/default.scss */
840article.smaller p, article.smaller ul { 868article.smaller p, article.smaller ul {
841 font-size: 20px; 869 font-size: 20px;
842 line-height: 24px; 870 line-height: 24px;
843 letter-spacing: 0; 871 letter-spacing: 0;
844} 872}
845/* line 506, ../sass/default.scss */ 873/* line 527, ../sass/default.scss */
846article.smaller table {