error page with better RWD

cyfronet-fid · Feb 12, 2021 · 75244cd · 75244cd
1 parent 37d5969
commit 75244cd
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 7 deletions.
diff --git a/s4e-web/src/app/errors/errors.component.html b/s4e-web/src/app/errors/errors.component.html
@@ -15,15 +15,16 @@
   ~
   -->
 
-<div class="container">
+<div class="container errors">
   <h2 class="description">{{ actualError.description }}</h2>
   <h3 class="title">{{ actualError.title }}</h3>
 
   <p>
-    <a routerLink="/" class="button button--secondary button--small">Wróć do strony głównej</a>
-    <span *ngIf="!!backLink && backLink !== ''" >
-      <span>&nbsp; | &nbsp;</span>
-      <a routerLink="{{ backLink }}">Wróć do poprzedniej strony</a>
+    <span>
+      <a routerLink="/" class="button button--secondary button--small">Wróć do strony głównej</a>
+    </span>
+    <span *ngIf="!!backLink && backLink !== ''">
+      lub <a routerLink="{{ backLink }}"> lub wróć do poprzedniej strony</a>
     </span>
   </p>
 </div>
diff --git a/s4e-web/src/app/errors/errors.component.scss b/s4e-web/src/app/errors/errors.component.scss
@@ -17,6 +17,7 @@
 
 body, html {
   height: auto;
+  overflow: hidden !important;
 }
 
 .container {
@@ -27,6 +28,7 @@ body, html {
   text-align: center;
 }
 
+
 h2 {
   padding-top: 120px;
   background: url(/../../assets/images/logo_s4e_color.png) no-repeat center top;

diff --git a/s4e-web/src/scss/_auth.scss b/s4e-web/src/scss/_auth.scss
@@ -302,6 +302,18 @@ body, html {
   }
 }
 
+.errors {
+  span {
+    display: inline-block;
+    margin: 10px 5px;
+  }
+
+  & > * {
+    margin: 15px !important;
+  }
+}
+
+
 
 
 

diff --git a/s4e-web/src/scss/_common.scss b/s4e-web/src/scss/_common.scss
@@ -652,8 +652,15 @@ input.checkbox-slide:checked + .slider:after
   }
 }
 
-ngx-ui-loader .ngx-background-spinner {
-  z-index: 5 !important;
+/* jira collector */
+.atlwdg-popup {
+  max-width: calc(100% - 100px);
+}
+
+/*loader*/
+
+ngx-ui-loader .ngx-background-spinner[_ngcontent-c3]{
+  z-index: 1 !important;
 }
 
 .ol-attribution.ol-uncollapsible {

diff --git a/s4e-web/src/scss/_rwd_phone.scss b/s4e-web/src/scss/_rwd_phone.scss
@@ -53,6 +53,7 @@
 
     .search-results {
       width: 100% !important;
+      top: 100px !important;
     }
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,6 +53,7 @@ @@
         .search-results {
           width: 100% !important;
+          top: 100px !important;
         }
       }
@@ Expand Down @@