Merge branch '62_content_area_current_color'

# Conflicts: # package.json # stylesheets/main.min.css
Voog · Nov 9, 2016 · 3459a38 · 3459a38
2 parents e6c5d9e + d61e3cc
commit 3459a38
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 44 deletions.
diff --git a/sources/stylesheets/_general.scss b/sources/stylesheets/_general.scss
@@ -18,32 +18,6 @@ body {
   }
 }
 
-// CMS DEFAULT STYLES OVERRIDES
-.dark-background {
-  .edy-empty-bordered {
-    color: rgba($white, .33);
-    border-color: rgba($white, .33);
-  }
-
-  .placeholder {
-    color: rgba($white, 5);
-  }
-
-  .edy-content-element-hover {
-    border-color: rgba($white, .1);
-  }
-
-  .edy-texteditor-active {
-    outline-color: rgba($white, .2);
-
-    &,
-    &:hover {
-      outline-color: rgba($white, .63);
-    }
-  }
-}
-
-
 // Layout specific body classes.
 .front-page {
 }

diff --git a/stylesheets/main.css b/stylesheets/main.css
@@ -16,23 +16,6 @@ body.dark-background {
   color: white;
 }
 
-.dark-background .edy-empty-bordered {
-  color: rgba(255, 255, 255, 0.33);
-  border-color: rgba(255, 255, 255, 0.33);
-}
-.dark-background .placeholder {
-  color: white;
-}
-.dark-background .edy-content-element-hover {
-  border-color: rgba(255, 255, 255, 0.1);
-}
-.dark-background .edy-texteditor-active {
-  outline-color: rgba(255, 255, 255, 0.2);
-}
-.dark-background .edy-texteditor-active, .dark-background .edy-texteditor-active:hover {
-  outline-color: rgba(255, 255, 255, 0.63);
-}
-
 .content-formatted:after {
   content: "";
   display: table;