From 404499bec962d98909522e92d62063c51e0f0a77 Mon Sep 17 00:00:00 2001 From: Monochromish Date: Tue, 5 Jul 2022 19:59:52 +1000 Subject: [PATCH 1/3] Fix cider team buttons in about page --- src/renderer/less/pages.less | 2 +- src/renderer/style.css | 23 ++++++++++++++++------- src/renderer/style.less | 2 +- src/renderer/views/pages/about.ejs | 15 +++++++++------ 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less index 9ab7040c..9fa973eb 100644 --- a/src/renderer/less/pages.less +++ b/src/renderer/less/pages.less @@ -1300,7 +1300,7 @@ display: flex; justify-content: center; align-items: center; - padding-left: 100px; + margin-left: 100px; } .animated { diff --git a/src/renderer/style.css b/src/renderer/style.css index 1fb89c50..5a563fb4 100644 --- a/src/renderer/style.css +++ b/src/renderer/style.css @@ -4360,7 +4360,7 @@ input[type=range].md-slider::-webkit-slider-runnable-track { } .list-group-item-dark { color: var(--textColor); - background-color: #3333338a; + background-color: #333; } .list-group-item-dark.list-group-item-action:hover, .list-group-item-dark.list-group-item-action:focus { @@ -13008,12 +13008,12 @@ input[type=checkbox][switch]:checked:active::before { margin: 0px; } .github-themes-page .repos-list { - height: 85%; + height: 100%; width: 320px; font-size: 14px; - position: absolute; overflow: overlay; padding-bottom: 16px; + flex: 0 0 auto; } .github-themes-page .repos-list > .list-group { margin: 0px; @@ -13028,12 +13028,10 @@ input[type=checkbox][switch]:checked:active::before { filter: brightness(0.8); } .github-themes-page .github-preview { - height: 85%; + height: 100%; flex: 1; padding: 16px 32px; overflow: auto; - position: fixed; - margin-left: 320px; padding-bottom: 16px; } .github-themes-page .gh-content { @@ -13044,6 +13042,10 @@ input[type=checkbox][switch]:checked:active::before { } .github-themes-page .gh-header { padding: 16px; + height: 64px; + display: grid; + align-content: center; + flex: 0 0 auto; } .github-themes-page .gh-header .header-text { position: initial !important; @@ -14723,6 +14725,10 @@ input[type=checkbox][switch]:checked:active::before { display: flex; gap: 10px; align-items: center; + height: 35px; +} +.settings-panel .settings-window .nav-pills .nav-link :nth-child(2) { + white-space: nowrap; } .settings-panel .settings-window .md-option-header { padding: 0px 26px; @@ -14828,8 +14834,11 @@ input[type=checkbox][switch]:checked:active::before { .settings-panel .settings-window.no-sidebar .tab-content { padding-top: 0px; } +.settings-panel .settings-window.no-sidebar .tabs .nav-pills .nav-link { + width: 50px; +} .settings-panel .settings-window.no-sidebar .tabs .nav-pills .nav-link :nth-child(2) { - display: none; + opacity: 0; } .settings-panel .settings-window.no-sidebar .tabs > .col-auto { width: 80px; diff --git a/src/renderer/style.less b/src/renderer/style.less index 77a68590..913e9991 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -1895,7 +1895,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { display: flex; justify-content: center; align-items: center; - padding-left: 100px; + margin-left: 100px; } .about-page { diff --git a/src/renderer/views/pages/about.ejs b/src/renderer/views/pages/about.ejs index 41f8c86b..e8f925ff 100644 --- a/src/renderer/views/pages/about.ejs +++ b/src/renderer/views/pages/about.ejs @@ -25,14 +25,14 @@

{{$root.getLz('term.ciderTeam')}}

-
+
-
+
{{ member.name }}
-
@@ -103,7 +103,8 @@ name: 'crypticplank', link: 'https://github.com/crypticplank', role: app.getLz('term.developer'), - avatar: 'https://avatars.githubusercontent.com/u/52553007?v=4' + avatar: 'https://avatars.githubusercontent.com/u/52553007?v=4', + twitter: 'https://twitter.com/crypticplank' }, { name: 'Maikiwi', @@ -116,13 +117,15 @@ name: 'yazninja', link: 'https://github.com/yazninja', role: app.getLz('term.developer'), - avatar: 'https://avatars.githubusercontent.com/u/71800112?v=4' + avatar: 'https://avatars.githubusercontent.com/u/71800112?v=4', + twitter: 'https://twitter.com/YazNinjaa' }, { name: 'GamingLiamStudios', link: 'https://github.com/GamingLiamStudios', role: app.getLz('term.developer'), - avatar: 'https://avatars.githubusercontent.com/u/58615717?v=4' + avatar: 'https://avatars.githubusercontent.com/u/58615717?v=4', + twitter: 'https://twitter.com/GLStudios_' }, { name: 'Amaru', From 37df57635a93950216438fb0a0a793a0ce3c74a1 Mon Sep 17 00:00:00 2001 From: yazninja <71800112+yazninja@users.noreply.github.com> Date: Tue, 5 Jul 2022 18:13:15 +0800 Subject: [PATCH 2/3] Update style.less --- src/renderer/style.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/style.less b/src/renderer/style.less index 913e9991..a4592068 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -1895,7 +1895,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { display: flex; justify-content: center; align-items: center; - margin-left: 100px; + float: right; } .about-page { From 514ce4c1e01f2e71a08dcd962c6f6a7ea15e75ed Mon Sep 17 00:00:00 2001 From: Monochromish Date: Tue, 5 Jul 2022 20:14:14 +1000 Subject: [PATCH 3/3] Float right looks better --- src/renderer/less/pages.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less index 9fa973eb..746ee6b5 100644 --- a/src/renderer/less/pages.less +++ b/src/renderer/less/pages.less @@ -1300,7 +1300,7 @@ display: flex; justify-content: center; align-items: center; - margin-left: 100px; + float: right; } .animated {