Commit 653572099cc3a7a92ebf514e2f26ec0fd33dbfa9
1 parent
5bf5e95d84
Exists in
master
and in
1 other branch
footer is now on the bottom
Showing 3 changed files with 10 additions and 2 deletions Side-by-side Diff
home.html
View file @
6535720
... | ... | @@ -93,13 +93,17 @@ |
93 | 93 | |
94 | 94 | <!-- Menu Bar --> |
95 | 95 | <main ui-view></main> |
96 | + | |
97 | + | |
96 | 98 | <footer class="page-footer"> |
97 | 99 | <div class="footer-copyright"> |
98 | 100 | <div class="container"> |
99 | - Concerns? Contact us by <a class="grey-text text-lighten-4" href="mailto:halp@flashy.cards">email</a>! | |
101 | + © 2015 Team Swag | |
102 | + <a class="grey-text text-lighten-4 right" href="mailto:halp@flashy.cards">Concerns? Contact us by email</a>! | |
100 | 103 | </div> |
101 | 104 | </div> |
102 | 105 | </footer> |
106 | + | |
103 | 107 | </body> |
104 | 108 | <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script> |
105 | 109 | <script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.14/angular-ui-router.js"></script> |
styles/flashy.css
View file @
6535720
... | ... | @@ -203,6 +203,9 @@ |
203 | 203 | background-color: #e8e8e8; |
204 | 204 | overflow-x: hidden; |
205 | 205 | font-family: 'Titillium Web', sans-serif; |
206 | + display: flex; | |
207 | + min-height: 100vh; | |
208 | + flex-direction: column; | |
206 | 209 | } |
207 | 210 | |
208 | 211 | html { |
... | ... | @@ -238,6 +241,7 @@ |
238 | 241 | } |
239 | 242 | main{ |
240 | 243 | min-height:145px; |
244 | + flex: 1 0 auto; | |
241 | 245 | } |
242 | 246 | .side-nav .collapsible-body { |
243 | 247 | width: 100%; |
templates/feed.html
View file @
6535720
... | ... | @@ -7,7 +7,7 @@ |
7 | 7 | |
8 | 8 | |
9 | 9 | <!--Lil plus button in corner--> |
10 | -<div class="fixed-action-btn" style="bottom: 24px; right: 24px;"> | |
10 | +<div class="fixed-action-btn" style="bottom: 96px; right: 24px;"> | |
11 | 11 | <a data-target="newCard" class="btn-floating btn-large modal-trigger" href="#newCard"> |
12 | 12 | <i class="large mdi-content-add"></i> |
13 | 13 | </a> |