From 7489fd0aaf642aa8c37bfed9aff2761d319b8a56 Mon Sep 17 00:00:00 2001 From: Jiiks Date: Tue, 26 Feb 2019 20:30:07 +0200 Subject: [PATCH] Titlebar buttons fix --- .gitignore | 1 + editor/src/styles/titlebar.scss | 9 +++++++-- editor/src/styles/vars.scss | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b7f2ac85..0a886e03 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ user.config.json /.vs /npm-debug.log /tests/ext/extensions +/tests/userdata diff --git a/editor/src/styles/titlebar.scss b/editor/src/styles/titlebar.scss index b837087a..c1bbaa6d 100644 --- a/editor/src/styles/titlebar.scss +++ b/editor/src/styles/titlebar.scss @@ -28,12 +28,17 @@ font-size: 15px; } + .flex-spacer { + flex-grow: 1; + } + .controls { margin: 0 0 0 2px; font-size: 0; button { -webkit-app-region: no-drag; + outline: none !important; border-radius: 3px; width: 25px; font-size: 12px; @@ -50,12 +55,12 @@ margin: 0 0 0 4px; &:hover { - background: #44474e; + background: $bdGreen; color: #FFF; } &.active { - background: #3a71c1; + background: $bdGreen; } } } diff --git a/editor/src/styles/vars.scss b/editor/src/styles/vars.scss index 202ab708..b08506d0 100644 --- a/editor/src/styles/vars.scss +++ b/editor/src/styles/vars.scss @@ -1,2 +1,3 @@ $logoSmallGw: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkltYWdlIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDUxMiA1MTIiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDUxMiA1MTI7IiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGUgdHlwZT0idGV4dC9jc3MiPi5zdDB7ZGlzcGxheTpub25lO30uc3Qxe2Rpc3BsYXk6aW5saW5lO2ZpbGw6IzAyMDAzNTtzdHJva2U6IzAwMDAwMDtzdHJva2UtbWl0ZXJsaW1pdDoxMDt9LnN0MntmaWxsOiMzRUNDOUU7fS5zdDN7ZmlsbDojRkZGRkZGO308L3N0eWxlPjxnIGlkPSJMYXllcl8yIiBjbGFzcz0ic3QwIj48cmVjdCB4PSItNjQiIHk9Ii0zMiIgY2xhc3M9InN0MSIgd2lkdGg9IjYxOCIgaGVpZ2h0PSI1NzIiLz48L2c+PGcgaWQ9IkxheWVyXzEiIHhtbG5zOnZlY3Rvcm5hdG9yPSJodHRwOi8vdmVjdG9ybmF0b3IuaW8iPjxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik03MCwxOC44Yy0xMy43LDAtMjcuMywxMy43LTI3LjMsMjcuM3YyMzMuNkM0Mi43LDM5Ny43LDEzNy45LDQ5MywyNTYsNDkzYzI5LjcsMCw1OC02LjEsODMuNi0xN1YzNDEuNWMtMTksMjUuNi00OS4zLDQyLjItODMuNiw0Mi4yYy01Ny42LDAtMTA0LjEtNDYuNS0xMDQuMS0xMDQuMVY0Ni4xYzAtMTMuNy0xMy43LTI3LjMtMjcuMy0yNy4zSDcweiIvPjxwYXRoIGNsYXNzPSJzdDMiIGQ9Ik0zODcuNCwxOC44Yy0xMy43LDAtMjcuMywxMy43LTI3LjMsMjcuM3Y0Ny4zQzMyOS4zLDc2LjIsMjkzLjksNjYuMywyNTYsNjYuM2MtMjkuOCwwLTU3LjksNi4zLTgzLjYsMTcuM3YxMzQuMmMxOS0yNS42LDQ5LjMtNDIuMiw4My42LTQyLjJjNTcuNiwwLDEwNC4xLDQ2LjUsMTA0LjEsMTA0LjF2MTg2LjJjNjUuMi0zNi40LDEwOS4yLTEwNiwxMDkuMi0xODYuMlY0Ni4xYzAtMTguOC0xMy43LTI3LjMtMjcuMy0yNy4zSDM4Ny40eiIvPjwvZz48L3N2Zz4=); $bdicon: $logoSmallGw; +$bdGreen: #3ecc9c;