From 3037effb5a9d438fa15a355f44675e3549d430c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 18 Oct 2017 15:57:15 +0200 Subject: [PATCH] Card: Fix styling issue when only duedate is set MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- css/style.scss | 68 ++++++++++++++++++++++++---------------------- templates/main.php | 2 +- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/css/style.scss b/css/style.scss index 5a8f1f4a1..bfe6feecc 100644 --- a/css/style.scss +++ b/css/style.scss @@ -364,6 +364,7 @@ input.input-inline { background: $color-lightgrey; display: flex; position: relative; + padding-left: 10px; .card-options { justify-content: flex-end; @@ -375,6 +376,40 @@ input.input-inline { .icon-filetype-text { margin: 10px; + margin-left: 0px; + } + + .due { + border-radius: 3px; + margin: 6px 4px 6px 0px; + padding: 0 4px; + font-size: 90%; + opacity: 0.5; + display: flex; + align-items: center; + + .icon { + background-size: contain; + } + + &.overdue { + background-color: $color-error; + color: $color-primary-text; + + .icon-badge { + background-image: url('../img/calendar-white.svg'); + } + } + &.now { + background-color: $color-warning; + } + &.next { + background-color: $color-warning-light; + } + + span { + margin-left: 3px; + } } button { @@ -498,39 +533,6 @@ input.input-inline { } } -.due { - border-radius: 3px; - margin: 6px 4px 6px -4px; - padding: 0 4px; - font-size: 90%; - opacity: 0.5; - display: flex; - align-items: center; - - .icon { - background-size: contain; - } - - &.overdue { - background-color: $color-error; - color: $color-primary-text; - - .icon-badge { - background-image: url('../img/calendar-white.svg'); - } - } - &.now { - background-color: $color-warning; - } - &.next { - background-color: $color-warning-light; - } - - span { - margin-left: 3px; - } -} - /** * App sidebar */ diff --git a/templates/main.php b/templates/main.php index d1e7426ad..620e31c4c 100644 --- a/templates/main.php +++ b/templates/main.php @@ -47,7 +47,7 @@ if(!\OC::$server->getConfig()->getSystemValue('debug', false)) { 'app' => ['App', 'Config', 'Run'], 'controller' => ['AppController', 'BoardController', 'CardController', 'ListController'], 'directive' => ['appnavigationentryutils', 'appPopoverMenuUtils', 'autofocusoninsert', 'avatar', 'elastic', 'search', 'datepicker', 'timepicker'], - 'filters' => ['boardFilterAcl', 'cardFilter', 'cardSearchFilter', 'iconWhiteFilter', 'lightenColorFilter', 'orderObjectBy', 'dateFilters', 'textColorFilter'], + 'filters' => ['boardFilterAcl', 'cardFilter', 'cardSearchFilter', 'iconWhiteFilter', 'lightenColorFilter', 'orderObjectBy', 'dateFilters', 'textColorFilter', 'withoutAssignedUsers'], 'service' => ['ApiService', 'BoardService', 'CardService', 'LabelService', 'StackService', 'StatusService'], ]; foreach($js as $folder=>$files) {