Merge branch 'master' into EPMLABSBRN-960-update-dependencies

Brain-up · Jan 24, 2022 · 836b71e · 836b71e
2 parents 729fd47 + 5876b80
commit 836b71e
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/default.conf b/default.conf
@@ -16,6 +16,7 @@ server {
    	    text/css
    	    application/json
    	    application/x-javascript
+   	    application/javascript
    	    text/xml
    	    application/xml
       	application/xml+rss

diff --git a/default_with_tls.conf b/default_with_tls.conf
@@ -25,6 +25,7 @@ server {
    	    text/plain
    	    text/css
    	    application/json
+   	    application/javascript
    	    application/x-javascript
    	    text/xml
    	    application/xml

diff --git a/frontend/app/components/login-form/template.hbs b/frontend/app/components/login-form/template.hbs
@@ -2,7 +2,7 @@
   class="rounded-xl px-16 pt-16 pb-16 pr-16 mb-6 bg-white shadow-lg"
   {{on "submit" this.onSubmit}}
 >
-  <div class="relative z-10 w-64 bg-white rounded-lg">
+  <div class="relative z-10 bg-white rounded-lg">
     {{#if this.loginInProgress}}
       <LoadingSpinner />
     {{else}}

diff --git a/frontend/app/templates/application.hbs b/frontend/app/templates/application.hbs
@@ -2,9 +2,13 @@
 <Header />
 <main
   class="{{if
-      (or (not (is-active "index")))
+      (not (is-active "index"))
       "flex-col mx-auto mt-2 sm:mt-4 rounded pl-1 pr-1 pt-1 pb-1 relative"
     }}"
+  {{! template-lint-disable no-inline-styles }}
+  {{! template-lint-disable style-concatenation }}
+  style="
+    {{if (not (is-active "index")) "width: 80vw; max-width: 1280px;"}}"
 >
   {{outlet}}
 </main>

diff --git a/frontend/app/templates/group.hbs b/frontend/app/templates/group.hbs
@@ -13,12 +13,18 @@
   }}
     <aside
       class="bg-gradient-to-b from-white sticky top-0 rounded-bl rounded-br"
+      {{! template-lint-disable no-inline-styles }}
+      style="max-width: 80vw;"
     >
       <GroupNavigation @group={{@model}} />
     </aside>
   {{/if}}
   {{#if (is-active "group.series.subgroup.index")}}
-    <aside class="bg-gradient-to-b from-white rounded-bl rounded-br">
+    <aside
+      class="bg-gradient-to-b from-white rounded-bl rounded-br"
+      {{! template-lint-disable no-inline-styles }}
+      style="max-width: 80vw;"
+    >
       <SubgroupNavigation @group={{model-for-route "group.series"}} />
     </aside>
   {{/if}}

diff --git a/frontend/app/templates/group/series-loading.hbs b/frontend/app/templates/group/series-loading.hbs