diff --git a/assets/less/blog.less b/assets/less/blog.less new file mode 100644 index 0000000..be5d073 --- /dev/null +++ b/assets/less/blog.less @@ -0,0 +1,25 @@ +.blog { + .news { + .local, .remote { + .make-md-column(6); + + article { + h2 { + font-size: 20px; + margin-bottom: 0; + } + h4 { + margin-top: 0; + } + } + } + &.no-local { + .local { + display: none; + } + .remote { + .make-md-column(12); + } + } + } +} diff --git a/assets/less/main.less b/assets/less/main.less index d971933..2a89fcc 100644 --- a/assets/less/main.less +++ b/assets/less/main.less @@ -17,4 +17,5 @@ @import 'events.less'; @import 'rte.less'; @import 'page.less'; +@import 'blog.less'; @import 'forms.less'; diff --git a/assets/less/page.less b/assets/less/page.less index e5052f7..f879f65 100644 --- a/assets/less/page.less +++ b/assets/less/page.less @@ -34,6 +34,7 @@ article { } h2 { margin-top: 0; + font-size: 20px; } // Add .com to "Bernie Sanders" link for more clarity p:last-child { diff --git a/home.php b/home.php index 7493923..1c9199d 100644 --- a/home.php +++ b/home.php @@ -2,9 +2,12 @@ get_header(); use SandersForPresident\Wordpress\Services\News\NewsFeedService; + use SandersForPresident\Wordpress\Services\News\RemoteNewsFeedService; $newsFeedService = new NewsFeedService(); - $news = $newsFeedService->getNewsFeed(); + $remoteNewsFeedService = new RemoteNewsFeedService(); + $localNews = $newsFeedService->getLocalNewsFeed(); + $remoteNews = $remoteNewsFeedService->getFeed(); ?>
@@ -12,6 +15,44 @@

News

+
+ +
+

Local News

+ + + +
+ +
+

Campaign News

+ + + +
+
+ +
diff --git a/lib/services/news/news_feed.php b/lib/services/news/news_feed.php index 241e2f4..2bced4c 100644 --- a/lib/services/news/news_feed.php +++ b/lib/services/news/news_feed.php @@ -14,7 +14,7 @@ public function __construct() { * Fetches the local news feed. * Note: currently MUST utilize The Loop */ - private function getLocalNewsFeed() { + public function getLocalNewsFeed() { global $post; $articles = array(); while (have_posts()) {