From c6ebfdc11f84367212391231aaeb2da7c6deb9d6 Mon Sep 17 00:00:00 2001 From: Artem Anufrij Date: Mon, 22 May 2017 00:27:34 +0200 Subject: [PATCH 01/13] header bar and mobile device improvements Signed-off-by: Artem Anufrij --- css/style.css | 65 ++++++++++++++++--------------- templates/part.board.mainView.php | 57 ++++++++++++++------------- 2 files changed, 64 insertions(+), 58 deletions(-) diff --git a/css/style.css b/css/style.css index 0638d2dd3..869219954 100644 --- a/css/style.css +++ b/css/style.css @@ -126,21 +126,26 @@ button:hover { position: relative; z-index: 120; height: 44px; + display: flex; + align-items: center; } #board-header > * { font-size: 14pt; - padding: 7px; - margin: 7px; - float: left; } -#board-header > a { - background: url('/core/img/breadcrumb.svg?v=1'); - background-repeat: no-repeat; - background-position: right center; - background-size: auto 24px; - padding-right: 24px; +#board-header > h1 { + white-space: nowrap; +} + +#board-header #home { + position: relative; + padding: 0px 12px; +} + +#board-header #home a{ + position: relative; + padding: 0px; } #board-actions { @@ -161,6 +166,18 @@ button:hover { cursor: pointer; } +#board-header-controls { + display: flex; + align-items: center; + position: relative; +} + +#board-header-controls .board-action-button, +#board-header-controls .board-action-button * { + display: flex; + align-items: center; +} + .filter-select { position: absolute; right: auto; @@ -192,22 +209,19 @@ button:hover { background-color: transparent; } -#board-header > .board-action-button { - float: right; -} - #stack-add { background-color: rgba(240,240,240,.9); border-radius: 3px; - padding: 0; + margin-right: 12px; +} + +#stack-add > form { + display: flex; } #stack-add input { - padding: 7px; - margin: 0px; + padding: 4px 5px; border: 0px none transparent; - display: table-cell; - vertical-align: middle; min-height: initial; background-color: rgba(240,240,240,.9); } @@ -224,11 +238,6 @@ button:hover { box-shadow:none; } -#stack-add button { - display: table-cell; - vertical-align: middle; -} - .stack { width: 320px; margin-right: 10px; @@ -321,7 +330,7 @@ button:hover { opacity: 1; } -.card .card-controls .space { +.space { width: 100%; min-height: 16px; } @@ -845,17 +854,11 @@ button:hover { @media (max-width: 480px) { /* hide board actions on mobile */ - #board-actions { + #board-header-controls { display: none !important; } } -@media only screen and (max-width: 768px) { - #board-header h1 { - margin-left: 50px; - } -} - /** * Markdown rendering */ diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php index 0cbaeea19..bc661d2b3 100644 --- a/templates/part.board.mainView.php +++ b/templates/part.board.mainView.php @@ -5,36 +5,39 @@

{{ statusservice.text }}

- - - +
+ + Home + +

{{ boardservice.getCurrent().title }}

-
- - - -
-
- - - -
-
- - - -
-
-
- - -
+
+
+
+
+ + +
+
+
+ +
+
+ + + +
+
+ + + +
From 0b12271ee3f39e8597114f3ffe09cb2de374e31d Mon Sep 17 00:00:00 2001 From: Artem Anufrij Date: Mon, 22 May 2017 17:17:17 +0200 Subject: [PATCH 02/13] fixed pixelipo comments --- css/style.css | 8 +++----- templates/part.board.mainView.php | 1 - 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/css/style.css b/css/style.css index 869219954..406f5f9fe 100644 --- a/css/style.css +++ b/css/style.css @@ -128,9 +128,6 @@ button:hover { height: 44px; display: flex; align-items: center; -} - -#board-header > * { font-size: 14pt; } @@ -170,6 +167,7 @@ button:hover { display: flex; align-items: center; position: relative; + margin-left: auto; } #board-header-controls .board-action-button, @@ -330,8 +328,8 @@ button:hover { opacity: 1; } -.space { - width: 100%; +.app-popover-menu-utils { + margin-left: auto; min-height: 16px; } diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php index bc661d2b3..080c7a6ec 100644 --- a/templates/part.board.mainView.php +++ b/templates/part.board.mainView.php @@ -13,7 +13,6 @@

{{ boardservice.getCurrent().title }}

-
From d2b44c2ad0f049610c9ce716fba09e4653011d0b Mon Sep 17 00:00:00 2001 From: Artem Anufrij Date: Mon, 22 May 2017 18:53:51 +0200 Subject: [PATCH 03/13] added .icon-more button Signed-off-by: Artem Anufrij --- css/style.css | 29 ++++++++++++++++------ templates/part.board.mainView.php | 41 ++++++++++++++++++++++++++----- 2 files changed, 57 insertions(+), 13 deletions(-) diff --git a/css/style.css b/css/style.css index 406f5f9fe..fe6539ca2 100644 --- a/css/style.css +++ b/css/style.css @@ -140,11 +140,6 @@ button:hover { padding: 0px 12px; } -#board-header #home a{ - position: relative; - padding: 0px; -} - #board-actions { font-size: 10pt; float: right; @@ -176,6 +171,22 @@ button:hover { align-items: center; } +#board-header-controls-menu { + display: none; + padding: 5px 6px 5px 7px; +} + +#board-header-controls-menu #popover-controls { + display: flex; + align-items: center; + padding-left: 3px; +} + +#board-header-controls-menu .popovermenu{ + margin-top: 35px; + margin-right: 6px; +} + .filter-select { position: absolute; right: auto; @@ -333,7 +344,7 @@ button:hover { min-height: 16px; } -.card .popovermenu { +.popovermenu { z-index: 999; opacity: 1; margin-top: 25px; @@ -341,7 +352,7 @@ button:hover { display: block; } -.card .popovermenu.hidden { +.popovermenu.hidden { display: none; } @@ -855,6 +866,10 @@ button:hover { #board-header-controls { display: none !important; } + + #board-header-controls-menu { + display: flex; + } } /** diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php index 080c7a6ec..546b81c01 100644 --- a/templates/part.board.mainView.php +++ b/templates/part.board.mainView.php @@ -5,11 +5,9 @@

{{ statusservice.text }}

-
- - Home - -
+ + Home +

{{ boardservice.getCurrent().title }}

@@ -38,6 +36,38 @@
+
+ + +
@@ -87,7 +117,6 @@
-
- - Home - +
+ + Home + +

{{ boardservice.getCurrent().title }}

From 543127c1e656ed011b09628e355826125e7acf38 Mon Sep 17 00:00:00 2001 From: Artem Anufrij Date: Mon, 22 May 2017 19:41:53 +0200 Subject: [PATCH 06/13] 'add new stack' margin Signed-off-by: Artem Anufrij --- css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/style.css b/css/style.css index c0af9ee9b..28142a820 100644 --- a/css/style.css +++ b/css/style.css @@ -221,7 +221,7 @@ button:hover { #stack-add { background-color: rgba(240,240,240,.9); border-radius: 3px; - margin-right: 12px; + margin-right: 3px; } #stack-add > form { From 4ec59d24b469f7803b3828a36522d77e966d5bb5 Mon Sep 17 00:00:00 2001 From: Artem Anufrij Date: Mon, 22 May 2017 20:03:47 +0200 Subject: [PATCH 07/13] small css improvement Signed-off-by: Artem Anufrij --- css/style.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/css/style.css b/css/style.css index 28142a820..24ab07a8b 100644 --- a/css/style.css +++ b/css/style.css @@ -339,6 +339,11 @@ button:hover { opacity: 1; } +.card .card-controls button { + padding: 0px; + margin-right: 0px; +} + .app-popover-menu-utils { margin-left: auto; min-height: 16px; From 4802f34c04492b3fe8b70c9337c4b8ceb9102b3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 23 May 2017 20:08:22 +0200 Subject: [PATCH 08/13] Fix home icon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- templates/part.board.mainView.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php index 964b4a18d..428751931 100644 --- a/templates/part.board.mainView.php +++ b/templates/part.board.mainView.php @@ -5,9 +5,10 @@

{{ statusservice.text }}

-
+
- Home + + t('All Boards')); ?>

From 2fd06acca8e1ed4e1af5a22cbae505f427f96d22 Mon Sep 17 00:00:00 2001 From: Marin Treselj Date: Tue, 23 May 2017 20:39:54 +0200 Subject: [PATCH 09/13] Home icon without div wrapper Signed-off-by: Marin Treselj --- css/style.css | 9 +++++++++ templates/part.board.mainView.php | 12 +++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/css/style.css b/css/style.css index 24ab07a8b..306d67e5e 100644 --- a/css/style.css +++ b/css/style.css @@ -131,8 +131,17 @@ button:hover { font-size: 14pt; } +#board-header .crumb { + background-image: url(/core/img/breadcrumb.svg?v=1); + background-size: auto 24px; + background-position: right center; + background-repeat: no-repeat; + padding: 7px 14px; +} + #board-header > h1 { white-space: nowrap; + padding: 7px; } #board-header #home { diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php index 428751931..0ef8130b3 100644 --- a/templates/part.board.mainView.php +++ b/templates/part.board.mainView.php @@ -5,12 +5,10 @@

{{ statusservice.text }}

-
- - - t('All Boards')); ?> - -
+ + + t('All Boards')); ?> +

{{ boardservice.getCurrent().title }}

@@ -114,7 +112,7 @@
- +
From ca3b89569fb05f8833f5303e66dcc18e7016125f Mon Sep 17 00:00:00 2001 From: Artem Anufrij Date: Tue, 23 May 2017 22:05:13 +0200 Subject: [PATCH 10/13] fixed icons if using subfolders for nc instance Signed-off-by: Artem Anufrij --- css/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/style.css b/css/style.css index 306d67e5e..5baa4c972 100644 --- a/css/style.css +++ b/css/style.css @@ -132,7 +132,7 @@ button:hover { } #board-header .crumb { - background-image: url(/core/img/breadcrumb.svg?v=1); + background-image: url('../../../core/img/breadcrumb.svg?v=1'); background-size: auto 24px; background-position: right center; background-repeat: no-repeat; @@ -984,7 +984,7 @@ button:hover { } .icon-home { - background-image: url('/core/img/places/home.svg'); + background-image: url('../../../core/img/places/home.svg'); } /** From ec6c8d94c1ca5cb4d70cf626aef41aa37dee0087 Mon Sep 17 00:00:00 2001 From: Artem Anufrij Date: Tue, 23 May 2017 22:16:23 +0200 Subject: [PATCH 11/13] removed class from button Signed-off-by: Artem Anufrij --- templates/part.board.mainView.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php index 0ef8130b3..16998f736 100644 --- a/templates/part.board.mainView.php +++ b/templates/part.board.mainView.php @@ -38,7 +38,7 @@
- +