Merge pull request #1244 from Monochromish/main

Fix cider team buttons in about page

src/renderer/less/pages.less

@@ -1300,7 +1300,7 @@
       display: flex;
       justify-content: center;
       align-items: center;
-      padding-left: 100px;
+      float: right;
     }
 
     .animated {

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;

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;
+  float: right;
 }
 
 .about-page {

src/renderer/views/pages/about.ejs

@@ -25,14 +25,14 @@
                 <div class="row">
                     <div class="col">
                         <h3>{{$root.getLz('term.ciderTeam')}}</h3>
-                        <div class="md-btn teamBtn" v-for="member in team">
+                        <div class="md-btn teamBtn" v-for="member in team" @click="window.open(member.link)">
                             <img :src="member.avatar"/>
                             <div class="row" style="width:100%;">
-                                <div class="col" @click="window.open(member.link)" style="text-align: left; cursor: pointer;">
+                                <div class="col" style="text-align: left;">
                                     {{ member.name }}
                                 </div>
                                 <div class="col" style="text-align: right">
-                                    <button @click="window.open(member.twitter)" class="social-btn" v-if="member.twitter">
+                                    <button @click.stop="window.open(member.twitter)" class="social-btn" v-if="member.twitter">
                                         <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="white" style=""><path d="M24 4.557c-.883.392-1.832.656-2.828.775 1.017-.609 1.798-1.574 2.165-2.724-.951.564-2.005.974-3.127 1.195-.897-.957-2.178-1.555-3.594-1.555-3.179 0-5.515 2.966-4.797 6.045-4.091-.205-7.719-2.165-10.148-5.144-1.29 2.213-.669 5.108 1.523 6.574-.806-.026-1.566-.247-2.229-.616-.054 2.281 1.581 4.415 3.949 4.89-.693.188-1.452.232-2.224.084.626 1.956 2.444 3.379 4.6 3.419-2.07 1.623-4.678 2.348-7.29 2.04 2.179 1.397 4.768 2.212 7.548 2.212 9.142 0 14.307-7.721 13.995-14.646.962-.695 1.797-1.562 2.457-2.549z"></path></svg>
                                     </button>
                                 </div>
@@ -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',