diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2012-08-11 11:36:08 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2012-08-11 11:36:08 +0200 |
| commit | 4b6e77ad9172b29839b76e29614bf4c0ba81c90d (patch) | |
| tree | b315210ddebeed11e60e8353ca9641cdda8e01e3 /module/web | |
| parent | beginning new pyload web-ui from scratch (diff) | |
| download | pyload-4b6e77ad9172b29839b76e29614bf4c0ba81c90d.tar.xz | |
show footer at bottom
Diffstat (limited to 'module/web')
| -rw-r--r-- | module/web/static/css/default/style.css | 26 | ||||
| -rw-r--r-- | module/web/templates/default/base.html | 33 |
2 files changed, 38 insertions, 21 deletions
diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index 166b8c452..bf5e3e7d9 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -3,6 +3,14 @@ General
*/
+* {
+ margin: 0;
+}
+
+html, body {
+ height: 100%;
+}
+
body {
margin: 0;
padding: 0;
@@ -47,16 +55,24 @@ a { a:hover {
}
-#wrapper {
- width: 960px;
- margin: 70px auto 0;
- padding: 0;
+#wrap {
+ min-height: 100%;
+}
+
+#content {
+ margin-left: 150px;
+ margin-right: 150px;
+ padding-bottom: 100px; /* Height of footer */
}
/*
Header
*/
+#push {
+ height: 70px; /* Pushes content down with height of header */
+}
+
header {
background: url("../../img/default/main-wrapper-bg.png") repeat-x;
height: 70px;
@@ -101,9 +117,11 @@ header img.logo { Footer
*/
+
footer {
background: url("../../img/default/main-wrapper-bg.png") repeat-x;
height: 100px;
+ margin-top: -100px;
position: relative;
width: 100%;
z-index: 10;
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 36a81d662..879faa0bd 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -16,26 +16,28 @@ {% endblock %}
</head>
<body>
-<header>
- <div class="center">
- <img class="logo" alt="" src="static/img/default/logo.png">
- <a href="/en/Start"><span class="title">pyLoad</span></a>
- </div>
-</header>
-<div id="wrapper">
- {% for message in messages %}
- <b><p>{{ message }}</p></b>
- {% endfor %}
+<div id="wrap">
+ <header>
+ <div class="center">
+ <img class="logo" alt="" src="static/img/default/logo.png">
+ <a href="/en/Start"><span class="title">pyLoad</span></a>
+ </div>
+ </header>
+ <div id="push"></div>
+ <div id="content">
+ {% for message in messages %}
+ <b><p>{{ message }}</p></b>
+ {% endfor %}
- <h1>Test!</h1>
+ <h1>Test!</h1>
- {% block content %}
- {% endblock content %}
+ {% block content %}
+ {% endblock content %}
+ </div>
</div>
<footer>
<div class="center">
<img class="logo" src="static/img/default/logo_grey.png"/>
-
<div class="block copyright">
© 2008-2012<br>
The pyLoad Team<br>
@@ -68,11 +70,8 @@ dsfdsf <br>
sdf dsg <br>
</div>
-
</div>
-
</footer>
-<!-- end #footer -->
{% block deferred %}
{% endblock deferred %}
</body>
|