Skip to content

Commit

Permalink
delete old css/js; remove 500 error template;
Browse files Browse the repository at this point in the history
clean up some styles and error template.  temporarily remove background image from error page until we can make it more seamless.  Perhaps lighten the background image as well?
  • Loading branch information
arroyo committed Nov 7, 2016
1 parent 0d17459 commit 320b054
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 37,366 deletions.
98 changes: 6 additions & 92 deletions app/themes/bootstrap/styles/base/_styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
61 changes: 0 additions & 61 deletions app/views/500.html

This file was deleted.

2 changes: 1 addition & 1 deletion app/views/error.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="container error-404">
<div class="container">
<div class="page-header" id="banner">
<div class="row">
<div class="col-lg-8 col-md-7 col-sm-6">
Expand Down
2 changes: 1 addition & 1 deletion public/default/themes/bootstrap/css/styles.min.css

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions public/default/themes/bootstrap/js/scripts.min.js

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions public/themes/bootstrap/css/bootstrap-theme.min.css

This file was deleted.

Loading

0 comments on commit 320b054

Please sign in to comment.