UI fixes

2020-04-13 18:39:25 -05:00
parent 82f71aa923
commit ef66170ba4
10 changed files with 134 additions and 118 deletions
--- a/app/assets/templates/directives/editor-menu.pug
+++ b/app/assets/templates/directives/editor-menu.pug
@@ -19,10 +19,10 @@
        label='editor.name', 
        )
        .sk-menu-panel-column(
-          ng-if='editor.content.conflict_of'
+          ng-if='editor.conflictOf'
          )
          .info(
-            ng-if='editor.content.conflict_of'
+            ng-if='editor.conflictOf'
            ) Conflicted copy
      a.no-decoration(
        href='https://standardnotes.org/extensions',