Update gap defaults, library load order

ubc-web-services · Aug 28, 2023 · 0643a41 · 0643a41
1 parent fc64dd5
commit 0643a41
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 39 deletions.
diff --git a/css/gap.css b/css/gap.css
@@ -1,24 +1,24 @@
 /* gap */
 .gap-0 {
-  gap: 0;
+  gap: 0 !important;
 }
 
 .gap-4 {
-  gap: 1rem;
+  gap: 1rem !important;
 }
 
 .gap-6 {
-  gap: 1.5rem;
+  gap: 1.5rem !important;
 }
 
 .gap-8 {
-  gap: 2rem;
+  gap: 2rem !important;
 }
 
 .gap-12 {
-  gap: 3rem;
+  gap: 3rem !important;
 }
 
 .gap-16 {
-  gap: 4rem;
+  gap: 4rem !important;
 }
diff --git a/css/ubc.columns.css b/css/ubc.columns.css
@@ -38,7 +38,7 @@
 
   .widget-column-options .widget--md--grid {
     display: grid;
-    gap: 2rem;
+    gap: 1.5rem;
     grid-template-columns: repeat(12,minmax(0,1fr));
     grid-template-rows: auto;
   }
@@ -114,7 +114,7 @@
     width: 1px;
     position: absolute;
     background-color: #e0e0e0;
-    right: -1rem; /* default placement */
+    right: -.75rem; /* default placement */
   }
 
   .widget-columns-2 .gap-0 .widget-region-one::after,

diff --git a/css/ubc.widget.default.styles.css b/css/ubc.widget.default.styles.css
@@ -37,7 +37,7 @@
   }
 
   /* for CKE4 widget support, we only apply the style if the gap class isn't there */
-  .md--flex-grid:not(.gap-0, .gap-4, .gap-8, .gap-12, .gap-16) {
+  .md--flex-grid:not(.gap-0, .gap-4, .gap-6, .gap-8, .gap-12, .gap-16) {
     gap: 1.5rem;
   }
 

diff --git a/ubc_ckeditor_widgets.libraries.yml b/ubc_ckeditor_widgets.libraries.yml
@@ -2,22 +2,22 @@
 
 # Add all required styles and JS to the public facing site
 ubc_ckeditor_widgets.ui:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
-      css/bg.color.css: { }
-      css/drop.shadow.css: {}
-      css/gap.css: { }
-      css/m.css: { }
-      css/p.css: { }
-      css/text.color.css: { }
       css/ubc.widget.default.styles.css: { }
       css/ubc.accordion.css: { }
       css/ubc.accordion.toggle.css: { }
       css/ubc.card.css: { }
       css/ubc.color.box.css: { }
       css/ubc.columns.css: { }
       css/ubc.table.css: { }
+      css/bg.color.css: { }
+      css/drop.shadow.css: {}
+      css/gap.css: { }
+      css/m.css: { }
+      css/p.css: { }
+      css/text.color.css: { }
   js:
     js/functional/ubcAccordion.ui.js: { }
   dependencies:
@@ -27,7 +27,7 @@ ubc_ckeditor_widgets.ui:
 
 # Accordion
 ubc_accordion:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.accordion.css: { }
@@ -37,14 +37,14 @@ ubc_accordion:
     - core/ckeditor5
 
 ubc_accordion.admin:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.accordion.admin.css: { }
 
 # Accordion Toggle
 ubc_accordion_toggle:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.accordion.toggle.css: { }
@@ -54,14 +54,14 @@ ubc_accordion_toggle:
     - core/ckeditor5
 
 ubc_accordion_toggle.admin:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.accordion.toggle.admin.css: { }
 
 # Card Horizontal
 ubc_card_horizontal:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.card.css: { }
@@ -71,14 +71,14 @@ ubc_card_horizontal:
     - core/ckeditor5
 
 ubc_card_horizontal.admin:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.card.admin.css: { }
 
 # Card Vertical One
 ubc_card_vertical_one:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.card.css: { }
@@ -88,14 +88,14 @@ ubc_card_vertical_one:
     - core/ckeditor5
 
 ubc_card_vertical_one.admin:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.card.admin.css: { }
 
 # Card Vertical Two
 ubc_card_vertical_two:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.card.css: { }
@@ -105,14 +105,14 @@ ubc_card_vertical_two:
     - core/ckeditor5
 
 ubc_card_vertical_two.admin:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.card.admin.css: { }
 
 # Card Vertical Three
 ubc_card_vertical_three:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.card.css: { }
@@ -122,14 +122,14 @@ ubc_card_vertical_three:
     - core/ckeditor5
 
 ubc_card_vertical_three.admin:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.card.admin.css: { }
 
 # Color Box
 ubc_color_box:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.color.box.css: { }
@@ -139,14 +139,14 @@ ubc_color_box:
     - core/ckeditor5
 
 ubc_color_box.admin:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.color.box.admin.css: { }
 
 # Two columns
 ubc_columns_two:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.columns.css: { }
@@ -156,14 +156,14 @@ ubc_columns_two:
     - core/ckeditor5
 
 ubc_columns_two.admin:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.columns.admin.css: { }
 
 # Three columns
 ubc_columns_three:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.columns.css: { }
@@ -173,14 +173,14 @@ ubc_columns_three:
     - core/ckeditor5
 
 ubc_columns_three.admin:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.columns.admin.css: { }
 
 # Four columns
 ubc_columns_four:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.columns.css: { }
@@ -190,14 +190,14 @@ ubc_columns_four:
     - core/ckeditor5
 
 ubc_columns_four.admin:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.columns.admin.css: { }
 
 # Tables
 ubc_table:
-  version: 3.1.13
+  version: 3.1.14
   css:
     theme:
       css/ubc.table.css: { }
@@ -208,14 +208,14 @@ ubc_table:
 
 # Table Cells
 ubc_table_cell:
-  version: 3.1.13
+  version: 3.1.14
   js:
     js/build/ubcTableCellClass.js: { preprocess: false, minified: true }
   dependencies:
     - core/ckeditor5
 
 v4_widgets:
-  version: 3.1.13
+  version: 3.1.14
   css:
     layout:
       css/ubc.ckeditor4.widgets.css: {}