From c94d7f712a3e77c6faa7933a93a245b187d4978b Mon Sep 17 00:00:00 2001 From: elhombretecla Date: Mon, 19 Oct 2020 14:22:28 +0200 Subject: [PATCH] WIP ui changes --- .../resources/styles/main/partials/color-palette.scss | 4 ++-- frontend/resources/styles/main/partials/left-toolbar.scss | 8 ++++---- .../styles/main/partials/sidebar-element-options.scss | 2 +- frontend/resources/styles/main/partials/sidebar.scss | 6 +++--- .../resources/styles/main/partials/workspace-header.scss | 4 ++-- frontend/resources/templates/index.mustache | 1 - 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/frontend/resources/styles/main/partials/color-palette.scss b/frontend/resources/styles/main/partials/color-palette.scss index 7bd2ab47f..6bff34acb 100644 --- a/frontend/resources/styles/main/partials/color-palette.scss +++ b/frontend/resources/styles/main/partials/color-palette.scss @@ -51,8 +51,8 @@ } &.left-sidebar-open { - left: 280px; - width: calc(100% - 280px); + left: 303px; + width: calc(100% - 303px); } & .context-menu-items { diff --git a/frontend/resources/styles/main/partials/left-toolbar.scss b/frontend/resources/styles/main/partials/left-toolbar.scss index b3666a223..1fab2b9b3 100644 --- a/frontend/resources/styles/main/partials/left-toolbar.scss +++ b/frontend/resources/styles/main/partials/left-toolbar.scss @@ -5,7 +5,7 @@ // Copyright (c) 2015-2020 Andrey Antukh // Copyright (c) 2015-2020 Juan de la Cruz -$width-left-toolbar: 40px; +$width-left-toolbar: 48px; .left-toolbar { background-color: $color-gray-50; @@ -23,7 +23,7 @@ $width-left-toolbar: 40px; display: flex; flex-direction: column; overflow: visible; - padding-top: 40px; + padding-top: 48px; height: 100%; } @@ -40,11 +40,11 @@ $width-left-toolbar: 40px; cursor: pointer; display: flex; flex-shrink: 0; - height: 40px; + height: 48px; justify-content: center; margin: $x-small 0; position: relative; - width: 40px; + width: 48px; svg { fill: $color-gray-20; diff --git a/frontend/resources/styles/main/partials/sidebar-element-options.scss b/frontend/resources/styles/main/partials/sidebar-element-options.scss index f1aa92e27..d61f0daac 100644 --- a/frontend/resources/styles/main/partials/sidebar-element-options.scss +++ b/frontend/resources/styles/main/partials/sidebar-element-options.scss @@ -918,7 +918,7 @@ .size-option .custom-select-dropdown { position: fixed; - max-height: 15rem; + max-height: 16rem; min-width: 6rem; margin-top: 25px; left: initial; diff --git a/frontend/resources/styles/main/partials/sidebar.scss b/frontend/resources/styles/main/partials/sidebar.scss index 8d3b0cde9..5f109810c 100644 --- a/frontend/resources/styles/main/partials/sidebar.scss +++ b/frontend/resources/styles/main/partials/sidebar.scss @@ -5,7 +5,7 @@ // Copyright (c) 2015-2020 Andrey Antukh // Copyright (c) 2015-2020 Juan de la Cruz -$width-settings-bar: 15rem; +$width-settings-bar: 16rem; // This width is also used in update-viewport-size at frontend/src/app/main/data/workspace.cljs .settings-bar { @@ -22,7 +22,7 @@ $width-settings-bar: 15rem; &.settings-bar-left { border-left: none; border-right: 1px solid $color-gray-60; - left: 40px; + left: 48px; } .settings-bar-inside { @@ -60,7 +60,7 @@ $width-settings-bar: 15rem; flex-direction: column; - padding-top: 40px; + padding-top: 48px; height: 100%; .tool-window { diff --git a/frontend/resources/styles/main/partials/workspace-header.scss b/frontend/resources/styles/main/partials/workspace-header.scss index b80b52f80..abab66234 100644 --- a/frontend/resources/styles/main/partials/workspace-header.scss +++ b/frontend/resources/styles/main/partials/workspace-header.scss @@ -12,7 +12,7 @@ background-color: $color-gray-50; border-bottom: 1px solid $color-gray-60; display: flex; - height: 40px; + height: 48px; padding: $x-small $medium $x-small 55px; position: relative; z-index: 12; @@ -28,7 +28,7 @@ left: 0; position: absolute; top: 0; - width: 40px; + width: 48px; a { height: 30px; diff --git a/frontend/resources/templates/index.mustache b/frontend/resources/templates/index.mustache index fac36c698..ec4ef388f 100644 --- a/frontend/resources/templates/index.mustache +++ b/frontend/resources/templates/index.mustache @@ -7,7 +7,6 @@ - {{! }}