diff --git a/app/themes/bootstrap/styles/base/_styles.scss b/app/themes/bootstrap/styles/base/_styles.scss index 161c5c0..8347b09 100644 --- a/app/themes/bootstrap/styles/base/_styles.scss +++ b/app/themes/bootstrap/styles/base/_styles.scss @@ -62,96 +62,10 @@ h1, h2, h3, h4 { /* Error pages styles -------------------------------------------------- */ -.error-404, .error-500 { - margin-bottom: 0px !important; - margin-left: 0px !important; - margin-right: 0px !important; - padding-right: 0px !important; - padding-left: 0px !important; - width: 100%; - height: 100%; - .overlapped { - position: relative; - background-color: white; - background-image: url("/images/error_background.jpg"); - background-repeat: no-repeat; - background-size: cover; - background-attachment: fixed; - background-position: center; - width: 100%; - height: 100%; - z-index: 999999; - /*outer*/ - padding: 5%; - margin: 0px !important; - display: block; - justify-content: center; - align-items: center; - img { - display: flex; - width: 25% !important; - display: inline-flex; - } - .well{ - padding-left: 5%; - padding-right: 5%; - background-color: darkseagreen; - float: right; - width: 74%; - color: whitesmoke; - table{ - tr{ - height: 0; - } - td{ - height: 0; - pre { - overflow: auto; - height: 100px; - background-color: transparent; - } - } - } - } - } -} - -.server-error, .user-error{ - .overlapped { - position: relative; - background-color: #0d1318; - background-image: url("/images/ErdikoShieldLogo.png"); - background-repeat: no-repeat; - background-attachment: fixed; - background-position: center; - width: 100%; - height: 100%; - opacity: 0.9; - z-index: 999999; - /*outer*/ - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: center; - align-items: center; - } - .container.centered { - position: fixed; - margin: 0 auto 0 auto; - } - .row.solid{ - opacity: 9; - } -} - -.server-error{ - .well{ - background-color: #FFCC33; - } -} - -.user-error{ - .well{ - background-color: #FF9966; - } +.server-error, .error-404, .error-500 { + background: url(/images/error_background.jpg) no-repeat center center fixed; + -webkit-background-size: cover; + -moz-background-size: cover; + -o-background-size: cover; + background-size: cover; } diff --git a/app/views/500.html b/app/views/500.html deleted file mode 100644 index 43f7d13..0000000 --- a/app/views/500.html +++ /dev/null @@ -1,61 +0,0 @@ -
- Error string - | -{{error}} | -
- Message - | -{{message}} | -
- Path - | -{{path_info}} | -
This renders because the controller does not fail to - instantiate, by using explicit annotation style (see - script.js for details) -
-This renders because the controller does not fail to - instantiate, by using explicit annotation style - (see script.js for details) -
-The controller could not be instantiated, due to relying - on automatic function annotations (which are disabled in - strict mode). As such, the content of this section is not - interpolated, and there should be an error in your web console. -
-Cached Values
-Cache Info
-