Merge branch 'master' into master-legacy

CHANGELOG.md

@@ -1,5 +1,23 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). It uses [CalVer](https://calver.org/) as of May 2019.
 
+## [20.01b](https://github.com/berkmancenter/lumendatabase/releases/tag/2020.01b) - 2020-01-31
+### Changed
+* CMS URL promoted to the top level, so that the CMS is now serving blog and static page content
+* Maintenance page is now served from a different directory
+* Tests of blog and pages functionality updated to ensure same behavior in the CMS
+* `high_voltage-pages` CSS class renamed to `static-pages` so as not to baffle future developers
+
+### Removed
+* `BlogEntry` and `BlogEntryTopicAssignment` models and associated code
+* `OriginalNewsId` controller
+  * The content was migrated into the CMS in an intermediate commit, not tagged as a release.
+* Rake tasks from 20.01a (no longer usable as `BlogEntry` no longer exists)
+* `high_voltage` gem and existing static pages (`app/views/pages` directory)
+
+### Added
+* `web-console` gem, for debugging in development
+* Testing of RSS feed
+
 ## [20.01a](https://github.com/berkmancenter/lumendatabase/releases/tag/2020.01a) - 2020-01-21
 ### Added
 * We have a CMS! (Comfortable-Mexican-Sofa)

app/assets/stylesheets/layouts/_application.scss

@@ -48,12 +48,10 @@ section.main.app {
 }
 
 // Add inner padding to certain pages
-body.topics-show, .static-pages {
-  .main-inner {
-    padding: $base-padding;
+body.topics-show .main-inner, .main-inner .static-pages {
+  padding: $base-padding;
 
-    @include media($mobile) {
-      padding: $base-padding-mobile;
-    }
+  @include media($mobile) {
+    padding: $base-padding-mobile;
   }
 }

app/assets/stylesheets/pages/_pages.scss

@@ -1,32 +1,26 @@
 .static-pages {
-  section.main {
-    section {
-      margin-bottom: 30px;
-    }
-
-    ul {
-      list-style-type: none;
-      margin: 0;
-      padding: 0;
-    }
+  ul {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+  }
 
-    h2 {
-      font-size: 20px;
-      line-height: 1.4em;
-      margin-top: 1.5em;
-      margin-bottom: 0.4em;
-      color: $base-title-color;
-      font-weight: 700;
-    }
+  h2 {
+    font-size: 20px;
+    line-height: 1.4em;
+    margin-top: 1.5em;
+    margin-bottom: 0.4em;
+    color: $base-title-color;
+    font-weight: 700;
+  }
 
-    h3 {
-      font-size: 18px;
-      color: $base-font-color-2;
-    }
+  h3 {
+    font-size: 18px;
+    color: $base-font-color-2;
+  }
 
-    p, li {
-      line-height: 1.6em;
-    }
+  p, li {
+    line-height: 1.6em;
   }
 }
 

app/views/cms_pages/_layout.html.erb

@@ -1,9 +1,5 @@
 <% title cms_fragment_content('page_title', @cms_page) %>
 
 <div class="static-pages">
-  <section class="main">
-    <div class="main-inner">
-      <%= raw cms_fragment_content('page_content', @cms_page) %>
-    </div>
-  </section>
+  <%= raw cms_fragment_content('page_content', @cms_page) %>
 </div>