Merge pull request #221 from lblod/chore/bump-editor-v0.49.0

Bump editor and corresponding appuniversum

app/components/rdfa-editor-container.hbs

@@ -1,7 +1,7 @@
 {{#if @busy}}
   <div class="container-flex--contain">
     <div class="au-c-rdfa-editor">
-      <div class="say-container say-container--sidebar-left">
+      <div class="say-container say-container--sidebar-left say-container--paper say-container--sidebar-right">
         <div class="say-container__main">
           <div class="say-editor rdfa-annotations rdfa-annotations-highlight rdfa-annotations-hover">
             <div class="say-editor__paper">

app/components/rdfa-editor-container.js

@@ -13,6 +13,8 @@ export default class RdfaEditorContainerComponent extends Component {
         showRdfa: true,
         showRdfaHighlight: true,
         showRdfaHover: true,
+        showPaper: true,
+        showSidebar: true
       }
     );
   }

app/styles/_shame.scss

@@ -577,3 +577,14 @@
     border-bottom-color: $au-blue-900;
   }
 }
+
+// DISABLED EDITOR
+// ---
+.say-content--disabled {
+  cursor: default;
+}
+
+// Override main container on mock-login
+.au-c-main-container--mock-login {
+  height: 100%;
+}

app/styles/app.scss

@@ -24,11 +24,11 @@
 @import "appuniversum/s-colors.scss";
 @import "appuniversum/s-global";
 @import "appuniversum/s-utilities";
+@import "appuniversum/s-root";
 
 
 // PROJECT SPECIFIC VARIABLES
 @import "project/s-global";
-@import "project/s-say-theme";
 
 
 // MIXINS
@@ -104,7 +104,6 @@
 @import "project/c-theme";
 
 
-
 // UTILITIES
 @import "appuniversum/u-align-text";
 @import "appuniversum/u-break-word";

app/templates/agendapoints/show.hbs

@@ -8,7 +8,7 @@
 
 <div class="au-c-body-container">
   <div class="au-c-rdfa-editor">
-    <div class="say-container say-container--sidebar-left">
+    <div class="say-container say-container--sidebar-left say-container--paper say-container--sidebar-right">
       <div class="say-container__main">
         {{#unless this.readOnly}}
           <div class="au-o-box au-o-box--small au-c-theme-gray-100">

app/templates/mock-login.hbs

@@ -1,4 +1,4 @@
-<div class="au-c-main-container" itemprop="mainContentOfPage">
+<div class="au-c-main-container au-c-main-container--mock-login" itemprop="mainContentOfPage">
   <div class="au-c-main-container__content au-c-main-container__content--scroll">
     <main id="content">
       <AuContentHeader @titlePartOne="Vlaanderen" @titlePartTwo="is gelinkt notuleren">
@@ -27,7 +27,7 @@
               {{/if}}
               <login.each-account @accounts={{this.model}} as |account|>
                 <div class="au-o-box au-o-box--small au-c-card au-u-margin-bottom-small">
-                  <p>{{account.gebruiker.voornaam}} {{account.gebruiker.achternaam}}</p>
+                  <p class="au-u-h6">{{account.gebruiker.voornaam}} {{account.gebruiker.achternaam}}</p>
                 </div>
               </login.each-account>
               <NumberPagination @page={{this.page}} @size={{this.size}} @nbOfItems={{this.model.length}} @total={{this.model.meta.count}} @links={{this.model.meta.pagination}} />

package.json

@@ -26,16 +26,16 @@
     "test:ember": "ember test"
   },
   "devDependencies": {
-    "@appuniversum/appuniversum": "0.1.5",
-    "@appuniversum/ember-appuniversum": "0.6.5",
+    "@appuniversum/appuniversum": "0.2.1",
+    "@appuniversum/ember-appuniversum": "0.7.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/render-modifiers": "^1.0.2",
     "@ember/test-helpers": "^2.1.4",
     "@glimmer/component": "^1.0.3",
     "@glimmer/tracking": "^1.0.3",
     "@lblod/ember-acmidm-login": "^1.2.0",
     "@lblod/ember-mock-login": "0.5.0",
-    "@lblod/ember-rdfa-editor": "^0.48.0",
+    "@lblod/ember-rdfa-editor": "^0.49.0",
     "@lblod/ember-rdfa-editor-besluit-type-plugin": "0.4.0",
     "@lblod/ember-rdfa-editor-citaten-plugin": "0.13.2",
     "@lblod/ember-rdfa-editor-document-title-plugin": "0.2.0",