Merge Styling Portlets Framework - Meeds-io/MIPs#144 (#1018)

Meeds-io · Jul 5, 2024 · c06a5a9 · c06a5a9
2 parents 735325d + a74e814
commit c06a5a9
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 12 deletions.
diff --git a/notes-webapp/src/main/webapp/ckeditor/skins/common/custom-variables.less b/notes-webapp/src/main/webapp/ckeditor/skins/common/custom-variables.less
@@ -14,13 +14,11 @@
   Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-@normalFontSize: 16px;
 @bodyMargin: 19px;
 @blockquoteFontStyle: normal;
 @blockquoteMargin: 0 0 10px 0;
 @blockquotePadding: 10px;
-@ckEditableFontSize: 14px;
+@ckEditableFontSize: 16px;
 @ckEditableLineHeight: 1.4;
-@titleFontWeight: 500;
 @listMargin: 0 0 10px 0;
 
diff --git a/notes-webapp/src/main/webapp/skin/less/notes/notes-mixins.less b/notes-webapp/src/main/webapp/skin/less/notes/notes-mixins.less
@@ -63,7 +63,6 @@
 		padding: 6px 25px 4px 6px ~'; /** orientation=rt */ ';
 		.popupTitle {
 			color: @textColor;
-			font-size: 14px;
 			font-weight: bold;
 			line-height: 25px;
 		}

diff --git a/notes-webapp/src/main/webapp/vue-app/note-page-view/components/NotePageEdit.vue b/notes-webapp/src/main/webapp/vue-app/note-page-view/components/NotePageEdit.vue
@@ -19,7 +19,7 @@
 
 -->
 <template>
-  <div>
+  <div class="d-flex flex-column">
     <v-card
       v-if="fixedToolbar"
       :min-height="richEditorToolbarHeight"
@@ -32,7 +32,7 @@
       :instance-id="richEditorId"
       :toolbar-location="isSmall && 'bottom' || 'top'"
       :large-toolbar="!isSmall"
-      class="no-border-recursive"
+      class="no-border-recursive flex-grow-1"
       @ready="$root.$emit('notes-editor-ready')"
       @unloaded="$root.$emit('notes-editor-unloaded')" />
     <div

diff --git a/notes-webapp/src/main/webapp/vue-app/note-page-view/components/NotePageViewApp.vue b/notes-webapp/src/main/webapp/vue-app/note-page-view/components/NotePageViewApp.vue
@@ -29,8 +29,7 @@
         }"
         min-width="100%"
         max-width="100%"
-        min-height="60"
-        class="d-flex flex-column border-box-sizing position-relative card-border-radius app-background-color"
+        class="d-flex flex-column border-box-sizing position-relative application-body"
         flat>
         <template v-if="edit">
           <note-page-edit-drawer
@@ -43,7 +42,7 @@
             ref="editor"
             :class="editorBackgroundLoading && 'position-absolute l-0 r-0'"
             :style="editorBackgroundLoading && 'z-index: -1;'"
-            class="full-width"
+            class="full-width full-height"
             @saved="closeEditor"
             @cancel="closeEditor" />
         </template>
@@ -56,7 +55,7 @@
           <note-page-view
             v-if="hasNote"
             :class="editorLoading && 'opacity-8 filter-blur-1'"
-            class="full-width overflow-hidden pa-1" />
+            class="full-width full-height overflow-hidden pa-1" />
         </template>
       </v-card>
     </v-hover>

diff --git a/...webapp/vue-app/notes-favorite-drawer-extension/components/favorites/NotesFavoriteItem.vue b/...webapp/vue-app/notes-favorite-drawer-extension/components/favorites/NotesFavoriteItem.vue
@@ -8,7 +8,7 @@
     </v-list-item-icon>
 
     <v-list-item-content>
-      <v-list-item-title class="text-color body-2 text-truncate">{{ noteTitle }}</v-list-item-title>
+      <v-list-item-title class="text-color text-truncate">{{ noteTitle }}</v-list-item-title>
     </v-list-item-content>
 
     <v-list-item-action>

diff --git a/notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue b/notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue
@@ -6,7 +6,7 @@
     <div>
       <div
         v-if="isAvailableNote"
-        class="notes-application card-border-radius app-background-color pa-5"
+        class="notes-application application-body pa-5"
         ref="content">
         <div class="notes-application-header">
           <div class="notes-title d-flex justify-space-between pb-4 ps-1">