From 904197fc1072795bb44c065fcae74cb3e4e233c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raimund=20Schl=C3=BC=C3=9Fler?= Date: Mon, 28 Aug 2017 22:23:49 +0200 Subject: [PATCH] Several css style fixes - Remove dims rules - change icon prefix - rename star icons - add hovered icon - fix positioning of all static icons - fix messed up position of progress bar - fix collection icons - fix app-navigation-entry opacities --- css/sprite.css | 319 ++++++++------------------- css/style.css | 202 +++++++---------- css/svg/sprite.css.svg | 34 --- img/favicon-touch.svg | 17 +- img/favicon.svg | 16 +- img/source/all-active.svg | 52 ----- img/source/all.svg | 50 ----- img/source/alphabetically.svg | 12 - img/source/calendar-active.svg | 106 --------- img/source/calendar.svg | 106 --------- img/source/categories-active.svg | 41 ---- img/source/categories.svg | 41 ---- img/source/checkbox-checked.svg | 27 --- img/source/checkbox.svg | 18 -- img/source/checkmark-green.svg | 80 ------- img/source/checkmark-white.svg | 80 ------- img/source/checkmark.svg | 80 ------- img/source/clock-due.svg | 298 ------------------------- img/source/clock-overdue.svg | 298 ------------------------- img/source/clock.svg | 299 ------------------------- img/source/cross.svg | 8 - img/source/current-active.svg | 50 ----- img/source/current.svg | 50 ----- img/source/date-detail-active.svg | 142 ------------ img/source/date-detail-none.svg | 142 ------------ img/source/detail-date-overdue.svg | 142 ------------ img/source/detail-date.svg | 142 ------------ img/source/divider.svg | 7 - img/source/eye-hidden.svg | 17 -- img/source/eye-visible.svg | 15 -- img/source/hide.svg | 68 ------ img/source/manual.svg | 21 -- img/source/note.svg | 54 ----- img/source/percent-set.svg | 94 -------- img/source/percent.svg | 96 -------- img/source/plus-none.svg | 8 - img/source/plus.svg | 8 - img/source/settings.svg | 60 ----- img/source/sort-default.svg | 12 - img/source/sort-down.svg | 33 --- img/source/sort-up.svg | 33 --- img/source/star-active.svg | 10 - img/source/star-huge-high.svg | 8 - img/source/star-huge-low.svg | 8 - img/source/star-huge-medium.svg | 8 - img/source/star-huge-none.svg | 8 - img/source/star-huge-none~hover.svg | 8 - img/source/star-large-high.svg | 114 ---------- img/source/star-large-low.svg | 262 ---------------------- img/source/star-large-medium.svg | 262 ---------------------- img/source/star-large-none.svg | 262 ---------------------- img/source/star-large-none~hover.svg | 262 ---------------------- img/source/star-small-high.svg | 25 --- img/source/star-small-low.svg | 25 --- img/source/star-small-medium.svg | 25 --- img/source/star-small-none.svg | 25 --- img/source/star.svg | 10 - img/source/subtasks-hidden.svg | 71 ------ img/source/subtasks-visible.svg | 71 ------ img/source/task-active.svg | 12 - img/source/task.svg | 12 - img/source/toggle.svg | 122 ---------- img/source/trash.svg | 78 ------- img/source/update.svg | 10 - img/sprites.svg | 2 +- img/src/add.svg | 2 +- img/src/all.svg | 2 +- img/src/alphabetically.svg | 2 +- img/src/calendar-due.svg | 2 +- img/src/calendar-overdue.svg | 2 +- img/src/calendar.svg | 2 +- img/src/checkmark-color.svg | 2 +- img/src/checkmark.svg | 2 +- img/src/clock-due.svg | 2 +- img/src/clock-overdue.svg | 2 +- img/src/clock.svg | 2 +- img/src/close.svg | 2 +- img/src/current.svg | 2 +- img/src/hide.svg | 2 +- img/src/image-optimization.sh | 20 ++ img/src/manual.svg | 2 +- img/src/menu.svg | 2 +- img/src/note.svg | 2 +- img/src/percent-active.svg | 1 + img/src/percent.svg | 2 +- img/src/random.svg | 2 +- img/src/settings.svg | 2 +- img/src/sort-down.svg | 2 +- img/src/sort-up.svg | 2 +- img/src/star-high.svg | 1 - img/src/star-low.svg | 1 - img/src/star-medium.svg | 1 - img/src/star.svg | 1 - img/src/subtasks-hidden.svg | 2 +- img/src/subtasks-hidden~hover.svg | 1 + img/src/subtasks-visible.svg | 2 +- img/src/tag-active.svg | 1 + img/src/tag.svg | 2 +- img/src/task-star-high.svg | 1 + img/src/task-star-low.svg | 1 + img/src/task-star-medium.svg | 1 + img/src/task-star.svg | 1 + img/src/toggle.svg | 2 +- img/src/trash.svg | 2 +- img/tasks.svg | 16 +- js/Gruntfile.js | 3 +- service/collectionsservice.php | 18 +- templates/colorpicker.html | 2 +- templates/main.php | 6 +- templates/part.details.php | 42 ++-- templates/part.taskbody.php | 13 +- 111 files changed, 281 insertions(+), 4982 deletions(-) delete mode 100644 css/svg/sprite.css.svg delete mode 100644 img/source/all-active.svg delete mode 100644 img/source/all.svg delete mode 100644 img/source/alphabetically.svg delete mode 100644 img/source/calendar-active.svg delete mode 100644 img/source/calendar.svg delete mode 100644 img/source/categories-active.svg delete mode 100644 img/source/categories.svg delete mode 100644 img/source/checkbox-checked.svg delete mode 100644 img/source/checkbox.svg delete mode 100644 img/source/checkmark-green.svg delete mode 100644 img/source/checkmark-white.svg delete mode 100644 img/source/checkmark.svg delete mode 100644 img/source/clock-due.svg delete mode 100644 img/source/clock-overdue.svg delete mode 100644 img/source/clock.svg delete mode 100644 img/source/cross.svg delete mode 100644 img/source/current-active.svg delete mode 100644 img/source/current.svg delete mode 100644 img/source/date-detail-active.svg delete mode 100644 img/source/date-detail-none.svg delete mode 100644 img/source/detail-date-overdue.svg delete mode 100644 img/source/detail-date.svg delete mode 100644 img/source/divider.svg delete mode 100644 img/source/eye-hidden.svg delete mode 100644 img/source/eye-visible.svg delete mode 100644 img/source/hide.svg delete mode 100644 img/source/manual.svg delete mode 100644 img/source/note.svg delete mode 100644 img/source/percent-set.svg delete mode 100644 img/source/percent.svg delete mode 100644 img/source/plus-none.svg delete mode 100644 img/source/plus.svg delete mode 100644 img/source/settings.svg delete mode 100644 img/source/sort-default.svg delete mode 100644 img/source/sort-down.svg delete mode 100644 img/source/sort-up.svg delete mode 100644 img/source/star-active.svg delete mode 100644 img/source/star-huge-high.svg delete mode 100644 img/source/star-huge-low.svg delete mode 100644 img/source/star-huge-medium.svg delete mode 100644 img/source/star-huge-none.svg delete mode 100644 img/source/star-huge-none~hover.svg delete mode 100644 img/source/star-large-high.svg delete mode 100644 img/source/star-large-low.svg delete mode 100644 img/source/star-large-medium.svg delete mode 100644 img/source/star-large-none.svg delete mode 100644 img/source/star-large-none~hover.svg delete mode 100644 img/source/star-small-high.svg delete mode 100644 img/source/star-small-low.svg delete mode 100644 img/source/star-small-medium.svg delete mode 100644 img/source/star-small-none.svg delete mode 100644 img/source/star.svg delete mode 100644 img/source/subtasks-hidden.svg delete mode 100644 img/source/subtasks-visible.svg delete mode 100644 img/source/task-active.svg delete mode 100644 img/source/task.svg delete mode 100644 img/source/toggle.svg delete mode 100644 img/source/trash.svg delete mode 100644 img/source/update.svg create mode 100644 img/src/image-optimization.sh create mode 100644 img/src/percent-active.svg delete mode 100644 img/src/star-high.svg delete mode 100644 img/src/star-low.svg delete mode 100644 img/src/star-medium.svg delete mode 100644 img/src/star.svg create mode 100644 img/src/subtasks-hidden~hover.svg create mode 100644 img/src/tag-active.svg create mode 100644 img/src/task-star-high.svg create mode 100644 img/src/task-star-low.svg create mode 100644 img/src/task-star-medium.svg create mode 100644 img/src/task-star.svg diff --git a/css/sprite.css b/css/sprite.css index 0725adfe..f2e0cde5 100644 --- a/css/sprite.css +++ b/css/sprite.css @@ -2,282 +2,141 @@ background: url("../img/sprites.svg") no-repeat; } -.svg-add { +.icon-add { background-position: 20% 0; } -.svg-add-dims { - width: 16px; - height: 16px; -} - -.svg-all { - background-position: 60% 60%; -} - -.svg-all-dims { - width: 16px; - height: 16px; -} - -.svg-alphabetically { - background-position: 0 20%; -} - -.svg-alphabetically-dims { - width: 16px; - height: 16px; -} - -.svg-calendar { - background-position: 20% 20%; -} - -.svg-calendar-dims { - width: 16px; - height: 16px; -} - -.svg-calendar-due { - background-position: 40% 0; -} - -.svg-calendar-due-dims { - width: 16px; - height: 16px; -} - -.svg-calendar-overdue { - background-position: 40% 20%; -} - -.svg-calendar-overdue-dims { - width: 16px; - height: 16px; -} - -.svg-checkmark { - background-position: 0 40%; -} - -.svg-checkmark-dims { - width: 16px; - height: 16px; -} - -.svg-checkmark-color { - background-position: 20% 40%; -} - -.svg-checkmark-color-dims { - width: 16px; - height: 16px; -} - -.svg-clock { - background-position: 40% 40%; -} - -.svg-clock-dims { - width: 16px; - height: 16px; -} - -.svg-clock-due { - background-position: 60% 0; -} - -.svg-clock-due-dims { - width: 16px; - height: 16px; -} - -.svg-clock-overdue { - background-position: 60% 20%; -} - -.svg-clock-overdue-dims { - width: 16px; - height: 16px; -} - -.svg-close { - background-position: 60% 40%; -} - -.svg-close-dims { - width: 16px; - height: 16px; -} - -.svg-current { - background-position: 0 60%; -} - -.svg-current-dims { - width: 16px; - height: 16px; -} - -.svg-hide { - background-position: 20% 60%; -} - -.svg-hide-dims { - width: 16px; - height: 16px; -} - -.svg-manual { - background-position: 40% 60%; -} - -.svg-manual-dims { - width: 16px; - height: 16px; -} - -.svg-menu { - background-position: 0 0; -} - -.svg-menu-dims { - width: 16px; - height: 16px; -} - -.svg-note { - background-position: 80% 0; -} - -.svg-note-dims { - width: 16px; - height: 16px; -} - -.svg-percent { +.icon-all { background-position: 80% 20%; } -.svg-percent-dims { - width: 16px; - height: 16px; +.icon-alphabetically { + background-position: 0 20%; } -.svg-random { +.icon-calendar { + background-position: 20% 20%; +} + +.icon-calendar-due { + background-position: 40% 0; +} + +.icon-calendar-overdue { + background-position: 40% 20%; +} + +.icon-checkmark { + background-position: 0 40%; +} + +.icon-checkmark-color { + background-position: 20% 40%; +} + +.icon-clock { + background-position: 40% 40%; +} + +.icon-clock-due { + background-position: 60% 0; +} + +.icon-clock-overdue { + background-position: 60% 20%; +} + +.icon-close { + background-position: 60% 40%; +} + +.icon-current { + background-position: 0 60%; +} + +.icon-hide { + background-position: 20% 60%; +} + +.icon-manual { + background-position: 40% 60%; +} + +.icon-menu { + background-position: 60% 60%; +} + +.icon-note { + background-position: 80% 0; +} + +.icon-percent { + background-position: 0 0; +} + +.icon-percent-active { background-position: 80% 40%; } -.svg-random-dims { - width: 16px; - height: 16px; -} - -.svg-settings { +.icon-random { background-position: 80% 60%; } -.svg-settings-dims { - width: 16px; - height: 16px; -} - -.svg-sort-down { +.icon-settings { background-position: 0 80%; } -.svg-sort-down-dims { - width: 16px; - height: 16px; -} - -.svg-sort-up { +.icon-sort-down { background-position: 20% 80%; } -.svg-sort-up-dims { - width: 16px; - height: 16px; -} - -.svg-star { +.icon-sort-up { background-position: 40% 80%; } -.svg-star-dims { - width: 16px; - height: 16px; -} - -.svg-star-high { +.icon-subtasks-hidden, +.icon-subtasks-hidden\:regular { background-position: 60% 80%; } -.svg-star-high-dims { - width: 16px; - height: 16px; -} - -.svg-star-low { +.icon-subtasks-hidden:hover, +.icon-subtasks-hidden\:hover { background-position: 80% 80%; } -.svg-star-low-dims { - width: 16px; - height: 16px; -} - -.svg-star-medium { +.icon-subtasks-visible { background-position: 100% 0; } -.svg-star-medium-dims { - width: 16px; - height: 16px; -} - -.svg-subtasks-hidden { +.icon-tag { background-position: 100% 20%; } -.svg-subtasks-hidden-dims { - width: 16px; - height: 16px; -} - -.svg-subtasks-visible { +.icon-tag-active { background-position: 100% 40%; } -.svg-subtasks-visible-dims { - width: 16px; - height: 16px; -} - -.svg-tag { +.icon-task-star { background-position: 100% 60%; } -.svg-tag-dims { - width: 16px; - height: 16px; -} - -.svg-toggle { +.icon-task-star-high { background-position: 100% 80%; } -.svg-toggle-dims { - width: 16px; - height: 16px; -} - -.svg-trash { +.icon-task-star-low { background-position: 0 100%; } -.svg-trash-dims { - width: 16px; - height: 16px; +.icon-task-star-medium { + background-position: 20% 100%; +} + +.icon-toggle { + background-position: 40% 100%; +} + +.icon-trash { + background-position: 60% 100%; } diff --git a/css/style.css b/css/style.css index c5e802e2..e48b469e 100644 --- a/css/style.css +++ b/css/style.css @@ -67,7 +67,7 @@ .sortorder-dropdown li span { cursor: pointer; } -#app-navigation .app-navigation-entry-menu li:hover, +#app-navigation .app-navigation-entry-menu li:hover a, .sortorder-dropdown li:hover { opacity: 1 !important; } @@ -109,53 +109,35 @@ height: 16px; width: 16px; display: inline-block; - cursor: pointer; + /*cursor: pointer;*/ vertical-align: middle; opacity: .5; } -.svg-star { +.icon-task-star { opacity: 0.3; } -.svg-star:hover { +.task-item .icon-task-star:hover { opacity: 0.5; } -.svg-star-low, -.svg-star-medium, -.svg-star-high { +.icon-task-star-low, +.icon-task-star-medium, +.icon-task-star-high { opacity: 1 !important; } .icon.none { - background-position: 0 -20px; + /*background-position: 0 -20px;*/ } -.icon.collection-starred { - background-position: 40% 80%; -} -.icon.collection-today { +.icon.icon-calendar { -moz-box-sizing: border-box; - background-position: 20% 20%; + /*background-position: 20% 20%;*/ font-size: 7px; font-weight: bold; line-height: 21px; text-align: center; } -.icon.collection-week { - background-position: 20% 20%; -} -.icon.collection-completed { - background-position: 0 40%; -} -.icon.collection-all { - background-position: 80% 0; -} -.icon.collection-current { - background-position: 0 60%; -} -.icon.detail-add { - background-position: 20% 0; -} .icon.input-date { display: none; - background-position: -160px -100px; + /*background-position: -160px -100px;*/ opacity: 0.4; transition: opacity 100ms ease 0s; right: 35px; @@ -163,12 +145,12 @@ } .icon.input-star { display: none; - background-position: -100px -180px; + /*background-position: -100px -180px;*/ opacity: 0.5; right: 9px; } .icon.input-star.starred { - background-position: -120px -180px; + /*background-position: -120px -180px;*/ opacity: 1; } .icon.task-checkbox, @@ -180,6 +162,7 @@ } #app-sidebar .icon.detail-checkbox { left: 16px !important; + cursor: pointer; position: absolute; top: 19px; margin: 0; @@ -188,42 +171,36 @@ .icon.detail-checkbox:not(.disabled):hover { border-color: #000; } -.icon.task-checkbox:not(.svg-checkmark), -.icon.detail-checkbox:not(.svg-checkmark) { +.icon.task-checkbox:not(.icon-checkmark), +.icon.detail-checkbox:not(.icon-checkmark) { background: unset; } .icon.task-checkbox.disabled, .icon.detail-checkbox.disabled { cursor: not-allowed; } -.icon.task-attachment { - background-position: 0 0; +.icon.icon-note { display: none; } .icon.subtasks { float:right; - background-position: 100% 40%; + /*background-position: 100% 40%;*/ } .icon.subtasks:hover { - background-position: 100% 20%; + /*background-position: 100% 20%;*/ } .icon.detail-settings { - background-position: -200px -40px; + /*background-position: -200px -40px;*/ transition: opacity 100ms ease 0s; opacity: 0.6; } .icon.detail-reminder { - background-position: -40px -40px; + /*background-position: -40px -40px;*/ height: 20px; width: 20px; } -.icon.detail-priority, -.icon.sort-priority { - background-position: 40% 80%; - /*opacity: 1;*/ -} -.icon.svg-checkmark, -.icon.svg-checkmark { +.icon.icon-checkmark, +.icon.icon-checkmark { opacity: 1; } a.detail-star { @@ -235,30 +212,18 @@ a.detail-star .icon { height: 24px; width: 24px; background-size: 144px 144px; - background-position: 40% 80%; + /*background-position: 40% 80%;*/ opacity: 0.3; } -a.detail-star .icon.low { - background-position: 80% 80%; - opacity: 1 !important; -} -a.detail-star .icon.medium { - background-position: 100% 0; - opacity: 1 !important; -} -a.detail-star .icon.high { - background-position: 60% 80%; - opacity: 1 !important; -} a.detail-star .icon:hover { opacity: 0.5; } .disabled .icon.detail-star:hover { - background-position: -60px -40px; + /*background-position: -60px -40px;*/ cursor: not-allowed; } .icon.note-fullscreen { - background-position: -140px -60px; + /*background-position: -140px -60px;*/ opacity: 0.6; } .icon.note-fullscreen:hover { @@ -377,14 +342,14 @@ tr:last-child .task-item div.task-body { width: 2px; border-left: 1px dotted #b0b0b0; } -.task-body .icon.svg-star { +.task-body .icon.icon-task-star { float: right; } -.task-body .icon.addsubtask { - background-position: 20% 0; +.task-body .icon.icon-add { + /*background-position: 20% 0;*/ float: right; } -.task-body .icon.addsubtask:hover { +.task-body .icon.icon-add:hover { opacity: 1; } .task-body .title-wrapper { @@ -403,7 +368,7 @@ tr:last-child .task-item div.task-body { .task-body .title-wrapper .title { cursor: text; } -.task-body.attachment .icon.task-attachment { +.task-body.attachment .icon.icon-note { display: inline-block; float: right; } @@ -420,10 +385,10 @@ tr:last-child .task-item div.task-body { display: inline-block; } .task-body.subtasks.subtaskshidden .icon.subtasks { - background-position: 100% 20%; + /*background-position: 100% 20%;*/ } .task-body.subtasks.subtaskshidden .icon.subtasks:hover { - background-position: 100% 40%; + /*background-position: 100% 40%;*/ } .task-body .duedate { color: #3B6594; @@ -638,10 +603,10 @@ tr:last-child .task-item div.task-body { color: #9FA2A6 !important; } #app-sidebar div.content-wrapper.completed .body .section .icon.detail-date { - background-position: -100px -40px !important; + /*background-position: -100px -40px !important;*/ } #app-sidebar div.content-wrapper.completed .body .section .icon.detail-reminder { - background-position: -40px -40px !important; + /*background-position: -40px -40px !important;*/ } #app-sidebar div.content-wrapper .title { background-color: #f5f5f5; @@ -909,15 +874,15 @@ tr:last-child .task-item div.task-body { margin-left: auto; right: 44px; } -.icon.svg-calendar, +.icon.icon-calendar, .icon.detail-start, .icon.detail-date, .icon.sort-due, .icon.sort-start { - background-position: 20% 20%; + /*background-position: 20% 20%;*/ } .icon.sort-manual { - background-position: -20px -140px; + /*background-position: -20px -140px;*/ } #app-sidebar div.content-wrapper .body .section .icon.detail-remindertype { display: none; @@ -948,24 +913,18 @@ tr:last-child .task-item div.task-body { #app-sidebar div.content-wrapper .body .section.editing .section-edit { display: block; } -.date .icon.detail-date, -.date .icon.detail-start { - background-position: 40% 0; +.date .icon.icon-calendar-due, +.date .icon.icon-calendar-overdue { opacity: 1; } -.date .icon.detail-date.overdue, -.date .icon.detail-start.overdue { - background-position: 40% 20%; - opacity: 1; -} -#app-sidebar div.content-wrapper .body .section.date .icon.svg-percent { +#app-sidebar div.content-wrapper .body .section.date .icon.icon-percent { opacity: 1; } #app-sidebar div.content-wrapper .body .section.date .icon.detail-reminder { - background-position: -40px -60px; + /*background-position: -40px -60px;*/ } #app-sidebar div.content-wrapper .body .section.date .icon.detail-reminder.overdue { - background-position: -40px -80px; + /*background-position: -40px -80px;*/ } #app-sidebar div.content-wrapper .body .section.date:hover .icon.detail-delete { display: block; @@ -983,27 +942,27 @@ tr:last-child .task-item div.task-body { margin-top: -2px; } .high .icon.detail-priority { - background-position: 60% 80%; + /*background-position: 60% 80%;*/ opacity: 1; } .high .section-title { color: #B3312D !important; } .medium .icon.detail-priority { - background-position: 100% 0; + /*background-position: 100% 0;*/ opacity: 1; } .medium .section-title { color: #FFDD00 !important; } .low .icon.detail-priority { - background-position: 80% 80%; + /*background-position: 80% 80%;*/ opacity: 1; } .low .section-title { color: #4271A6 !important; } -.active .detail-categories { +.icon.icon-tag-active { opacity: 1; } #app-sidebar div.content-wrapper .body .section.active .select2-search-field input { @@ -1013,7 +972,7 @@ tr:last-child .task-item div.task-body { display: block; } #app-sidebar div.content-wrapper .body .section .icon.detail-remindertype { - background-position: -260px -40px; + /*background-position: -260px -40px;*/ } #app-sidebar div.content-wrapper .body .section.detail-reminder .section-description { display: none; @@ -1224,26 +1183,23 @@ td.ui-timepicker-hours table { background: none; border: none; } -.ui-datepicker .ui-datepicker-prev span, -.ui-timepicker .ui-datepicker-prev span, -.ui-datepicker .ui-datepicker-next span, -.ui-timepicker .ui-datepicker-next span { - margin-left: -4px; - margin-top: -4px; -} .ui-datepicker .ui-icon-circle-triangle-w, .ui-timepicker .ui-icon-circle-triangle-w { + /*this will break when sprites.svg is recompiled + might be fixable with scss and @extend*/ background-image: url("../img/sprites.svg"); - background-position: -20px -60px; - height: 10px; - width: 10px; + background-position: -32px -64px; + height: 16px; + width: 16px; } .ui-datepicker .ui-icon-circle-triangle-e, .ui-timepicker .ui-icon-circle-triangle-e { + /*this will break when sprites.svg is recompiled + might be fixable with scss and @extend*/ background-image: url("../img/sprites.svg"); - background-position: -30px -60px; - height: 10px; - width: 10px; + background-position: -16px -64px; + height: 16px; + width: 16px; } .ui-datepicker table, .ui-timepicker table { @@ -1362,20 +1318,17 @@ li.ui-draggable-dragging .duedate { div.percentdone { height: 3px; border-radius: 2px 0 0 2px; - opacity: 0.75; + opacity: .75; } div.percentbar { height: 3px; position: relative; - top: calc(100% - 3px); + top: 28px; + left: 42px; + margin-right: 103px; + margin-bottom: -5px; background-color: #CCC; - border-radius: 2px 0 0 2px; -} -.percentbar ~ div, -.percentbar ~ a, -.percentbar ~ a .icon { - bottom: 3px; - position: relative; + border-radius: 2px 2px 2px 2px; } #searchresults { padding-top: 0 !important; @@ -1396,14 +1349,14 @@ div.percentbar { position: relative; } #searchresults span.icon.task-checkbox { - background-position: -260px -20px; + /*background-position: -260px -20px;*/ opacity: 0.6; } -#searchresults span.icon.task-checkbox.svg-checkmark { - background-position: -260px -20px; +#searchresults span.icon.task-checkbox.icon-checkmark { + /*background-position: -260px -20px;*/ } #searchresults span.icon.task-star:hover { - background-position: -140px 0 !important; + /*background-position: -140px 0 !important;*/ } .template { display: none; @@ -1429,10 +1382,11 @@ div.percentbar { min-height: 22px; } .detail-categories .select2-container-multi .select2-choices .select2-search-choice a.select2-search-choice-close { - background: url("../img/sprites.svg") no-repeat; - background-position: 60% 40%; opacity: 0.4; display: initial; + /*this will break when sprites.svg is recompiled + might be fixable with scss and @extend*/ + background: url("../img/sprites.svg") no-repeat 60% 40%; } .detail-categories .select2-container-multi .select2-choices .select2-search-choice a.select2-search-choice-close:hover { opacity: 1; @@ -1536,7 +1490,7 @@ ol[dnd-list] .dndPlaceholder { .colorpicker .colorpicker-list li.randomcolour { cursor: pointer; } -.colorpicker .colorpicker-list li.randomcolour .svg-random { +.colorpicker .colorpicker-list li.randomcolour .icon-random { filter: invert(1); opacity: 1; } @@ -1576,21 +1530,27 @@ ol[dnd-list] .dndPlaceholder { .confirmed .confirmation-default { display: none !important; } - -.confirmation-confirm, .confirmation-abort { +.confirmation-confirm, +.confirmation-abort { width: 50% !important; display: none !important; padding-right: 0 !important; background-position: center !important; } +#app-navigation .app-navigation-entry-menu li a.confirmation-confirm{ + /*opacity: 1;*/ +} + .confirmation-confirm { background-color: red !important; cursor: default !important; } -.confirmed .confirmation-confirm, .confirmed .confirmation-abort { +#app-navigation .app-navigation-entry-menu li.confirmed a.confirmation-confirm, +#app-navigation .app-navigation-entry-menu li.confirmed a.confirmation-abort { display: inline-block !important; + opacity: 1; } .app-navigation-entry-menu li > a:not(:empty).confirmation-confirm { diff --git a/css/svg/sprite.css.svg b/css/svg/sprite.css.svg deleted file mode 100644 index bcd3a467..00000000 --- a/css/svg/sprite.css.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/img/favicon-touch.svg b/img/favicon-touch.svg index 049c7d4b..a73f891c 100644 --- a/img/favicon-touch.svg +++ b/img/favicon-touch.svg @@ -1,14 +1,5 @@ - - - - - - + + + + diff --git a/img/favicon.svg b/img/favicon.svg index 3b0dcb4f..cc1524dc 100644 --- a/img/favicon.svg +++ b/img/favicon.svg @@ -1,13 +1,5 @@ - - - - - - + + + + diff --git a/img/source/all-active.svg b/img/source/all-active.svg deleted file mode 100644 index 6c2fb3aa..00000000 --- a/img/source/all-active.svg +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/all.svg b/img/source/all.svg deleted file mode 100644 index 03f87318..00000000 --- a/img/source/all.svg +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/alphabetically.svg b/img/source/alphabetically.svg deleted file mode 100644 index 57912a07..00000000 --- a/img/source/alphabetically.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - diff --git a/img/source/calendar-active.svg b/img/source/calendar-active.svg deleted file mode 100644 index 796b0cb7..00000000 --- a/img/source/calendar-active.svg +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/calendar.svg b/img/source/calendar.svg deleted file mode 100644 index d88359c2..00000000 --- a/img/source/calendar.svg +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/categories-active.svg b/img/source/categories-active.svg deleted file mode 100644 index d185b935..00000000 --- a/img/source/categories-active.svg +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/categories.svg b/img/source/categories.svg deleted file mode 100644 index b243f465..00000000 --- a/img/source/categories.svg +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/checkbox-checked.svg b/img/source/checkbox-checked.svg deleted file mode 100644 index c7446de0..00000000 --- a/img/source/checkbox-checked.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/img/source/checkbox.svg b/img/source/checkbox.svg deleted file mode 100644 index 9cb7604f..00000000 --- a/img/source/checkbox.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/img/source/checkmark-green.svg b/img/source/checkmark-green.svg deleted file mode 100644 index 9853552a..00000000 --- a/img/source/checkmark-green.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/checkmark-white.svg b/img/source/checkmark-white.svg deleted file mode 100644 index 47c2f919..00000000 --- a/img/source/checkmark-white.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/checkmark.svg b/img/source/checkmark.svg deleted file mode 100644 index 76a8fefa..00000000 --- a/img/source/checkmark.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/clock-due.svg b/img/source/clock-due.svg deleted file mode 100644 index 8e18d330..00000000 --- a/img/source/clock-due.svg +++ /dev/null @@ -1,298 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/clock-overdue.svg b/img/source/clock-overdue.svg deleted file mode 100644 index 2a5b0881..00000000 --- a/img/source/clock-overdue.svg +++ /dev/null @@ -1,298 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/clock.svg b/img/source/clock.svg deleted file mode 100644 index 3b28107b..00000000 --- a/img/source/clock.svg +++ /dev/null @@ -1,299 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/cross.svg b/img/source/cross.svg deleted file mode 100644 index 857a2fa6..00000000 --- a/img/source/cross.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/img/source/current-active.svg b/img/source/current-active.svg deleted file mode 100644 index dd294c36..00000000 --- a/img/source/current-active.svg +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/current.svg b/img/source/current.svg deleted file mode 100644 index dc2e3e7b..00000000 --- a/img/source/current.svg +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/date-detail-active.svg b/img/source/date-detail-active.svg deleted file mode 100644 index cd590d8a..00000000 --- a/img/source/date-detail-active.svg +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/date-detail-none.svg b/img/source/date-detail-none.svg deleted file mode 100644 index 0c37c9df..00000000 --- a/img/source/date-detail-none.svg +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/detail-date-overdue.svg b/img/source/detail-date-overdue.svg deleted file mode 100644 index 3ab580e1..00000000 --- a/img/source/detail-date-overdue.svg +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/detail-date.svg b/img/source/detail-date.svg deleted file mode 100644 index 398d0264..00000000 --- a/img/source/detail-date.svg +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/divider.svg b/img/source/divider.svg deleted file mode 100644 index d34e1917..00000000 --- a/img/source/divider.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/img/source/eye-hidden.svg b/img/source/eye-hidden.svg deleted file mode 100644 index abd5297b..00000000 --- a/img/source/eye-hidden.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - diff --git a/img/source/eye-visible.svg b/img/source/eye-visible.svg deleted file mode 100644 index 47a34bed..00000000 --- a/img/source/eye-visible.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - diff --git a/img/source/hide.svg b/img/source/hide.svg deleted file mode 100644 index 652372f8..00000000 --- a/img/source/hide.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/manual.svg b/img/source/manual.svg deleted file mode 100644 index 593cd2a9..00000000 --- a/img/source/manual.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/img/source/note.svg b/img/source/note.svg deleted file mode 100644 index 0f5ba336..00000000 --- a/img/source/note.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/percent-set.svg b/img/source/percent-set.svg deleted file mode 100644 index 3aa66b23..00000000 --- a/img/source/percent-set.svg +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/percent.svg b/img/source/percent.svg deleted file mode 100644 index a3a4dde4..00000000 --- a/img/source/percent.svg +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/plus-none.svg b/img/source/plus-none.svg deleted file mode 100644 index b97ad60e..00000000 --- a/img/source/plus-none.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/img/source/plus.svg b/img/source/plus.svg deleted file mode 100644 index cdb7b0f2..00000000 --- a/img/source/plus.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/img/source/settings.svg b/img/source/settings.svg deleted file mode 100644 index c90af265..00000000 --- a/img/source/settings.svg +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/sort-default.svg b/img/source/sort-default.svg deleted file mode 100644 index 850dd2f6..00000000 --- a/img/source/sort-default.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - diff --git a/img/source/sort-down.svg b/img/source/sort-down.svg deleted file mode 100644 index a6b25bd0..00000000 --- a/img/source/sort-down.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/sort-up.svg b/img/source/sort-up.svg deleted file mode 100644 index 890d746b..00000000 --- a/img/source/sort-up.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/star-active.svg b/img/source/star-active.svg deleted file mode 100644 index da6686be..00000000 --- a/img/source/star-active.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/img/source/star-huge-high.svg b/img/source/star-huge-high.svg deleted file mode 100644 index 4dbb5584..00000000 --- a/img/source/star-huge-high.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/img/source/star-huge-low.svg b/img/source/star-huge-low.svg deleted file mode 100644 index 5b2e540d..00000000 --- a/img/source/star-huge-low.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/img/source/star-huge-medium.svg b/img/source/star-huge-medium.svg deleted file mode 100644 index 413230c0..00000000 --- a/img/source/star-huge-medium.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/img/source/star-huge-none.svg b/img/source/star-huge-none.svg deleted file mode 100644 index 0eb4d8b7..00000000 --- a/img/source/star-huge-none.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/img/source/star-huge-none~hover.svg b/img/source/star-huge-none~hover.svg deleted file mode 100644 index 10675f2c..00000000 --- a/img/source/star-huge-none~hover.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/img/source/star-large-high.svg b/img/source/star-large-high.svg deleted file mode 100644 index e611d34f..00000000 --- a/img/source/star-large-high.svg +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/star-large-low.svg b/img/source/star-large-low.svg deleted file mode 100644 index 70e86712..00000000 --- a/img/source/star-large-low.svg +++ /dev/null @@ -1,262 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/img/source/star-large-medium.svg b/img/source/star-large-medium.svg deleted file mode 100644 index 53d57532..00000000 --- a/img/source/star-large-medium.svg +++ /dev/null @@ -1,262 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/img/source/star-large-none.svg b/img/source/star-large-none.svg deleted file mode 100644 index 9950c927..00000000 --- a/img/source/star-large-none.svg +++ /dev/null @@ -1,262 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/img/source/star-large-none~hover.svg b/img/source/star-large-none~hover.svg deleted file mode 100644 index 0719bc68..00000000 --- a/img/source/star-large-none~hover.svg +++ /dev/null @@ -1,262 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/img/source/star-small-high.svg b/img/source/star-small-high.svg deleted file mode 100644 index 5e63b23e..00000000 --- a/img/source/star-small-high.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/star-small-low.svg b/img/source/star-small-low.svg deleted file mode 100644 index e18a874b..00000000 --- a/img/source/star-small-low.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/star-small-medium.svg b/img/source/star-small-medium.svg deleted file mode 100644 index 6dbda0dd..00000000 --- a/img/source/star-small-medium.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/star-small-none.svg b/img/source/star-small-none.svg deleted file mode 100644 index cd300be4..00000000 --- a/img/source/star-small-none.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/star.svg b/img/source/star.svg deleted file mode 100644 index 9adbafe8..00000000 --- a/img/source/star.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/img/source/subtasks-hidden.svg b/img/source/subtasks-hidden.svg deleted file mode 100644 index 892bb61e..00000000 --- a/img/source/subtasks-hidden.svg +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/subtasks-visible.svg b/img/source/subtasks-visible.svg deleted file mode 100644 index 78dc1bc6..00000000 --- a/img/source/subtasks-visible.svg +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/task-active.svg b/img/source/task-active.svg deleted file mode 100644 index 25b3f6c5..00000000 --- a/img/source/task-active.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - diff --git a/img/source/task.svg b/img/source/task.svg deleted file mode 100644 index 850dd2f6..00000000 --- a/img/source/task.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - diff --git a/img/source/toggle.svg b/img/source/toggle.svg deleted file mode 100644 index 66ae253e..00000000 --- a/img/source/toggle.svg +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/trash.svg b/img/source/trash.svg deleted file mode 100644 index 31c50950..00000000 --- a/img/source/trash.svg +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/source/update.svg b/img/source/update.svg deleted file mode 100644 index 7baffd88..00000000 --- a/img/source/update.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/img/sprites.svg b/img/sprites.svg index f875c6e4..5fb8c2e3 100644 --- a/img/sprites.svg +++ b/img/sprites.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/img/src/add.svg b/img/src/add.svg index 9d75da27..f49f3c8f 100644 --- a/img/src/add.svg +++ b/img/src/add.svg @@ -1 +1 @@ - + diff --git a/img/src/all.svg b/img/src/all.svg index be4ae416..28b0bfe3 100644 --- a/img/src/all.svg +++ b/img/src/all.svg @@ -1 +1 @@ - + diff --git a/img/src/alphabetically.svg b/img/src/alphabetically.svg index 688adaf8..fc11466a 100644 --- a/img/src/alphabetically.svg +++ b/img/src/alphabetically.svg @@ -1 +1 @@ - + diff --git a/img/src/calendar-due.svg b/img/src/calendar-due.svg index da21e793..e7ba7ca8 100644 --- a/img/src/calendar-due.svg +++ b/img/src/calendar-due.svg @@ -1 +1 @@ - + diff --git a/img/src/calendar-overdue.svg b/img/src/calendar-overdue.svg index 699f92d4..838854c9 100644 --- a/img/src/calendar-overdue.svg +++ b/img/src/calendar-overdue.svg @@ -1 +1 @@ - + diff --git a/img/src/calendar.svg b/img/src/calendar.svg index a538f46d..84748d91 100644 --- a/img/src/calendar.svg +++ b/img/src/calendar.svg @@ -1 +1 @@ - + diff --git a/img/src/checkmark-color.svg b/img/src/checkmark-color.svg index f580340d..bdf6fd97 100644 --- a/img/src/checkmark-color.svg +++ b/img/src/checkmark-color.svg @@ -1 +1 @@ - + diff --git a/img/src/checkmark.svg b/img/src/checkmark.svg index ef47b6cd..78fd0a78 100644 --- a/img/src/checkmark.svg +++ b/img/src/checkmark.svg @@ -1 +1 @@ - + diff --git a/img/src/clock-due.svg b/img/src/clock-due.svg index d6833a59..9a69c612 100644 --- a/img/src/clock-due.svg +++ b/img/src/clock-due.svg @@ -1 +1 @@ - + diff --git a/img/src/clock-overdue.svg b/img/src/clock-overdue.svg index 9523cafb..a81c59a6 100644 --- a/img/src/clock-overdue.svg +++ b/img/src/clock-overdue.svg @@ -1 +1 @@ - + diff --git a/img/src/clock.svg b/img/src/clock.svg index 93027719..d4bfcc47 100644 --- a/img/src/clock.svg +++ b/img/src/clock.svg @@ -1 +1 @@ - + diff --git a/img/src/close.svg b/img/src/close.svg index 549c1ce7..3cc6aa23 100644 --- a/img/src/close.svg +++ b/img/src/close.svg @@ -1 +1 @@ - + diff --git a/img/src/current.svg b/img/src/current.svg index 4ba064d1..c1da0939 100644 --- a/img/src/current.svg +++ b/img/src/current.svg @@ -1 +1 @@ - + diff --git a/img/src/hide.svg b/img/src/hide.svg index b80439fb..0a5d22b1 100644 --- a/img/src/hide.svg +++ b/img/src/hide.svg @@ -1 +1 @@ - + diff --git a/img/src/image-optimization.sh b/img/src/image-optimization.sh new file mode 100644 index 00000000..cf82e120 --- /dev/null +++ b/img/src/image-optimization.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +function recursive_optimize_images() { +cd $1; +optipng -o6 -strip all *.png; +jpegoptim --strip-all *.jpg; +for svg in `ls *.svg`; +do + mv $svg $svg.opttmp; + scour -i $svg.opttmp -o $svg --create-groups --enable-id-stripping --enable-comment-stripping --shorten-ids --remove-metadata --strip-xml-prolog --no-line-breaks; +done; +rm *.opttmp +for dir in `ls -d */`; +do + recursive_optimize_images $dir; + cd ..; +done; +} + +recursive_optimize_images ../ diff --git a/img/src/manual.svg b/img/src/manual.svg index ca1ccc27..4fb2a835 100644 --- a/img/src/manual.svg +++ b/img/src/manual.svg @@ -1 +1 @@ - + diff --git a/img/src/menu.svg b/img/src/menu.svg index 3e4ea92a..a84f3787 100644 --- a/img/src/menu.svg +++ b/img/src/menu.svg @@ -1 +1 @@ - + diff --git a/img/src/note.svg b/img/src/note.svg index a8ab7162..2ef5580f 100644 --- a/img/src/note.svg +++ b/img/src/note.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/img/src/percent-active.svg b/img/src/percent-active.svg new file mode 100644 index 00000000..e57d8e25 --- /dev/null +++ b/img/src/percent-active.svg @@ -0,0 +1 @@ + diff --git a/img/src/percent.svg b/img/src/percent.svg index db4b2999..703b0497 100644 --- a/img/src/percent.svg +++ b/img/src/percent.svg @@ -1 +1 @@ - + diff --git a/img/src/random.svg b/img/src/random.svg index e5d66c87..99e9d1b7 100644 --- a/img/src/random.svg +++ b/img/src/random.svg @@ -1 +1 @@ - + diff --git a/img/src/settings.svg b/img/src/settings.svg index aa789336..05cef055 100644 --- a/img/src/settings.svg +++ b/img/src/settings.svg @@ -1 +1 @@ - + diff --git a/img/src/sort-down.svg b/img/src/sort-down.svg index 0de5901a..1b9a1a20 100644 --- a/img/src/sort-down.svg +++ b/img/src/sort-down.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/img/src/sort-up.svg b/img/src/sort-up.svg index 4a7f9220..53bc523e 100644 --- a/img/src/sort-up.svg +++ b/img/src/sort-up.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/img/src/star-high.svg b/img/src/star-high.svg deleted file mode 100644 index e4d59ccb..00000000 --- a/img/src/star-high.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/img/src/star-low.svg b/img/src/star-low.svg deleted file mode 100644 index 1d8e3e3a..00000000 --- a/img/src/star-low.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/img/src/star-medium.svg b/img/src/star-medium.svg deleted file mode 100644 index f8cc923c..00000000 --- a/img/src/star-medium.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/img/src/star.svg b/img/src/star.svg deleted file mode 100644 index 29ee739d..00000000 --- a/img/src/star.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/img/src/subtasks-hidden.svg b/img/src/subtasks-hidden.svg index ebbf49ba..0939e327 100644 --- a/img/src/subtasks-hidden.svg +++ b/img/src/subtasks-hidden.svg @@ -1 +1 @@ - + diff --git a/img/src/subtasks-hidden~hover.svg b/img/src/subtasks-hidden~hover.svg new file mode 100644 index 00000000..3a8ed2c5 --- /dev/null +++ b/img/src/subtasks-hidden~hover.svg @@ -0,0 +1 @@ + diff --git a/img/src/subtasks-visible.svg b/img/src/subtasks-visible.svg index 8bb6d149..3a8ed2c5 100644 --- a/img/src/subtasks-visible.svg +++ b/img/src/subtasks-visible.svg @@ -1 +1 @@ - + diff --git a/img/src/tag-active.svg b/img/src/tag-active.svg new file mode 100644 index 00000000..979621f8 --- /dev/null +++ b/img/src/tag-active.svg @@ -0,0 +1 @@ + diff --git a/img/src/tag.svg b/img/src/tag.svg index cf982ed9..cf1d2ced 100644 --- a/img/src/tag.svg +++ b/img/src/tag.svg @@ -1 +1 @@ - + diff --git a/img/src/task-star-high.svg b/img/src/task-star-high.svg new file mode 100644 index 00000000..870ea011 --- /dev/null +++ b/img/src/task-star-high.svg @@ -0,0 +1 @@ + diff --git a/img/src/task-star-low.svg b/img/src/task-star-low.svg new file mode 100644 index 00000000..c89d4eb5 --- /dev/null +++ b/img/src/task-star-low.svg @@ -0,0 +1 @@ + diff --git a/img/src/task-star-medium.svg b/img/src/task-star-medium.svg new file mode 100644 index 00000000..c5cee674 --- /dev/null +++ b/img/src/task-star-medium.svg @@ -0,0 +1 @@ + diff --git a/img/src/task-star.svg b/img/src/task-star.svg new file mode 100644 index 00000000..dfd94ff1 --- /dev/null +++ b/img/src/task-star.svg @@ -0,0 +1 @@ + diff --git a/img/src/toggle.svg b/img/src/toggle.svg index 3a4e76b0..b9200589 100644 --- a/img/src/toggle.svg +++ b/img/src/toggle.svg @@ -1 +1 @@ - + diff --git a/img/src/trash.svg b/img/src/trash.svg index c20929aa..bd55a861 100644 --- a/img/src/trash.svg +++ b/img/src/trash.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/img/tasks.svg b/img/tasks.svg index dd7f8fe3..ac20544b 100644 --- a/img/tasks.svg +++ b/img/tasks.svg @@ -1,14 +1,4 @@ - - - - - - - + + + diff --git a/js/Gruntfile.js b/js/Gruntfile.js index aefa2a04..d19409b9 100644 --- a/js/Gruntfile.js +++ b/js/Gruntfile.js @@ -111,7 +111,8 @@ module.exports = function(grunt) { css: { // Activate the «css» mode bust: false, common: 'icon', - // dimensions: '', + dimensions: '', + prefix: '.icon-%s', sprite: "../img/sprites.svg", render: { css: true // Activate CSS output (with default options) diff --git a/service/collectionsservice.php b/service/collectionsservice.php index 31c362c0..35b9925b 100644 --- a/service/collectionsservice.php +++ b/service/collectionsservice.php @@ -49,27 +49,33 @@ class CollectionsService { array( 'id' => "starred", 'displayname' => (string)$this->l10n->t('Important'), - 'show' => 2), + 'show' => 2, + 'icon' => 'icon-task-star'), array( 'id' => "today", 'displayname' => (string)$this->l10n->t('Today'), - 'show' => 2), + 'show' => 2, + 'icon' => 'icon-calendar'), array( 'id' => "week", 'displayname' => (string)$this->l10n->t('Week'), - 'show' => 2), + 'show' => 2, + 'icon' => 'icon-calendar'), array( 'id' => "all", 'displayname' => (string)$this->l10n->t('All'), - 'show' => 2), + 'show' => 2, + 'icon' => 'icon-all'), array( 'id' => "current", 'displayname' => (string)$this->l10n->t('Current'), - 'show' => 2), + 'show' => 2, + 'icon' => 'icon-current'), array( 'id' => "completed", 'displayname' => (string)$this->l10n->t('Completed'), - 'show' => 2) + 'show' => 2, + 'icon' => 'icon-checkmark') ); foreach ($collections as $key => $collection){ $tmp = $this->settings->getUserValue($this->userId, $this->appName,'show_'.$collection['id']); diff --git a/templates/colorpicker.html b/templates/colorpicker.html index 6f82c77a..ade253f0 100644 --- a/templates/colorpicker.html +++ b/templates/colorpicker.html @@ -6,6 +6,6 @@
  • - +
    • diff --git a/templates/main.php b/templates/main.php index 432b1e68..58395cbc 100644 --- a/templates/main.php +++ b/templates/main.php @@ -26,8 +26,8 @@ dnd-drop="dropCollection(event, index, item)" dnd-dragover="dragoverCollection(event, index)"> - - + + {{ collection.displayname }} @@ -99,7 +99,7 @@
  • - + t('Add List...')); ?>
    diff --git a/templates/part.details.php b/templates/part.details.php index 03359233..9637778b 100644 --- a/templates/part.details.php +++ b/templates/part.details.php @@ -1,10 +1,10 @@
    - + - +
    - +
    {{ task.start | startDetails }}
    - + - +
    @@ -34,21 +34,21 @@
    - +
    {{ task.due | dateDetails }}
    - + - +
    - + - +
    @@ -77,28 +77,28 @@
    -->
    - +
    {{ task.priority | priorityDetails}}
    - + - +
    - +
    {{ task.complete | percentDetails}}
    - + - +
    @@ -106,7 +106,7 @@
    - + @@ -141,7 +141,7 @@
  • - + {{ comment.name }}
    @@ -156,10 +156,10 @@ --> - + - + diff --git a/templates/part.taskbody.php b/templates/part.taskbody.php index bbd22d2a..5cf5a8e7 100644 --- a/templates/part.taskbody.php +++ b/templates/part.taskbody.php @@ -8,25 +8,24 @@ - + - + - + - + - + - + {{ task.due | dateTaskList }} {{ task.calendar.displayname }}