Skip to content

Commit

Permalink
adding core css file and loading
Browse files Browse the repository at this point in the history
  • Loading branch information
RyanNoelk committed Feb 17, 2017
1 parent f8b59c3 commit d35274f
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 34 deletions.
32 changes: 32 additions & 0 deletions frontend/modules/base/css/core.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/* Sticky footer styles
-------------------------------------------------- */
html {
position: relative;
min-height: 100%;
}

body {
/* Margin bottom by footer height */
margin-bottom: 60px;
}

.navbar {
/* Margin bottom by footer height */
margin-bottom: 0px;
}

#content {
margin-bottom: 20px;
}

/* Custom page CSS
-------------------------------------------------- */
/* Not required for template or sticky footer method. */

.container .text-muted {
margin: 20px 0;
}

code {
font-size: 80%;
}
34 changes: 0 additions & 34 deletions frontend/modules/base/css/footer.css
Original file line number Diff line number Diff line change
@@ -1,24 +1,3 @@
/* Sticky footer styles
-------------------------------------------------- */
html {
position: relative;
min-height: 100%;
}

body {
/* Margin bottom by footer height */
margin-bottom: 60px;
}

.navbar {
/* Margin bottom by footer height */
margin-bottom: 0px;
}

#content {
margin-bottom: 20px;
}

.footer {
position: absolute;
bottom: 0;
Expand All @@ -28,20 +7,7 @@ body {
background-color: #f5f5f5;
}


/* Custom page CSS
-------------------------------------------------- */
/* Not required for template or sticky footer method. */

.container .text-muted {
margin: 20px 0;
}

.footer > .container {
padding-right: 15px;
padding-left: 15px;
}

code {
font-size: 80%;
}
1 change: 1 addition & 0 deletions frontend/modules/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import AuthStore from './account/stores/AuthStore'

// Load in the base CSS
require("../node_modules/bootstrap-sass/assets/stylesheets/_bootstrap.scss");
require("./base/css/core.css");

const requireAuth = (nextState, replace) => {
if (!AuthStore.isAuthenticated()) {
Expand Down

0 comments on commit d35274f

Please sign in to comment.