Move console styles out of inbox

johndjameson · johndjameson · commit c55c729c185e · 2015-04-16T13:04:37.000-04:00
diff --git a/client/stylesheets/application.sass b/client/stylesheets/application.sass
@@ -65,16 +65,6 @@
 //   Inbox
 // -------------------------------------
 
-// We use <code> blocks to indicate weight in the console
-.console-msg
-  p
-    line-height: 25px
-  code
-    background-color: #fff
-    color: #333
-    border-radius: 4px
-    padding: 4px
-
 // Animations are handled using Angulars ng-animate which adds and
 // removes classes during various phases. If this doesn't work we can
 // do something different, but ng-animate is pretty crazy flexible in the timing
diff --git a/client/stylesheets/structures/_console.sass b/client/stylesheets/structures/_console.sass
@@ -3,6 +3,8 @@
 //   Console
 //   -> Terminal window
 //
+//  Dependencies: .CodeMirror .cm-*
+//
 // -------------------------------------
 //   Template (Haml)
 // -------------------------------------
@@ -27,19 +29,18 @@
   width: 100%
 
   ul
-    @extend .lr
+    +list-reset
 
   li
     color: $console-color
 
-  .CodeMirror,
-  .cm-s-vibrant-ink.CodeMirror,
+  .CodeMirror
     background: $console-background
     color: $console-color
 
-    div.CodeMirror-cursor
+    .CodeMirror-cursor
       border-color: $console-color
-      border-size: $console-cursor-size
+      border-width: $console-cursor-size
 
 // -------------------------------------
 //   Modifiers
@@ -68,8 +69,17 @@
 
 .console-msg
   color: $c-subdue
+  line-height: 1.5
   margin-top: $b-space-s
 
+  code
+    background-color: $console-color
+    border-radius: $b-borderRadius
+    color: $console-background
+    display: inline-block
+    padding-left: 0.5ch
+    padding-right: 0.5ch
+
 // Error
 
 .console-msg--error
