From 260bc694bf7c988f064077758da3536a775d5eb2 Mon Sep 17 00:00:00 2001 From: Chip Black Date: Sat, 16 Nov 2013 02:27:13 -0800 Subject: [PATCH] Change some Welcome style as suggested by Benny --- www/css/blerg.css | 52 ++++++++++++++++++++++++++++++++------ www/development.html | 3 +++ www/jssrc/blerg/Welcome.js | 16 +++++++++--- 3 files changed, 59 insertions(+), 12 deletions(-) diff --git a/www/css/blerg.css b/www/css/blerg.css index b99c134..eb34757 100644 --- a/www/css/blerg.css +++ b/www/css/blerg.css @@ -152,7 +152,7 @@ h1, h2, h3 { } .blerg-main { - padding: 15pt 15pt 20pt 15pt; + padding: 15pt 15pt 0 15pt; } .signup-button { @@ -291,27 +291,62 @@ h1, h2, h3 { margin: 1em 0; } +.latest { + display: table; + margin: 0 auto; + border-spacing: 10px; + height: 600px; +} + .latest h2 { font-size: 16pt; + margin-top: 0; +} + +.latest-scroller { + max-height: 600px; + padding: 12px; + overflow-y: auto; +} + +.latest-posts { + display: table-cell; + border: 2px solid #E6E6E6; + color: #4C4C4C; + width: 850px; +} + +.latest-posts .record { + font-size: 12pt; + margin: 10px 0; } .latest-tags { - text-align: center; + display: table-cell; + border: 2px solid #E6E6E6; + background-color: #FAE3FC; line-height: 2em; + width: 480px; } .latest-tags a { margin: 0 0.75em; } -.latest-posts { - height: 184pt; - overflow: hidden; +@media screen and (min-width: 1400px) { + .latest { width: 1340px; } } -.latest-posts .record { - font-size: 12pt; - margin: 8pt 0; +@media screen and (max-width: 1100px) { + .latest { display: block; } + .latest-posts { + display: block; + width: auto; + margin-right: 0; + overflow: auto; + height: auto; + } + .latest-tags { display: block; width: auto; } } .author { @@ -364,6 +399,7 @@ table.help td { } footer { + clear: both; margin: 15pt; font-size: small; color: #333; diff --git a/www/development.html b/www/development.html index 86c2403..6a5601a 100644 --- a/www/development.html +++ b/www/development.html @@ -17,5 +17,8 @@ + diff --git a/www/jssrc/blerg/Welcome.js b/www/jssrc/blerg/Welcome.js index aff858f..6b7f2ad 100644 --- a/www/jssrc/blerg/Welcome.js +++ b/www/jssrc/blerg/Welcome.js @@ -20,10 +20,18 @@ enyo.kind({ {style: "clear: both;"}, {name: "contentBox", allowHtml: true}, {classes: "latest", components: [ - {tag: "h2", content: "Latest posts"}, - {name: "latestPosts", classes: "latest-posts", onmouseover: "pauseTicker", onmouseout: "startTicker"}, - {tag: "h2", content: "Latest tags"}, - {name: "latestTags", classes: "latest-tags"} + {classes: "latest-posts", components: [ + {classes: "latest-scroller", components: [ + {tag: "h2", content: "Latest posts"}, + {name: "latestPosts", onmouseover: "pauseTicker", onmouseout: "startTicker"} + ]} + ]}, + {classes: "latest-tags", components: [ + {classes: "latest-scroller", components: [ + {tag: "h2", content: "Latest tags"}, + {name: "latestTags"} + ]} + ]} ]} ], create: function() { -- 2.25.1