Merge branch 'dev' into catalog-opt-in-and-cache

assets/styles/aldine.scss

@@ -12,7 +12,8 @@
 @import "common/global";
 @import "components/book";
 @import "components/forms";
+@import "layouts/footer";
 @import "layouts/header";
-@import "layouts/front-page";
-@import "layouts/pages";
-@import "layouts/catalog";
+@import "layouts/page";
+@import "layouts/page-home";
+@import "layouts/page-catalog";

assets/styles/components/_book.scss

@@ -8,13 +8,13 @@
   margin: 0 0 2rem;
   padding: 1.5rem 1rem 2rem;
   @media #{$breakpoint-not-small} { padding: 1.5rem 1.85rem 2.1875rem; }
-  border: solid 2px var(--accent, $brand-accent);
-  background: var(--accent, $brand-accent);
+  border: solid 2px var(--accent);
+  background: var(--accent);
 
   a {
     margin: 0;
     font-family: $font-family-sans-serif;
-    color: var(--accent-fg, #fff);
+    color: var(--accent-fg);
     text-decoration: none;
     text-align: center;
   }

assets/styles/components/_forms.scss

@@ -16,7 +16,7 @@ textarea {
   border-top: 0;
   border-right: 0;
   border-left: 0;
-  border-bottom: solid 2px var(--black, #000);
+  border-bottom: solid 2px var(--black);
   border-radius: 0;
   padding: 0 0 1.5em;
   font-size: 1rem;
@@ -40,7 +40,7 @@ input[type="submit"] {
   width: rem(354);
 
   ::placeholder {
-    color: #000;
+    color: var(--black);
   }
 
   &__notice {
@@ -52,11 +52,11 @@ input[type="submit"] {
     text-align: center;
 
     &--error {
-      color: #c00;
+      color: var(--error, #c00);
     }
 
     &--success {
-      color: #070;
+      color: var(--success, #070);
     }
   }
 

assets/styles/editor.scss

@@ -1,7 +1,8 @@
 @import '~aetna/assets/styles/common/_variables.scss';
 @import '~aetna/assets/styles/common/_global.scss';
 
-#tinymce.wp-editor {
+body#tinymce {
+  margin: 12px !important;
   @import '~aetna/assets/styles/components/_buttons.scss';
   @import '~aetna/assets/styles/layouts/_page-sections.scss';
 }

assets/styles/layouts/_pages.scss

@@ -1,13 +0,0 @@
-// .page:not(.home) article {
-//   .entry-header h1 {
-//     @extend .h2;
-//   }
-
-//   @extend .page-section;
-//   text-align: left;
-//   width: 100%;
-//   max-width: rem(800);
-//   margin-top: calc(-80%);
-//   margin-left: auto;
-//   margin-right: auto;
-// }

assets/styles/layouts/_tinymce.scss

@@ -1,3 +0,0 @@
-body#tinymce {
-  margin: 12px !important;
-}