tom/webdev-assignment-2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into wip/yeet

Browse Source
This commit is contained in:
Thomas Wade 2018-10-25 16:35:44 +10:30
commit 05a271e019
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -24,8 +24,8 @@
<ng-view></ng-view> <ng-view></ng-view>
</div> </div>
<ng-include src="'views/sidebar.html'"></ng-include> <ng-include src="'views/sidebar.html'"></ng-include>
<ng-include src="'views/footer.html'"></ng-include>
</div> </div>
<ng-include src="'views/footer.html'"></ng-include>
</div> </div>
</body> </body>
</html> </html>

24
styles/default.css
View File

@ -33,8 +33,9 @@ a
position: relative; position: relative;
width: 800px; width: 800px;
min-height: calc(100vh - 120px); min-height: calc(100vh - 116px - 100px);
margin-left: calc(50vw - 400px); margin-right: auto;
margin-left: auto;
padding-top: 100px; padding-top: 100px;
} }
@ -46,7 +47,7 @@ a
z-index: 10; z-index: 10;
top: 0; top: 0;
width: 100vw; width: 100%;
height: 70px; height: 70px;
vertical-align: middle; vertical-align: middle;
@ -124,11 +125,20 @@ a
.footerContainer .footerContainer
{ {
position: absolute;
bottom: 0;
width: 100%; width: 100%;
height: 100px; height: 60px;
}
.centreFooterContainer
{
width: calc(800px - 20px);
height: 100%;
margin-right: auto;
margin-left: auto;
padding: 10px;
color: #fff;
background-color: #000;
} }
.sidebar .sidebar

4
views/footer.html
View File

@ -1,3 +1,5 @@
<div class="footerContainer"> <div class="footerContainer">
Footer <div class="centreFooterContainer">
Footer
</div>
</div> </div>