Merge branch 'testing' into develop

themepark-dev · Apr 11, 2022 · 5ef1a78 · 5ef1a78
2 parents ce8309e + 98180ee
commit 5ef1a78
Show file tree

Hide file tree

Showing 46 changed files with 604 additions and 555 deletions.
diff --git a/.github/workflows/minify-and-deploy.yml b/.github/workflows/minify-and-deploy.yml
@@ -4,10 +4,21 @@ on:
     branches:
       - master
       - develop
+      - testing 
     paths-ignore:
         - 'docker-mods/**'
         - '.vscode/**'
         - '.github/**'
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Select branch'
+        required: true
+        type: choice
+        options:
+        - master
+        - develop
+        - testing
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -53,17 +64,25 @@ jobs:
                 done
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
-        if: ${{ github.ref == 'refs/heads/master' }}
+        if: ${{ github.ref == 'refs/heads/master' || github.event.inputs.branch == 'master' }}
         with:
           publish_dir: ./
           publish_branch: live
           github_token: ${{ secrets.GITHUB_TOKEN }}
           exclude_assets: ''
       - name: Deploy Develop
         uses: peaceiris/actions-gh-pages@v3
-        if: ${{ github.ref == 'refs/heads/develop' }}
+        if: ${{ github.ref == 'refs/heads/develop' || github.event.inputs.branch == 'develop' }}
         with:
           publish_dir: ./
           publish_branch: live_develop
           github_token: ${{ secrets.GITHUB_TOKEN }}
           exclude_assets: ''
+      - name: Deploy Testing
+        uses: peaceiris/actions-gh-pages@v3
+        if: ${{ github.ref == 'refs/heads/testing' || github.event.inputs.branch == 'testing' }}
+        with:
+          publish_dir: ./
+          publish_branch: live_testing
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          exclude_assets: ''
diff --git a/css/base/adguard/adguard-base.css b/css/base/adguard/adguard-base.css
@@ -392,7 +392,7 @@ h6,
 }
 
 .service__icon {
-    color: #eee;
+    color: var(--text);
 }
 
 /* LOGS */

diff --git a/css/base/bazarr/bazarr-base.css b/css/base/bazarr/bazarr-base.css
@@ -80,7 +80,7 @@ a:hover {
     border: 1px solid rgba(255, 255, 255, .1);
 }
 
-.page-link:focus {
+.page-link:focus { 
     z-index: 3;
     outline: 0;
     box-shadow: 0 0 0 0.2rem rgb(var(--accent-color) / 25%);
@@ -133,7 +133,7 @@ label,
 .header-container input[type=text] {
     padding: 0;
     transition: none;
-    color: #fff;
+    color: var(--text-hover);
     border-radius: 0;
     border: none;
     border-bottom: 1px solid rgba(255, 255, 255, .3) !important;
@@ -142,13 +142,13 @@ label,
 
 .header-container input[type=text]:focus {
     box-shadow: none;
-    color: #fff;
+    color: var(--text-hover);
     background-color: transparent !important;
     border-color: rgb(var(--accent-color)) !important;
 }
 
 .form-control {
-    color: #FFF;
+    color: var(--text-hover);
     background-color: rgba(255, 255, 255, 0.08);
     border: 1px solid rgba(255, 255, 255, 0.08);
 }
@@ -158,14 +158,14 @@ label,
     border-color: rgba(255, 255, 255, 0.25) !important;
     outline: 0;
     box-shadow: none;
-    color: #fff;
+    color: var(--text-hover);
 }
 
 .form-control:disabled,
 .form-control[readonly] {
     background-color: rgb(255 255 255 / 15%);
     opacity: .7;
-    color: #fff;
+    color: var(--text-hover);
     border: 1px solid rgb(255 255 255 / 15%);
 }
 
@@ -175,11 +175,11 @@ label,
 }
 
 .form-group i {
-    color: #ffffff;
+    color: var(--text-hover);
 }
 
 .bootstrap-tagsinput {
-    color: #eee;
+    color: var(--text);
     background-color: rgba(0, 0, 0, .25) !important;
     border: 1px solid transparent !important;
 
@@ -484,7 +484,7 @@ hr {
 }
 
 .modal-content .badge-secondary {
-    color: #fff;
+    color: var(--text-hover);
     background-color: var(--accent-color);
     padding: 5px;
 }
@@ -498,13 +498,13 @@ hr {
     font-size: 1.5rem;
     font-weight: 700;
     line-height: 1;
-    color: #eee;
-    text-shadow: 0 1px 0 #eee;
+    color: var(--text);
+    text-shadow: 0 1px 0 var(--text);
     opacity: .5;
 }
 
 .close:hover {
-    color: #fff !important;
+    var(--text) !important;
     text-decoration: none;
 }
 
@@ -655,7 +655,7 @@ hr {
 }
 
 .custom-control-input:not(:disabled):active~.custom-control-label:before {
-    color: #fff;
+    color: var(--text-hover);
     background-color: rgb(var(--accent-color));
     border-color: rgb(var(--accent-color));
 }
@@ -727,7 +727,7 @@ input {
 .custom-selector .selector__control {
     background-color: rgba(0, 0, 0, 0.25);
     border-color: rgba(0, 0, 0, 0) !important;
-    color: #fff;
+    color: var(--text-hover);
 }
 
 [class$="-singleValue"],
@@ -762,13 +762,13 @@ input {
 
 .custom-selector .selector__option--is-focused {
     background-color: rgba(var(--accent-color), .2);
-    color: #fff;
+    color: var(--text-hover);
 }
 
 .custom-selector .selector__option--is-focused:active,
 .custom-selector .selector__option--is-focused:focus {
     background-color: rgba(var(--accent-color), .2);
-    color: #fff;
+    color: var(--text-hover);
 }
 
 .custom-selector .selector__option--is-selected {

diff --git a/css/base/bitwarden/bitwarden-base.css b/css/base/bitwarden/bitwarden-base.css
@@ -130,7 +130,7 @@ html[class*="theme_"] .card-header,
 
 html[class*="theme_"] .card-header {
     background-color: rgb(0 0 0 / 45%);
-    color: #fff;
+    color: var(--text-hover);
 }
 
 .card {
@@ -164,7 +164,7 @@ html[class*="theme_"] .password-number {
 }
 
 html[class*="theme_"] .password-letter {
-    color: white;
+    color: var(--text-hover);
 }
 
 html[class*="theme_"] app-vault-groupings .card .card-body a,
@@ -215,7 +215,7 @@ html[class*="theme_"] .close {
 
 .close,
 .close:hover {
-    color: #fff;
+    color: var(--text-hover);
 }
 
 .close:focus {
@@ -256,7 +256,7 @@ html[class*="theme_"] .close {
 
 .btn-primary,
 .swal2-popup .swal2-actions button.swal2-confirm {
-    color: #fff;
+    color: var(--text-hover);
     background-color: var(--button-color);
     border-color: var(--button-color);
 }
@@ -318,7 +318,7 @@ html[class*="theme_"] .navbar .dropdown-menu .dropdown-item-text {
 html[class*="theme_"] .dropdown-menu,
 html[class*="theme_"] .dropdown-item {
     background: #1f1f1f;
-    color: #fff;
+    color: var(--text-hover);
 }
 
 html[class*="theme_"] .dropdown-item,
@@ -349,7 +349,7 @@ html[class*="theme_"] app-org-vault-groupings .card #search,
 html[class*="theme_"] .groupings .card #search {
     background-color: transparent;
     border-color: rgb(var(--accent-color));
-    color: #fff;
+    color: var(--text-hover);
 }
 
 /* SETTINGS */
@@ -561,7 +561,7 @@ html[class*="theme_"] .org-nav .nav-tabs a:not(.active) {
 }
 
 app-vault-groupings .card .card-body a:hover.text-muted {
-    color: #fff !important;
+    color: var(--text-hover) !important;
     opacity: 1 !important;
 }
 
@@ -656,7 +656,7 @@ html[class*="theme_"] .groupings .card .card-body a {
 
 .page-item.active .page-link {
     z-index: 3;
-    color: #fff;
+    color: var(--text-hover);
     background-color: var(--button-color);
     border-color: var(--button-color);
 }

diff --git a/css/base/deluge/deluge-base.css b/css/base/deluge/deluge-base.css
@@ -28,7 +28,7 @@
  }
 
  input {
-     color: #FFF !important;
+     color: var(--text-hover) !important;
  }
 
  /* scroller */
@@ -78,24 +78,24 @@
  }
 
  .x-item-disabled {
-     color: #aaaaaa;
+     color: var(--text-muted)
  }
 
  .x-item-disabled * {
      color: var(--text-muted) !important;
  }
 
  .x-splitbar-proxy {
-     background-color: #aaa;
+     background-color: var(--text)
  }
 
  .x-color-palette a {
-     border-color: #fff;
+     border-color: var(--text-hover)
  }
 
  .x-color-palette a:hover,
  .x-color-palette a.x-color-palette-sel {
-     border-color: #CFCFCF;
+     border-color: var(--text);
      background-color: #eaeaea;
  }
 
@@ -285,13 +285,13 @@
  }
 
  .x-spotlight {
-     background-color: #ccc;
+     background-color: var(--text);
  }
 
  .x-tab-panel-header,
  .x-tab-panel-footer {
      background: var(--main-bg-color);
-     border-color: #d0d0d0;
+     border-color: var(--text);
      overflow: hidden;
      zoom: 1;
      padding-bottom: 0;
@@ -1337,7 +1337,7 @@
  }
 
  .x-pivotgrid .x-grid3-row-headers table td {
-     background: #EEE url(../images/default/grid/grid3-rowheader.gif) repeat-x left top;
+     background: var(--text)  url(../images/default/grid/grid3-rowheader.gif) repeat-x left top;
      border-left: 1px solid;
      border-right: 1px solid;
      border-left-color: #EEE;
@@ -1462,7 +1462,7 @@
  }
 
  .x-tree-node {
-     color: #cccccc;
+     color: var(--text);
      font: normal 11px 'Roboto', arial, tahoma, helvetica, sans-serif;
  }
 
@@ -1473,12 +1473,12 @@
 
  .x-tree-node a,
  .x-dd-drag-ghost a {
-     color: #cccccc;
+     color: var(--text);
  }
 
  .x-tree-node a span,
  .x-dd-drag-ghost a span {
-     color: #cccccc;
+     color: var(--text);
  }
 
  .x-tree-node .x-tree-node-disabled a span {
@@ -1539,12 +1539,12 @@
  .x-date-left,
  .x-date-right {
      //background-image: url(../images/gray/shared/hd-sprite.gif);
-     color: #fff;
+     color: var(--text-hover);
      font: bold 11px 'Roboto', "sans serif", tahoma, verdana, helvetica;
  }
 
  .x-date-middle .x-btn .x-btn-text {
-     color: #fff;
+    color: var(--text-hover);
  }
 
  .x-panel-tbar .x-btn-text {
@@ -1577,7 +1577,7 @@
  }
 
  .x-date-inner td {
-     border-color: #fff;
+     border-color: var(--text)
  }
 
  .x-date-inner a {
@@ -1644,7 +1644,7 @@
 
  .x-date-mp-btns button {
      background-color: #4E565F;
-     color: #fff;
+     color: var(--text-hover);
      border-color: #C0C0C0 #434343 #434343 #C0C0C0;
      font: normal 11px 'Roboto', arial, helvetica, tahoma, sans-serif;
  }
@@ -2143,7 +2143,7 @@
  }
 
  .x-window-tl .x-window-header {
-     color: #ffffff;
+     var(--text-hover);
      font: bold 11px 'Roboto', tahoma, arial, verdana, sans-serif;
  }
 
@@ -2224,7 +2224,7 @@
  }
 
  .x-dlg-mask {
-     background-color: #ccc;
+     background-color: var(--text);
  }
 
  .x-window-plain .x-window-mc {