From a80546cc0074186c36304c63d04169115db611a6 Mon Sep 17 00:00:00 2001 From: MaysWind Date: Sat, 18 Jun 2016 22:32:23 +0800 Subject: [PATCH] modify style --- app/scripts/filters/volumn.js | 4 ++++ app/styles/aria-ng.css | 27 ++++++++++++++------------- app/views/settings-aria2.html | 2 +- app/views/settings-ariang.html | 4 ++-- app/views/status.html | 2 +- app/views/task-detail.html | 8 ++++---- 6 files changed, 26 insertions(+), 21 deletions(-) diff --git a/app/scripts/filters/volumn.js b/app/scripts/filters/volumn.js index e6b0a7a..321bb30 100644 --- a/app/scripts/filters/volumn.js +++ b/app/scripts/filters/volumn.js @@ -12,6 +12,10 @@ fractionSize = defaultFractionSize; } + if (!value) { + value = 0; + } + if (!angular.isNumber(value)) { value = parseInt(value); } diff --git a/app/styles/aria-ng.css b/app/styles/aria-ng.css index 32caff6..bed2d1a 100644 --- a/app/styles/aria-ng.css +++ b/app/styles/aria-ng.css @@ -136,6 +136,7 @@ td { .skin-aria-ng .main-header .navbar { background-color: #f6f6f6; + border-bottom: 1px solid #ddd; } .skin-aria-ng .main-header .navbar .navbar-nav { @@ -701,8 +702,8 @@ td { border-top: 1px solid #ddd; } -.task-table-firstrow-noborder > .task-table-body > div.row { - border-top: 0; +.task-table > div.row:first-child { + border-top: inherit; } .skin-aria-ng .task-table > .task-table-body > div.row:nth-of-type(odd) { @@ -789,24 +790,28 @@ td { border-top: 1px solid #ddd; } -.settings-table-firstrow-noborder > div.row { - border-top: 0; +.settings-table > div.row:first-child { + border-top: inherit; } -.skin-aria-ng .settings-table > div.row:nth-of-type(odd) { +.skin-aria-ng .settings-table.striped > div.row:nth-of-type(odd) { background-color: #f9f9f9; } -.skin-aria-ng .settings-table > div.row:hover { +.skin-aria-ng .settings-table.striped > div.row.no-background { + background-color: inherit; +} + +.skin-aria-ng .settings-table.hoverable > div.row:hover { background-color: #f5f5f5; } -.skin-aria-ng .settings-table > div.row.no-background { +.skin-aria-ng .settings-table.hoverable > div.row.no-hover:hover { background-color: inherit; } -.skin-aria-ng .settings-table > div.row.no-hover:hover { - background-color: inherit; +.skin-aria-ng .settings-table.hoverable > div.row:nth-of-type(odd).no-hover:hover { + background-color: #f9f9f9; } .settings-table .input-group-addon { @@ -851,13 +856,9 @@ td { } .settings-table .tip { - background-color: #fff !important; font-size: 12px; padding: 4px 8px 4px 8px; } -.settings-table .tip:hover { - background-color: #fff !important; -} @media (max-width: 767px) { .settings-table .setting-key { diff --git a/app/views/settings-aria2.html b/app/views/settings-aria2.html index 112d98b..74e1169 100644 --- a/app/views/settings-aria2.html +++ b/app/views/settings-aria2.html @@ -1,5 +1,5 @@
-
+
diff --git a/app/views/settings-ariang.html b/app/views/settings-ariang.html index aee0182..815fe7a 100644 --- a/app/views/settings-ariang.html +++ b/app/views/settings-ariang.html @@ -1,5 +1,5 @@
-
+
Language @@ -81,7 +81,7 @@
-
+
* Changes to the settings take effect after refreshing page.
diff --git a/app/views/status.html b/app/views/status.html index 0a8debe..097e957 100644 --- a/app/views/status.html +++ b/app/views/status.html @@ -1,5 +1,5 @@
-
+
Aria2 Version diff --git a/app/views/task-detail.html b/app/views/task-detail.html index 21db627..3374cf3 100644 --- a/app/views/task-detail.html +++ b/app/views/task-detail.html @@ -22,7 +22,7 @@
-
+
File Name @@ -143,7 +143,7 @@
-
+