summaryrefslogtreecommitdiffstats
path: root/module/web
diff options
context:
space:
mode:
Diffstat (limited to 'module/web')
-rw-r--r--module/web/static/css/default/common.less2
-rw-r--r--module/web/static/css/default/style.less44
-rw-r--r--module/web/templates/default/base.html27
3 files changed, 37 insertions, 36 deletions
diff --git a/module/web/static/css/default/common.less b/module/web/static/css/default/common.less
index 1383af75f..338ed38e7 100644
--- a/module/web/static/css/default/common.less
+++ b/module/web/static/css/default/common.less
@@ -10,7 +10,7 @@
@header-height: 70px;
@actionbar-height: 40px;
-@footer-height: 100px;
+@footer-height: 66px;
@light: #ffffff;
@dark: #333333;
diff --git a/module/web/static/css/default/style.less b/module/web/static/css/default/style.less
index 5eaafdaaf..51ab3e3ab 100644
--- a/module/web/static/css/default/style.less
+++ b/module/web/static/css/default/style.less
@@ -78,11 +78,17 @@ header .logo {
position: relative;
.centered;
- .btn-success {
+ .lower {
+ position: absolute;
bottom: 0;
left: 0;
right: 0;
- position: absolute;
+ margin-left: 0;
+
+ button {
+ width: 100% / 3; // 3 buttons
+ }
+
}
}
@@ -299,8 +305,7 @@ header .logo {
/*
Footer
*/
-footer {
-// Same gradient as navbar
+footer { // Same gradient as navbar
.gradient(top, #222222, #111111);
color: @grey;
min-height: @footer-height;
@@ -311,19 +316,6 @@ footer {
z-index: 10;
}
-footer .logo {
- background: url(../../img/default/logo_grey.png) no-repeat;
- float: left;
- width: 60px;
- height: 60px;
-}
-
-footer hr {
- margin: 4px 0;
- border-top-color: @greyDarker;
- border-bottom-color: @greyDark;
-}
-
footer:before {
position: absolute;
content: ' ';
@@ -336,6 +328,12 @@ footer:before {
z-index: -1;
}
+footer hr {
+ margin: 4px 0;
+ border-top-color: @greyDarker;
+ border-bottom-color: @greyDark;
+}
+
footer .span2 {
font-size: 12px;
padding-top: 12px;
@@ -344,17 +342,17 @@ footer .span2 {
// This is the copyright span
footer .offset1 {
- padding-top: 6px;
+ padding-top: 8px;
padding-bottom: 0;
}
footer .copyright {
background: url(../../img/default/logo_grey.png) no-repeat;
- background-size: 60px 60px;
- background-position: 8px center;
- height: 60px;
- padding-left: 60px;
- padding-top: 24px;
+ background-size: 40px 40px;
+ background-position: 12px center;
+ height: 40px;
+ padding-left: 40px;
+ padding-top: 10px;
text-align: center;
}
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index ee7eb1e97..fee0694b8 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -162,10 +162,17 @@
<li><a href="/logout"><i class="iconf-signout"></i> Logout</a></li>
</ul>
</div>
-
- <a class="btn btn-success btn-grabber btn-small" href="#">
- <i class="icon-plus icon-white"></i> Add
- </a>
+ <div class="btn-group lower">
+ <button class="btn btn-success btn-grabber btn-mini" href="#">
+ <i class="icon-plus icon-white"></i>
+ </button>
+ <button class="btn btn-blue btn-play btn-mini" href="#">
+ <i class="icon-play icon-white"></i>
+ </button>
+ <button class="btn btn-danger btn-delete btn-mini" href="#">
+ <i class="icon-remove icon-white"></i>
+ </button>
+ </div>
</div>
<span class="visible-desktop speedgraph-container">
<div id="speedgraph"></div>
@@ -209,32 +216,28 @@
<h2 class="block-title">Powered by</h2>
<hr>
Bootstrap <br>
- Backbone <br>
- sdf dsg <br>
+{# Backbone <br>#}
</div>
<div class="span2">
<h2 class="block-title">pyLoad</h2>
<hr>
dsfdsf <br>
- dsfdsf <br>
- sdf dsg <br>
+{# dsfdsf <br>#}
</div>
<div class="span2">
<h2 class="block-title">Community</h2>
<hr>
asd <br>
- dsfdsf <br>
- sdf dsg <br>
+{# dsfdsf <br>#}
</div>
<div class="span2">
<h2 class="block-title">Development</h2>
<hr>
asd <br>
- dsfdsf <br>
- sdf dsg <br>
+{# dsfdsf <br>#}
</div>
</div>
</div>