From 4760c6014ce7f3c16e2e3eb4873dee561cb1467b Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Mon, 2 Apr 2012 16:44:57 +0100 Subject: [PATCH] Lots of frontage stuff --- blogs/themes/mysociety/assets/css/base.css | 61 +++++++++++ blogs/themes/mysociety/assets/css/layout.css | 26 ++++- .../assets/images/mob-homepage-banner.png | Bin 0 -> 7872 bytes blogs/themes/mysociety/assets/scss/base.scss | 57 +++++++++++ .../themes/mysociety/assets/scss/layout.scss | 27 +++++ blogs/themes/mysociety/front-page.php | 96 +++++++++++++++--- 6 files changed, 251 insertions(+), 16 deletions(-) create mode 100644 blogs/themes/mysociety/assets/images/mob-homepage-banner.png diff --git a/blogs/themes/mysociety/assets/css/base.css b/blogs/themes/mysociety/assets/css/base.css index 5ec305c9..0544e33f 100644 --- a/blogs/themes/mysociety/assets/css/base.css +++ b/blogs/themes/mysociety/assets/css/base.css @@ -1308,6 +1308,38 @@ article.post .entry-header { clear: both; } +.news-list { + list-style-type: none; + padding: 0; + margin: 0; +} +.news-list li { + list-style-type: none; + padding: 0; + margin: 0; + border: 0; +} +.news-list li { + margin-bottom: 0.5em; + padding-bottom: 0.5em; +} +.news-list li h3 { + margin: 0; +} +.news-list li h3 a { + color: #333333; +} +.news-list li .entry-date { + color: #888888; + font-style: normal; +} + +.news_box { + border-bottom: 0.25em solid #CFCFCF; + margin-bottom: 1em; + padding-bottom: 1em; +} + /* PAGE SPECIFIC */ article.ms_project .entry-header, article.ms_product .entry-header, @@ -1317,11 +1349,40 @@ article.page .entry-header { article.homepage .entry-header .banner { margin: 1em 0; + text-align: center; } article.homepage .entry-header p.entry-intro { font-size: 1.375em; line-height: 1.27272727272727em; color: #333333; + text-align: center; +} +article.homepage .twitter_box { + margin-bottom: 2em; +} +article.homepage .project_product-section .project_product-section-inner ul.block-list { + width: 100%; +} +article.homepage .project_product-section .project_product-section-inner ul.block-list li { + width: 100%; + display: block; + height: auto; + padding: 0; + margin: 0; + border-bottom: 0.125em solid #cccccc; +} +article.homepage .project_product-section .project_product-section-inner ul.block-list li:last-child { + border-bottom: none; +} +article.homepage .project_product-section .project_product-section-inner ul.block-list li .thumb { + display: none; +} +article.homepage .project_product-section .project_product-section-inner ul.block-list li h3 { + margin: 0; +} +article.homepage .project_product-section .project_product-section-inner ul.block-list li h3 a { + width: 100%; + padding: 1em 0; } .product-section-header { diff --git a/blogs/themes/mysociety/assets/css/layout.css b/blogs/themes/mysociety/assets/css/layout.css index 0e858ad0..5a2be59a 100644 --- a/blogs/themes/mysociety/assets/css/layout.css +++ b/blogs/themes/mysociety/assets/css/layout.css @@ -254,14 +254,14 @@ h2.pound, h2.build, h2.github, h2.codeblog, h2.wikidocs, h2.bubble, h2.twitter, margin-bottom: 1em !important; } -.tweets { +.tweets, .news-list { background: white url(../images/grid_12.gif) center repeat; } -.tweets li { +.tweets li, .news-list li { display: block; border-bottom: 0.0625em solid #EEEEEE; } -.tweets li:last-child { +.tweets li:last-child, .news-list li:last-child { border-bottom: none; } @@ -277,6 +277,14 @@ h2.pound, h2.build, h2.github, h2.codeblog, h2.wikidocs, h2.bubble, h2.twitter, clear: left; } +.news_box { + border-bottom: none; + padding-left: 3em; +} +.news_box > h2 { + margin-left: -1.174em; +} + #tab-nav { list-style-type: none; padding: 0; @@ -296,6 +304,18 @@ h2.pound, h2.build, h2.github, h2.codeblog, h2.wikidocs, h2.bubble, h2.twitter, } /* PAGE SPECIFIC */ +article.homepage #news-and-twitter { + overflow: hidden; +} +article.homepage #news-and-twitter .news_box { + width: 40em; + float: left; +} +article.homepage #news-and-twitter .twitter_box { + width: 20em; + float: left; +} + .product-section-header h2 { margin-left: 0; margin-right: 0; diff --git a/blogs/themes/mysociety/assets/images/mob-homepage-banner.png b/blogs/themes/mysociety/assets/images/mob-homepage-banner.png new file mode 100644 index 0000000000000000000000000000000000000000..01991ec2aa6b6c046a8c3b939b130d7fe4fd2e69 GIT binary patch literal 7872 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 F{{h2 {// font base size is 46px + margin-left:-1.17391304347826em; //54px + } +} + #tab-nav { @include list-reset; } @@ -298,6 +310,21 @@ h2.pound, h2.build, h2.github, h2.codeblog, h2.wikidocs, h2.bubble, h2.twitter, /* PAGE SPECIFIC */ +//homepage +article.homepage { + #news-and-twitter { + overflow:hidden; + .news_box { + width:40em; + float:left; + } + .twitter_box { + width:20em; + float:left; + } + } +} + //product list page .product-section-header { h2 {// font base size is 46px diff --git a/blogs/themes/mysociety/front-page.php b/blogs/themes/mysociety/front-page.php index 363772d0..81237ab6 100644 --- a/blogs/themes/mysociety/front-page.php +++ b/blogs/themes/mysociety/front-page.php @@ -3,36 +3,106 @@

-
-

+
+
+

News

+
    + have_posts()) : $news_query->the_post(); + ?> +
  • +

    + +
    • + +
+
+ + +
+ +
+

    - + + have_posts()) : $not_for_profit_posts->the_post(); $i++; ?> +
  • "> + {$image["; + } + ?> + +

    + + 100) + echo '

    '.substr($intro, 0, 100) . '...

    '; + else + echo "

    {$intro}

    "; + ?> +
    • +
-
-

+
+

    + + have_posts()) : $commercial_products->the_post(); $i++; ?> +
  • "> + {$image["; + } + ?> + +

    + 100) + echo '

    '.substr($intro, 0, 100) . '...

    '; + else + echo "

    {$intro}

    "; + ?> +
    • +