Merge pull request #392 from GilbN/develop

1.9.6

css/base/guacamole/guacamole-base.css

@@ -352,6 +352,7 @@ textarea {
 
 
 .user a:visited,
+.user-group a:visited,
 .connection a:visited,
 .connection-group a:visited {
     text-decoration: none;
@@ -448,6 +449,7 @@ textarea {
 }
 
 .user a:visited,
+.user-group a:visited,
 .connection a:visited,
 .connection-group a:visited {
     text-decoration: none;
@@ -463,6 +465,7 @@ a.ng-binding:hover:not(.add-user):not(.button) {
 }
 
 .user a,
+.user-group a,
 .connection a,
 .connection-group a,
 a.ng-binding:not(.add-user):not(.button) {
@@ -484,6 +487,18 @@ textarea {
     background: #666;
 }
 
+img.collapse {
+    filter: invert(1);
+}
+
+img.expand {
+    filter: invert(1);
+}
+
+.icon.user-group {
+    filter: invert(1);
+}
+
 /* USER SETTINGS */
 .page-tabs .page-list li a[href],
 .section-tabs li a {

css/base/pihole/pihole-base.css

@@ -499,6 +499,11 @@
       border-color: var(--button-color) !important;
   }
 
+  [class*=icheck-]>input:first-child:checked+input[type=hidden]+label::after,
+  [class*=icheck-]>input:first-child:checked+label::after {
+      border-color: var(--button-text);
+  }
+
   /* Input */
   input,
   .form-control,
@@ -590,4 +595,4 @@
       border-radius: 8px;
       background: var(--transparency-light-50);
       background-clip: padding-box;
-  }
+  }

css/base/portainer/portainer-base.css

@@ -311,12 +311,26 @@ ul.sidebar .sidebar-title {
 
 .btn-primary,
 .btn-default,
-button {
+button,
+button h3,
+button h5 {
     color: var(--button-text);
     background-color: var(--button-color);
     border-color: var(--button-color);
 }
 
+.app-react-portainer-environments-wizard-components-Option-Option-module__feature {
+    --selected-item-color: var(--button-color);
+    border: 1px solid var(--button-color);
+    color: var(--button-text) !important;
+}
+.app-react-portainer-environments-wizard-components-Option-Option-module__feature:hover {
+    border: 1px var(--button-color);
+    -webkit-box-shadow: 0 3px 10px -2px rgba(var(--accent-color), 0.8);
+    box-shadow: 0 3px 10px -2px rgba(var(--accent-color), 0.8);
+    color: var(--button-text-hover);
+}
+
 .btn-default.active,
 .btn-default:active,
 .open>.dropdown-toggle.btn-default,
@@ -506,7 +520,8 @@ output {
 
 /* DROPDOWN MENU */
 
-.dropdown-menu {
+.dropdown-menu,
+.tableMenu {
     background: var(--drop-down-menu-bg);
     background-repeat: repeat, no-repeat;
     background-attachment: fixed, fixed;
@@ -518,6 +533,27 @@ output {
     color: var(--text);
 }
 
+.tableMenu {
+    background-color: var(--drop-down-menu-bg) !important;
+}
+.tableMenu .menuContent {
+    border-bottom: 1px solid var(--transparency-light-15);
+}
+.widget .widget-body table thead th .table-filter {
+    color: var(--text-muted);
+}
+.widget .widget-body table thead th .filter-active {
+    color: #f0ad4e;
+    font-size: 12px!important;
+}
+.table th button.sortable {
+    color: var(--link-color);
+}
+.small-select {
+    background-color: var(--drop-down-menu-bg);
+    color: var(--text);
+}
+
 .dropdown-menu>li>a,
 .ui-select-bootstrap .ui-select-choices-row>span {
     color: var(--text);

docker-mods/qbittorrent/root/etc/cont-init.d/98-themepark

@@ -90,9 +90,9 @@ if [[ ! -d /themepark ]]; then
 fi
 
 sed_file(){
-	sed -i "s/<\/body>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/base\/qbittorrent\/qbittorrent-base.css'><\/body> /g" $1
+    sed -i "s/<\/body>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/base\/qbittorrent\/qbittorrent-base.css'><\/body> /g" $1
     sed -i "s/<\/body>/<link rel='stylesheet' href='${TP_SCHEME}:\/\/${TP_DOMAIN}\/css\/${THEME_TYPE}\/${TP_THEME}.css'><\/body> /g" $1
-	printf 'Stylesheet set to %s on %s\n\n' "${TP_THEME}" "$1"
+    printf 'Stylesheet set to %s on %s\n\n' "${TP_THEME}" "$1"
 }
 
 # Adding stylesheets
@@ -104,10 +104,10 @@ if ! grep -q "${TP_DOMAIN}/css/base" /themepark/public/index.html; then
 fi
 
 if ! grep -q "${TP_DOMAIN}/css/base" /themepark/private/index.html; then
-    find ./themepark/private -type f -iname *.html | while read fname
-	do
-		sed_file $fname
-	done
+    find /themepark/private -type f -iname *.html | while read fname
+    do
+        sed_file $fname
+    done
 fi
 
 if ! grep -q "WebUI\\\RootFolder" "${APP_FILEPATH}"; then

index.html

@@ -121,9 +121,9 @@
                     <p class="text-white-50 mb-1">Installation methods include custom <a
                             href="https://blog.linuxserver.io/2019/09/14/customizing-our-containers/">docker mods</a>
                         for <a href="https://linuxserver.io">linuxserver.io</a> containers, </p>
-                    <p class="text-white-50 mb-5">custom scripts for select <a href="https://hotio.dev/">Hotio</a>
-                        containers
-                        and multiple examples of subfiltering using webservers like Nginx and Apache</p>
+                    <p class="text-white-50 mb-1">custom scripts for select <a href="https://hotio.dev/">Hotio</a> containers
+                        and multiple examples of subfiltering using webservers like <a href="https://docs.theme-park.dev/setup/#nginx">Nginx</a>, <a href="https://docs.theme-park.dev/setup/#apache">Apache</a>, <a href="https://docs.theme-park.dev/setup/#caddy">Caddy</a> and <a href="https://docs.theme-park.dev/setup/#traefik">Traefik</a>!</p>
+                        <p class="text-white-50 mb-5">There is also a <a href="https://docs.theme-park.dev/setup/#docker">Docker image</a> available for selfhosting the CSS files.</p>
                     <p class="text-white-50 mb-5" id="theme-count">... </p>
                     <a class="btn btn-primary btn-xl js-scroll-trigger" href="#services">Get Started!</a>
                 </div>