diff options
Diffstat (limited to 'module/web')
| -rw-r--r-- | module/web/static/css/default/dashboard.less | 2 | ||||
| -rw-r--r-- | module/web/static/css/default/style.less | 20 | ||||
| -rw-r--r-- | module/web/static/img/default/box-separator.png | bin | 0 -> 1180 bytes | |||
| -rw-r--r-- | module/web/static/js/views/packageView.js | 2 | ||||
| -rw-r--r-- | module/web/templates/default/base.html | 8 | ||||
| -rw-r--r-- | module/web/templates/default/dashboard.html | 1 |
6 files changed, 18 insertions, 15 deletions
diff --git a/module/web/static/css/default/dashboard.less b/module/web/static/css/default/dashboard.less index d67f6ce98..e60a21dfb 100644 --- a/module/web/static/css/default/dashboard.less +++ b/module/web/static/css/default/dashboard.less @@ -103,7 +103,7 @@ }
.package-row.second {
- width: 30%;
+ width: 20%;
.gradient(top, @blueDark, @blueDarker);
font-size: smaller;
}
diff --git a/module/web/static/css/default/style.less b/module/web/static/css/default/style.less index 7a4ed6ed3..e1b4e417e 100644 --- a/module/web/static/css/default/style.less +++ b/module/web/static/css/default/style.less @@ -23,7 +23,8 @@ @grey: #757575;
@greyLight: #E5E5E5;
@greyLighter: #F5F5F5;
-@greyDark: #111113;
+@greyDark: #444444;
+@greyDarker: #111113;
@yellow: #fee247;
@yellowLighter: lighten(spin(@yellow, 10), 20%);
@@ -261,18 +262,18 @@ header .logo { // Responsive Borders
.header_block.left-border {
- border-left: 1px solid @grey;
+ background: url("../../img/default/box-separator.png") repeat-y;
padding-left: 1%;
}
.header_block.right-border {
- border-right: 1px solid @grey;
+ background: url("../../img/default/box-separator.png") repeat-y right;
padding-right: 1%;
}
@media (max-width: @large-screen) {
.header_block {
- border: none !important;
+ background: none !important;
padding: 0 !important;
}
}
@@ -286,25 +287,26 @@ header .logo { .notifications-area {
display: inline;
+ opacity: 1;
color: #fff;
height: 14px;
line-height: 14px;
font-size: small;
- background-color: @grey;
- border: 5px solid @grey;
+ background-color: @greyDark;
+ border: 5px solid @greyDark;
border-radius: 0 0 5px 5px;
}
#globalprogress {
- background-color: @grey;
+ background-color: @greyDark;
background-image: none;
height: 15px;
- margin: 8px 5px 0;
+ margin: 8px 0 0;
line-height: 15px;
-webkit-border-radius: 15px;
-moz-border-radius: 15px;
border-radius: 15px;
- border: 3px solid #242424;
+ border: 3px solid @grey;
.bar {
color: @dark;
diff --git a/module/web/static/img/default/box-separator.png b/module/web/static/img/default/box-separator.png Binary files differnew file mode 100644 index 000000000..9860fd9e9 --- /dev/null +++ b/module/web/static/img/default/box-separator.png diff --git a/module/web/static/js/views/packageView.js b/module/web/static/js/views/packageView.js index 17b6bc06f..22cc846ef 100644 --- a/module/web/static/js/views/packageView.js +++ b/module/web/static/js/views/packageView.js @@ -9,7 +9,7 @@ define(['jquery', 'views/abstract/itemView', 'underscore', 'views/fileView'], template: _.compile($("#template-package").html()), events: { 'click .package-row .name': 'expand', - 'click .delete': 'delete', + 'click .icon-remove': 'delete', 'click .checkbox': 'select' }, diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index a2f622095..33b09751d 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -84,10 +84,10 @@ <div class="bar" style="width: 48%">downloading... (48%)</div>
</div>
- <div>
- <span class="pull-left">3,65 MB of 5,30 MB</span>
- <span class="pull-right">420,7 kB / sec</span>
- </div>
+{# <div>#}
+{# <span class="pull-left">3,65 MB of 5,30 MB</span>#}
+{# <span class="pull-right">420,7 kB / sec</span>#}
+{# </div>#}
</div>
diff --git a/module/web/templates/default/dashboard.html b/module/web/templates/default/dashboard.html index fcf6b33e2..e5f941d6f 100644 --- a/module/web/templates/default/dashboard.html +++ b/module/web/templates/default/dashboard.html @@ -34,6 +34,7 @@ <span class="badge badge-important"><i class="icon-tag icon-white"></i> tag</span>
<span class="badge badge-important"><i class="icon-tag icon-white"></i> tag2</span>
<i class="icon-wrench icon-white pull-right"></i>
+ <i class="icon-remove icon-white pull-right"></i>
</div>
</div>
</script>
|
