From d3c324cc9bd7e1a897f1de0104536132c649b458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Fri, 8 Dec 2017 07:38:53 +0100 Subject: [PATCH 1/3] Fixed popover menu in entry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/css/apps.scss | 65 ++++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/core/css/apps.scss b/core/css/apps.scss index 54f0c47688580..6ff24c4b2e0ff 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -921,31 +921,6 @@ kbd { flex-direction: column; transition: transform 250ms ease-in-out; - /* Icon fixes */ - [class^='icon-'], - [class*=' icon-'] { - order: 4; - width: 24px; - height: 24px; - margin: -10px; - padding: 22px; - opacity: .3; - &:hover, &:focus { - opacity: .7; - } - &[class^='icon-star'], - &[class*=' icon-star'] { - opacity: .7; - &:hover, &:focus { - opacity: 1 ; - } - - } - &.icon-starred { - opacity: 1 ; - } - } - /* Default item */ .app-content-list-item { position: relative; @@ -957,6 +932,35 @@ kbd { flex-wrap: wrap; align-items: center; + /* Icon fixes */ + &, + > .app-content-list-item-menu { + > [class^='icon-'], + > [class*=' icon-'] { + order: 4; + width: 24px; + height: 24px; + margin: -10px; + padding: 22px; + opacity: .3; + cursor: pointer; + &:hover, &:focus { + opacity: .7; + } + &[class^='icon-star'], + &[class*=' icon-star'] { + opacity: .7; + &:hover, &:focus { + opacity: 1 ; + } + + } + &.icon-starred { + opacity: 1 ; + } + } + } + &:hover, &:focus, &.active { background-color: nc-darken($color-main-background, 6%); @@ -1011,6 +1015,7 @@ kbd { text-transform: capitalize; object-fit: cover; user-select: none; + cursor: pointer; } .app-content-list-item-line-one, @@ -1023,6 +1028,7 @@ kbd { order: 1; flex: 1 1 0; padding-right: 10px; + cursor: pointer; } .app-content-list-item-line-two { @@ -1041,6 +1047,15 @@ kbd { font-size: 80%; user-select: none; } + + .app-content-list-item-menu { + order: 4; + position: relative; + .popovermenu { + margin: 0; + right: -5px; + } + } } } /* App content */ From a1b48697740c199aa0b1f1b73740a86a101c3178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Fri, 8 Dec 2017 18:08:56 +0100 Subject: [PATCH 2/3] Fixed scrolling in app list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/css/apps.scss | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/core/css/apps.scss b/core/css/apps.scss index 6ff24c4b2e0ff..a2013d984446f 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -910,12 +910,20 @@ kbd { #app-content-wrapper { display: flex; + position: relative; + align-items: start; + height: 100%; + width: 100%; + .app-content-list, + .app-content-detail { + min-height: 100%; + max-height: 100%; + overflow-x: hidden; + overflow-y: auto; + } } .app-content-list { width: 300px; - min-height: 100%; - overflow-x: hidden; - overflow-y: auto; border-right: 1px solid nc-darken($color-main-background, 8%); display: flex; flex-direction: column; @@ -931,6 +939,7 @@ kbd { display: flex; flex-wrap: wrap; align-items: center; + flex: 0 0 auto; /* Icon fixes */ &, From bb04e106514f51c056f030ceef2c34cff355ef4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Mon, 11 Dec 2017 18:22:21 +0100 Subject: [PATCH 3/3] Fixed width on app details MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/css/apps.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/css/apps.scss b/core/css/apps.scss index a2013d984446f..e6ead27e12b22 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -1069,7 +1069,8 @@ kbd { } /* App content */ .app-content-detail { - width: 70%; + /* grow full width */ + flex-grow: 1; #app-navigation-toggle-back { display: none;