From 17431f45bb0a1528d1465f8a413fc41a9bd48a00 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 30 Jul 2020 10:47:44 +0530 Subject: [PATCH 1/4] fix: Dropdown hover color --- frappe/public/scss/variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/scss/variables.scss b/frappe/public/scss/variables.scss index 5d0b98d08a..16858a4f93 100644 --- a/frappe/public/scss/variables.scss +++ b/frappe/public/scss/variables.scss @@ -223,7 +223,7 @@ $modal-content-bg: var(--modal-bg); $dropdown-bg: var(--fg-color); $dropdown-border-color: var(--dark-border-color); $dropdown-link-color: var(--text-color); -$dropdown-link-hover-color: var(--text-color); +$dropdown-link-hover-color: var(--text-light); $dropdown-link-hover-bg: var(--fg-hover-color); $dropdown-link-disabled-color: var(--gray-600); $dropdown-header-color: var(--gray-600); From a94ff6b3240406bc0455e468c150a009ec20a0bb Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 30 Jul 2020 11:32:56 +0530 Subject: [PATCH 2/4] fix: Sidebar share section style --- frappe/public/scss/sidebar.scss | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/frappe/public/scss/sidebar.scss b/frappe/public/scss/sidebar.scss index ff37779aae..94287a4d4c 100644 --- a/frappe/public/scss/sidebar.scss +++ b/frappe/public/scss/sidebar.scss @@ -105,27 +105,27 @@ body[data-route^="Module"] .main-menu { } } - a.close { position: absolute; right: 5px; } - .form-shared, .form-viewers { + display: inline-flex; .share-doc-btn { cursor: pointer; } + .avatar-group, .share-doc-btn { + margin-bottom: var(--margin-sm); + margin-right: var(--margin-xs); + } + .octicon { position: relative; left: 4.5px; } - .avatar { - margin-top: 5px; - } - .shared-with-everyone { border-style: solid; border-color: $control-bg; @@ -176,7 +176,6 @@ body[data-route^="Module"] .main-menu { display: block; } } - .sidebar-image-actions { display: none; position: absolute; @@ -196,7 +195,6 @@ body[data-route^="Module"] .main-menu { &:focus, &:active { background-color: $control-bg; - .octicon-plus { color: $text-color !important; } @@ -211,7 +209,6 @@ body[data-route^="Module"] .main-menu { } .layout-side-section { - .overlay-sidebar { @media (max-width: 991px) { margin-top: 0 !important; @@ -458,6 +455,7 @@ body[data-route^="Module"] .main-menu { background: var(--gray-50); text-align: center; padding: 3px; + display: inline-block; margin-bottom: var(--margin-sm); } @@ -498,7 +496,7 @@ body[data-route^="Module"] .main-menu { } } -// Remove top margin from frist child +// Remove top margin from first child .sidebar-item:first-child a { margin-top: 0rem; } From 33c99864829178541d2b6d5844a415df7246bdc1 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 30 Jul 2020 11:33:38 +0530 Subject: [PATCH 3/4] fix: Avatar group style --- frappe/public/scss/avatar.scss | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/frappe/public/scss/avatar.scss b/frappe/public/scss/avatar.scss index 8544891787..4262138365 100644 --- a/frappe/public/scss/avatar.scss +++ b/frappe/public/scss/avatar.scss @@ -6,7 +6,7 @@ .avatar-frame { display: inline-block; width: 100%; - padding: 50%; + height: 100%; // TODO: Remove // background-color: var(--pink-200); background-size: cover; @@ -90,7 +90,7 @@ } .avatar-group { - display: flex; + display: inline-flex; align-items: center; flex-direction: row-reverse; &.right { @@ -101,12 +101,9 @@ } .avatar { - position: relative; - .avatar-frame { border: 1px solid $white; } - &:hover { z-index: 1; } @@ -118,7 +115,7 @@ background-color: var(--blue-500); } - .avatar+.avatar { + .avatar + .avatar { margin-right: -0.3rem; } } \ No newline at end of file From 9c0696ba002f04f5e42e88609d8c659e28d8c1b5 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 30 Jul 2020 11:49:42 +0530 Subject: [PATCH 4/4] fix: Sidebar style --- frappe/public/scss/sidebar.scss | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/frappe/public/scss/sidebar.scss b/frappe/public/scss/sidebar.scss index 94287a4d4c..51265a6159 100644 --- a/frappe/public/scss/sidebar.scss +++ b/frappe/public/scss/sidebar.scss @@ -116,11 +116,6 @@ body[data-route^="Module"] .main-menu { cursor: pointer; } - .avatar-group, .share-doc-btn { - margin-bottom: var(--margin-sm); - margin-right: var(--margin-xs); - } - .octicon { position: relative; left: 4.5px; @@ -431,8 +426,6 @@ body[data-route^="Module"] .main-menu { justify-content: center; font-size: var(--text-xs); align-items: center; - margin-bottom: var(--margin-xs); - margin-right: var(--margin-xs); &.appreciation { background-color: var(--dark-green-100); color: var(--dark-green-600); @@ -451,12 +444,18 @@ body[data-route^="Module"] .main-menu { height: 28px; width: 28px; border-radius: var(--border-radius); - border: 1px dashed var(--gray-300); + border: 1px dashed var(--dark-border-color); background: var(--gray-50); text-align: center; - padding: 3px; - display: inline-block; + display: inline-flex; + align-items: center; + justify-content: center; + background-color: var(--fg-color); +} + +.form-shared .avatar-group, .add-review-btn, .share-doc-btn, .review { margin-bottom: var(--margin-sm); + margin-right: var(--margin-sm); } .review-popover {