summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2012-12-25 17:06:25 +0100
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2012-12-25 17:06:25 +0100
commitf808dccc105d1bf5aaee6af32e64cca4fa1d56e3 (patch)
treec1f85d83ca1285a4b0b07b7ff3bf5c0e22dfc3e6
parentimproved add dialog + package view (diff)
downloadpyload-f808dccc105d1bf5aaee6af32e64cca4fa1d56e3.tar.xz
improved settings page
-rw-r--r--module/web/static/css/default/settings.less39
-rw-r--r--module/web/static/img/default/checks_sheet.pngbin1178 -> 1145 bytes
-rwxr-xr-xmodule/web/templates/default/backbone/linkgrabber.html5
-rw-r--r--module/web/templates/default/settings.html6
4 files changed, 37 insertions, 13 deletions
diff --git a/module/web/static/css/default/settings.less b/module/web/static/css/default/settings.less
index fde0b9215..40c04c9e8 100644
--- a/module/web/static/css/default/settings.less
+++ b/module/web/static/css/default/settings.less
@@ -1,19 +1,44 @@
@import "style.less";
-/*
- Settings
+/*
+ Settings
*/
.settings-menu {
- background-color: @yellowLightest;
+ background-color: #FFF;
+ box-shadow: 0 0 5px #000;
+// border: 10px solid #EEE;
+
+
+ .nav-header {
+ background: @blueDark;
+ color: @light;
+ }
+
+ li > a, .nav-header {
+ margin-left: -20px;
+ margin-right: -20px;
+ text-shadow: none;
+ }
+
+ i {
+ margin-top: 0;
+ }
+
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+
+}
+
+.nav > li > a:hover {
+ color: @blueDark;
}
.setting-box {
margin-top: 20px;
- border-color: @blueLighter;
- .gradient(top, @greyLighter, @yellowLighter);
- box-shadow: 0 0 5px @blue;
+ border: 10px solid @blueDark;
+ box-shadow: 0 0 5px @dark;
.page-header {
margin: 0;
@@ -28,4 +53,4 @@
background: none;
}
-}
+} \ No newline at end of file
diff --git a/module/web/static/img/default/checks_sheet.png b/module/web/static/img/default/checks_sheet.png
index 3cc2b0824..9662b8070 100644
--- a/module/web/static/img/default/checks_sheet.png
+++ b/module/web/static/img/default/checks_sheet.png
Binary files differ
diff --git a/module/web/templates/default/backbone/linkgrabber.html b/module/web/templates/default/backbone/linkgrabber.html
index a43852f77..4bedd922c 100755
--- a/module/web/templates/default/backbone/linkgrabber.html
+++ b/module/web/templates/default/backbone/linkgrabber.html
@@ -4,7 +4,7 @@
<small>paste&add links to pyLoad</small>
{% endblock %}
{% block content %}
- <div class="alert alert-error">
+ <div class="alert alert-error hidden">
Upload files container failed. Please try again.
</div>
<form class="form-horizontal">
@@ -19,8 +19,7 @@
<label class="control-label" for="inputLinks">Links</label>
<div class="controls">
- <textarea id="inputLinks" class="span4" rows="10" placeholder="Paste your links here...">
- </textarea>
+ <textarea id="inputLinks" class="span4" rows="10" placeholder="Paste your links here..."></textarea>
</div>
</div>
<div class="control-group">
diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html
index ba4f1b690..60676187b 100644
--- a/module/web/templates/default/settings.html
+++ b/module/web/templates/default/settings.html
@@ -13,17 +13,17 @@
<div class="row-fluid">
<div class="span2">
<ul class="nav nav-list well settings-menu">
- <li class="nav-header">{{ _("General") }}</li>
+ <li class="nav-header"><i class="icon-globe icon-white"></i> {{ _("General") }}</li>
<li class="active"><a href="#">Example Settings</a></li>
<li><a href="#">General blabla</a></li>
<li><a href="#">General blabla</a></li>
<li><a href="#">General blabla</a></li>
<li><a href="#">General blabla</a></li>
- <li class="nav-header">{{ _("Addons") }}</li>
+ <li class="nav-header"><i class="icon-th-large icon-white"></i> {{ _("Addons") }}</li>
<li><a href="#">Addons balba</a></li>
<li><a href="#">Addons balbal</a></li>
<li class="divider"></li>
- <li class="nav-header">{{ _("Accounts") }}</li>
+ <li class="nav-header"><i class="icon-user icon-white"></i> {{ _("Accounts") }}</li>
</ul>
</div>
<!-- Info Popup -->