Skip to content

Commit

Permalink
Added settings container, updated dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
dscalzi committed May 23, 2018
1 parent a67dac2 commit e9e2ec1
Show file tree
Hide file tree
Showing 6 changed files with 91 additions and 151 deletions.
1 change: 1 addition & 0 deletions app/app.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<div id="main">
<% include welcome.ejs %>
<% include login.ejs %>
<% include settings.ejs %>
<% include landing.ejs %>
</div>
<% include overlay.ejs %>
Expand Down
12 changes: 12 additions & 0 deletions app/assets/css/launcher.css
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,18 @@ p {
}
*/

/*******************************************************************************
* *
* Settings View (sttings.ejs) *
* *
******************************************************************************/

#settingsContainer {
position: relative;
height: 100%;
background: rgba(0, 0, 0, 0.50);
}

/*******************************************************************************
* *
* Landing View (Structural Styles) *
Expand Down
1 change: 1 addition & 0 deletions app/assets/js/scripts/uibinder.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ let fatalStartupError = false
const VIEWS = {
landing: 'landingContainer',
login: 'loginContainer',
settings: 'settingsContainer',
welcome: 'welcomeContainer'
}

Expand Down
3 changes: 3 additions & 0 deletions app/settings.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<div id="settingsContainer">

</div>
Loading

0 comments on commit e9e2ec1

Please sign in to comment.