Component improvements

2020-03-26 15:33:00 -05:00
parent 9d6c32890a
commit 822d8553b7
14 changed files with 242 additions and 206 deletions
--- a/app/assets/templates/directives/editor-menu.pug
+++ b/app/assets/templates/directives/editor-menu.pug
@@ -21,7 +21,7 @@
        .sk-menu-panel-column(
          ng-if='editor.content.conflict_of || self.shouldDisplayRunningLocallyLabel(editor)'
          )
-          strong.danger.medium-text(
+          .info(
            ng-if='editor.content.conflict_of'
            ) Conflicted copy
          .sk-sublabel(