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 00000000..01991ec2 Binary files /dev/null and b/blogs/themes/mysociety/assets/images/mob-homepage-banner.png differ diff --git a/blogs/themes/mysociety/assets/scss/base.scss b/blogs/themes/mysociety/assets/scss/base.scss index 425b9a44..6aa5a979 100644 --- a/blogs/themes/mysociety/assets/scss/base.scss +++ b/blogs/themes/mysociety/assets/scss/base.scss @@ -772,6 +772,30 @@ article.post .entry-header { } } +.news-list { + @include list-reset-soft; + li { + margin-bottom:0.5em; + padding-bottom:0.5em; + h3 { + margin:0; + a { + color:#333333; + } + } + .entry-date { + color:#888888; + font-style:normal; + } + } +} + +.news_box { + border-bottom:0.25em solid #CFCFCF; //3px + margin-bottom:1em; + padding-bottom:1em; +} + /* PAGE SPECIFIC */ article.ms_project, article.ms_product, @@ -786,11 +810,44 @@ article.homepage { .entry-header { .banner { margin:1em 0; + text-align:center; } p.entry-intro { font-size:1.375em; //22px line-height:1.27272727272727em; //28px color:#333333; + text-align:center; + } + } + .twitter_box { + margin-bottom:2em; + } + .project_product-section { + .project_product-section-inner { + ul.block-list { + width:100%; + li { + width:100%; + display:block; + height:auto; + padding:0; + margin:0; + border-bottom:0.125em solid #cccccc; //2px + &:last-child { + border-bottom:none; + } + .thumb { + display:none; + } + h3 { + margin:0; + a { + width:100%; + padding:1em 0; + } + } + } + } } } } diff --git a/blogs/themes/mysociety/assets/scss/layout.scss b/blogs/themes/mysociety/assets/scss/layout.scss index 22a54ab7..e1dbc5c5 100644 --- a/blogs/themes/mysociety/assets/scss/layout.scss +++ b/blogs/themes/mysociety/assets/scss/layout.scss @@ -291,6 +291,18 @@ h2.pound, h2.build, h2.github, h2.codeblog, h2.wikidocs, h2.bubble, h2.twitter, } } +.news-list { + @extend .tweets; +} + +.news_box { + border-bottom:none; + padding-left:3em; //48px + >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}

    "; + ?> +
  • +