Merge develop into master branch (#117)

madsnorgaard · web-flow · commit 6bb8534b8c7a · 2022-01-27T11:27:09.000+01:00
* Patch forms auto export module (#116) * Add gin-custom.css to repo. (#115) * Add gin-custom.css to repo. * Add hook_preprocess_page to read custom css
diff --git a/composer.json b/composer.json
@@ -71,6 +71,9 @@
       },
       "drupal/user_default_page": {
         "Warning: in_array() expects parameter 2 to be array, null given in user_default_page_user_logout() (https://www.drupal.org/node/3246986)": "https://www.drupal.org/files/issues/2021-11-01/user_default_page-3246986-2.patch"
+      },
+      "drupal/coc_forms_auto_export": {
+        "3240592 - Problem with phpseclib requirement in 2.x (https://www.drupal.org/project/coc_forms_auto_export/issues/3240592)": "https://www.drupal.org/files/issues/2021-10-04/requirement-namespace-3240592-1.patch"
       }
     }
   }
diff --git a/css/gin-custom.css b/css/gin-custom.css
@@ -0,0 +1,3 @@
+.ui-dialog:not(.ui-dialog-off-canvas) {
+    width: 70vw!important;
+}
diff --git a/os2forms_forloeb.libraries.yml b/os2forms_forloeb.libraries.yml
@@ -0,0 +1,7 @@
+os2forms_forloeb:
+  version: 1.x
+  css:
+    theme:
+      css/gin-custom.css: {}
+  dependencies:
+    - drupal/gin
diff --git a/os2forms_forloeb.module b/os2forms_forloeb.module
@@ -264,3 +264,7 @@ function os2forms_forloeb_form_alter(&$form, FormStateInterface $form_state, $fo
     }
   }
 }
+
+function os2forms_forloeb_preprocess_page(&$variables) {
+    $variables['#attached']['library'][] = 'os2forms_forloeb/os2forms_forloeb';
+}

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,9 @@`
`71`	`71`	`},`
`72`	`72`	`"drupal/user_default_page": {`
`73`	`73`	`"Warning: in_array() expects parameter 2 to be array, null given in user_default_page_user_logout() (https://www.drupal.org/node/3246986)": "https://www.drupal.org/files/issues/2021-11-01/user_default_page-3246986-2.patch"`
	`74`	`+ },`
	`75`	`+ "drupal/coc_forms_auto_export": {`
	`76`	`+ "3240592 - Problem with phpseclib requirement in 2.x (https://www.drupal.org/project/coc_forms_auto_export/issues/3240592)": "https://www.drupal.org/files/issues/2021-10-04/requirement-namespace-3240592-1.patch"`
`74`	`77`	`}`
`75`	`78`	`}`
`76`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+.ui-dialog:not(.ui-dialog-off-canvas) {`
	`2`	`+ width: 70vw!important;`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -264,3 +264,7 @@ function os2forms_forloeb_form_alter(&$form, FormStateInterface $form_state, $fo`
`264`	`264`	`}`
`265`	`265`	`}`
`266`	`266`	`}`
	`267`	`+`
	`268`	`+function os2forms_forloeb_preprocess_page(&$variables) {`
	`269`	`+ $variables['#attached']['library'][] = 'os2forms_forloeb/os2forms_forloeb';`
	`270`	`+}`