Merge branch 'feature/ISTWCMS-4837-ebremner-layouts' into '8.x-1.x'

Feature/istwcms 4837 ebremner layouts

See merge request !97

uw_cfg_common.layouts.yml

 uw_1_column:
   label: 'One column'
   category: 'UW layouts'
-  library: uw_cfg_common/uw_layout_1_col
-  template: layouts/uw-1-col/layout--uw-1-col
+  template: layouts/layout--uw-1-col
   default_region: first
   regions:
     first:
@@ -13,8 +12,7 @@ uw_2_column:
   label: 'Two columns'
   category: 'UW layouts'
   class: '\Drupal\uw_cfg_common\Plugin\Layout\UwColumnLayoutBase'
-  library: uw_cfg_common/uw_layout_2_col
-  template: layouts/uw-2-col/layout--uw-2-col
+  template: layouts/layout--uw-2-col
   default_region: first
   regions:
     first:
@@ -33,8 +31,7 @@ uw_3_column:
   label: 'Three columns'
   category: 'UW layouts'
   class: '\Drupal\uw_cfg_common\Plugin\Layout\UwColumnLayoutBase'
-  library: uw_cfg_common/uw_layout_3_col
-  template: layouts/uw-3-col/layout--uw-3-col
+  template: layouts/layout--uw-3-col
   default_region: first
   regions:
     first:
@@ -58,8 +55,7 @@ uw_4_column:
   label: 'Four columns'
   category: 'UW layouts'
   class: '\Drupal\uw_cfg_common\Plugin\Layout\UwColumnLayoutBase'
-  library: uw_cfg_common/uw_layout_4_col
-  template: layouts/uw-4-col/layout--uw-4-col
+  template: layouts/layout--uw-4-col
   default_region: first
   regions:
     first:
@@ -74,19 +70,18 @@ uw_4_column:
     - [first, second, third, fourth]
   column_options:
     columns:
-      even-split': 'Even split (25%, 25%, 25%, 25%)'
-      larger-left': 'Larger left (50%, 16.67%, 16.67%, 16.67%)'
-      larger-second': 'Larger second (16.67%, 50%, 16.67%, 16.67%)'
-      larger-third': 'Larger third (16.67%, 16.67%, 50%, 16.67%)'
-      larger-right': 'Larger right (16.67%, 16.67%, 16.67%, 50%)'
-      legacy-23-27-27-23': 'Legacy (23%, 27%, 27%, 23%)'
+      even-split: 'Even split (25%, 25%, 25%, 25%)'
+      larger-left: 'Larger left (50%, 16.67%, 16.67%, 16.67%)'
+      larger-second: 'Larger second (16.67%, 50%, 16.67%, 16.67%)'
+      larger-third: 'Larger third (16.67%, 16.67%, 50%, 16.67%)'
+      larger-right: 'Larger right (16.67%, 16.67%, 16.67%, 50%)'
+      legacy-23-27-27-23: 'Legacy (23%, 27%, 27%, 23%)'
     default: 'even-split'
 uw_5_column:
   label: 'Five columns'
   category: 'UW layouts'
   class: '\Drupal\uw_cfg_common\Plugin\Layout\UwColumnLayoutBase'
-  library: uw_cfg_common/uw_layout_5_col
-  template: layouts/uw-5-col/layout--uw-5-col
+  template: layouts/layout--uw-5-col
   default_region: first
   regions:
     first:
@@ -103,20 +98,19 @@ uw_5_column:
     - [first, second, third, fourth, fifth]
   column_options:
     columns:
-      even-split': 'Even split (20%, 20%, 20%, 20%, 20%)'
-      larger-left': 'Larger left (40%, 15%, 15%, 15%, 15%)'
-      larger-second': 'Larger second (15%, 40%, 15%, 15%, 15%)'
-      larger-third': 'Larger third (15%, 15%, 40%, 15%, 15%)'
-      larger-fourth': 'Larger fourth (15%, 15%, 15%, 40%, 15%)'
-      larger-right': 'Larger right (15%, 15%, 15%, 15%, 40%)'
-      legacy-23-19-19-19-20': 'Legacy (23%, 19%, 19%, 19%, 20%)'
+      even-split: 'Even split (20%, 20%, 20%, 20%, 20%)'
+      larger-left: 'Larger left (40%, 15%, 15%, 15%, 15%)'
+      larger-second: 'Larger second (15%, 40%, 15%, 15%, 15%)'
+      larger-third: 'Larger third (15%, 15%, 40%, 15%, 15%)'
+      larger-fourth: 'Larger fourth (15%, 15%, 15%, 40%, 15%)'
+      larger-right: 'Larger right (15%, 15%, 15%, 15%, 40%)'
+      legacy-23-19-19-19-20: 'Legacy (23%, 19%, 19%, 19%, 20%)'
     default: 'even-split'
 uw_inverted_l_right:
   label: 'Inverted "L" - right'
   category: 'UW layouts'
   class: '\Drupal\uw_cfg_common\Plugin\Layout\UwColumnLayoutBase'
-  library: uw_cfg_common/uw_layout_inverted_l_right
-  template: layouts/uw-inverted-l-right/layout--uw-inverted-l-right
+  template: layouts/layout--uw-inverted-l-right
   default_region: first
   regions:
     first:
@@ -140,8 +134,7 @@ uw_inverted_l_left:
   label: 'Inverted "L" - left'
   category: 'UW layouts'
   class: '\Drupal\uw_cfg_common\Plugin\Layout\UwColumnLayoutBase'
-  library: uw_cfg_common/uw_layout_inverted_l_left
-  template: layouts/uw-inverted-l-left/layout--uw-inverted-l-left
+  template: layouts/layout--uw-inverted-l-left
   default_region: first
   regions:
     first:

uw_cfg_common.libraries.yml

-uw_layout_1_col:
-  version: 1.0
-  css:
-    theme:
-      layouts/uw-1-col/uw-layout-1-col.css: {}
-uw_layout_2_col:
-  version: 1.0
-  css:
-    theme:
-      layouts/uw-2-col/uw-layout-2-col.css: {}
-uw_layout_3_col:
-  version: 1.0
-  css:
-    theme:
-      layouts/uw-3-col/uw-layout-3-col.css: {}
-uw_layout_4_col:
-  version: 1.0
-  css:
-    theme:
-      layouts/uw-4-col/uw-layout-4-col.css: {}
-uw_layout_5_col:
-  version: 1.0
-  css:
-    theme:
-      layouts/uw-5-col/uw-layout-5-col.css: {}
-uw_layout_inverted_l_right:
-  version: 1.0
-  css:
-    theme:
-      layouts/uw-inverted-l-right/uw-layout-inverted-l-right.css: {}
-uw_layout_inverted_l_left:
-  version: 1.0
-  css:
-    theme:
-      layouts/uw-inverted-l-left/uw-layout-inverted-l-left.css: {}
-uw_mathjax:
-  js:
-    https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/MathJax.js?config=TeX-AMS_HTML: { type: external, minified: true }
+uw_mathjax:
+  js:
+    https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/MathJax.js?config=TeX-AMS_HTML: { type: external, minified: true }