Fixed #243 #242

README.md

@@ -20,7 +20,6 @@ Usage:  `./install.sh`  **[OPTIONS...]**
 |-t, --theme          | Specify theme color variant(s) [default/purple/pink/red/orange/yellow/green/grey/all] (Default: blue)|
 |-a, --alternative    | Install alternative icons (redesigned MacOS default icons)|
 |-b, --bold           | Install bold panel icons version|
-|--black              | Black panel icons version|
 |-r,--remove,-u,--uninstall | Uninstall (remove) icon themes|
 |-h, --help           | Show this help|
 

alternative/apps/symbolic/gnome-software-symbolic.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3 1c-1.108 0-2 0.892-2 2v10c0 1.108 0.892 2 2 2h10c1.108 0 2-0.892 2-2v-10c0-1.108-0.892-2-2-2h-10zm0 1h10c0.554 0 1 0.446 1 1v10c0 0.554-0.446 1-1 1h-10c-0.554 0-1-0.446-1-1v-10c0-0.554 0.446-1 1-1zm1 2c0 2.216 1.784 4 4 4 2.216 0 4-1.784 4-4h-1c0 1.662-1.338 3-3 3s-3-1.338-3-3h-1z" fill="#363636"/>
+</svg>

alternative/apps/symbolic/preferences-system-symbolic.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path class="ColorScheme-Text" d="m10.248 0.36014c-0.051289-0.039868-0.11079-0.068871-0.17768-0.086795-0.26756-0.071692-0.54013 0.085109-0.61182 0.35267l-0.13648 0.50983a7 7 0 0 0-1.2795-0.12756c-0.014799-0.0013-0.02721-0.008666-0.042357-0.008668-0.015497 1.7e-6 -0.028275 0.007404-0.043403 0.00877a7 7 0 0 0-1.2789 0.12538l-0.13583-0.50692c-0.071693-0.26756-0.34474-0.42521-0.61231-0.35352-0.26756 0.071693-0.42521 0.34474-0.35352 0.61231l0.13511 0.50425a7 7 0 0 0-1.2116 0.5477 7 7 0 0 0-1.0808 0.77426l-0.36901-0.36867c-0.19587-0.19587-0.51032-0.19538-0.70619 4.923e-4 -0.19587 0.19587-0.19538 0.51032 4.923e-4 0.70619l0.36973 0.37133a7 7 0 0 0-1.3249 2.291l-0.50378-0.13524c-0.26756-0.071692-0.54013 0.085109-0.61182 0.35267-0.071692 0.26756 0.085109 0.54013 0.35267 0.61182l0.50983 0.13648a7 7 0 0 0-0.00209 2.6442l-0.50692 0.13583c-0.26756 0.071693-0.42521 0.34474-0.35352 0.61231 0.071693 0.26756 0.34474 0.42521 0.61231 0.35352l0.50425-0.13512a7 7 0 0 0 0.5477 1.2116 7 7 0 0 0 0.77426 1.0808l-0.36867 0.36901c-0.19587 0.19587-0.19538 0.51032 4.923e-4 0.70619 0.19587 0.19586 0.51032 0.19538 0.70619-4.93e-4l0.37133-0.36973a7 7 0 0 0 2.2909 1.325l-0.13524 0.50378c-0.071692 0.26756 0.085109 0.54013 0.35267 0.61182 0.26756 0.0717 0.54013-0.08511 0.61182-0.35267l0.13648-0.50982a7 7 0 0 0 2.6442 0.0021l0.13583 0.50692c0.071693 0.26756 0.34474 0.42521 0.61231 0.35352 0.26756-0.07169 0.42521-0.34474 0.35352-0.61231l-0.13511-0.50426a7 7 0 0 0 1.2116-0.5477 7 7 0 0 0 1.0808-0.77426l0.36901 0.36867c0.19587 0.19586 0.51032 0.19538 0.70619-4.92e-4 0.19586-0.19587 0.19538-0.51031-4.92e-4 -0.70619l-0.36973-0.37133a7 7 0 0 0 0.75739-1.0579c0.0053-8e-3 0.01392-0.01231 0.01878-0.02073 0.0063-0.01084 0.0055-0.02326 0.01082-0.03435a7 7 0 0 0 0.53798-1.1779l0.50378 0.13524c0.26756 0.07169 0.54013-0.08511 0.61182-0.35267 0.0717-0.26756-0.08511-0.54013-0.35267-0.61182l-0.50982-0.13648a7 7 0 0 0 0.0021-2.6442l0.50691-0.13584c0.26756-0.071693 0.42521-0.34474 0.35352-0.61231s-0.34474-0.42521-0.61231-0.35352l-0.50426 0.13511a7 7 0 0 0-0.5477-1.2116 7 7 0 0 0-0.77426-1.0808l0.36867-0.36901c0.19586-0.19587 0.19538-0.51032-4.93e-4 -0.70619-0.1959-0.19594-0.51034-0.19545-0.70621 4.19e-4l-0.37133 0.36973a7 7 0 0 0-2.291-1.3249l0.13524-0.50378c0.053769-0.20067-0.02113-0.40542-0.17499-0.52503zm0.50376 2.3071a6 6 0 0 1 2.4439 2.3334 6 6 0 0 1 0.22678 5.5526l-3.498-2.0195a2 2 0 0 0-0.92455-2.2658 2 2 0 0 0-0.49887-0.20232l-6.704e-4 -4.0418a6 6 0 0 1 2.2514 0.64354zm-3.2526-0.63971 8.883e-4 4.0375a2 2 0 0 0-1.2322 0.93497 2 2 0 0 0-0.19531 1.5336l-3.4979 2.0196a6 6 0 0 1 2.4261-7.7489 6 6 0 0 1 2.4985-0.77671zm1.0008 5.1064a1 1 0 0 1 0.36603 1.366 1 1 0 0 1-1.366 0.36603 1 1 0 0 1-0.36603-1.366 1 1 0 0 1 1.366-0.36603zm0.92619 2.2668 3.4962 2.0185a6 6 0 0 1-1.9232 1.7764 6 6 0 0 1-7.9236-1.7759l3.497-2.018a2 2 0 0 0 0.42733 0.33016 2 2 0 0 0 2.4262-0.33129z" color="#363636" fill="currentColor"/>
+</svg>

alternative/apps/symbolic/software-store-symbolic.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3 1c-1.108 0-2 0.892-2 2v10c0 1.108 0.892 2 2 2h10c1.108 0 2-0.892 2-2v-10c0-1.108-0.892-2-2-2zm0 1h10c0.554 0 1 0.446 1 1v10c0 0.554-0.446 1-1 1h-10c-0.554 0-1-0.446-1-1v-10c0-0.554 0.446-1 1-1zm1 2c0 2.216 1.784 4 4 4s4-1.784 4-4h-1c0 1.662-1.338 3-3 3s-3-1.338-3-3z" fill="#363636"/>
+</svg>

alternative/apps/symbolic/system-file-manager-symbolic.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m2 1c-1.108 0-2 0.892-2 2v9c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-8c0-1.108-0.892-2-2-2h-7.6289c-0.57985-0.0229-0.60474 0.076886-1.0391-0.35742-0.43381-0.43381-0.61297-0.64213-1.332-0.64258zm0 1h2c0.31116-1.7e-6 0.52033 1.383e-4 0.99805 0.4707 0.47877 0.47161 0.6388 0.5293 1 0.5293h8.002c0.554 0 1 0.446 1 1v1h-14v-2c0-0.554 0.446-1 1-1zm-1 4h14v6c0 0.554-0.446 1-1 1h-12c-0.554 0-1-0.446-1-1z" fill="#363636"/>
+</svg>

install.sh

@@ -15,7 +15,7 @@ fi
 SRC_DIR="$(cd "$(dirname "$0")" && pwd)"
 
 THEME_NAME=WhiteSur
-COLOR_VARIANTS=('' '-dark')
+COLOR_VARIANTS=('' '-light' '-dark')
 THEME_VARIANTS=('' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-grey' '-nord')
 
 themes=()
@@ -30,8 +30,7 @@ cat << EOF
     -n, --name NAME         Specify theme name (Default: $THEME_NAME)
     -t, --theme VARIANT     Specify theme color variant(s) [default|purple|pink|red|orange|yellow|green|grey|nord|all] (Default: blue)
     -a, --alternative       Install alternative icons for software center and file-manager
-    -b, --bold              Install bold panel icons version
-    --black                 Black panel icons version
+    -b, --bold              Install bolder panel icons version (1.5px size)
 
     -r, --remove,
     -u, --uninstall         Uninstall (remove) icon themes
@@ -72,19 +71,45 @@ install() {
       cp -r "${SRC_DIR}"/bold/*                                                              ${THEME_DIR}
     fi
 
-    cp -r "${SRC_DIR}"/links/{actions,apps,categories,devices,emblems,mimes,places,status}   ${THEME_DIR}
-
     if [[ $DESKTOP_SESSION == '/usr/share/xsessions/budgie-desktop' ]]; then
       cp -r "${SRC_DIR}"/src/status/symbolic-budgie/*.svg                                    ${THEME_DIR}/status/symbolic
     fi
 
     if [[ ${alternative:-} == 'true' ]]; then
-      cp -r "${SRC_DIR}"/alternative/apps/*.svg                                              ${THEME_DIR}/apps/scalable
+      cp -r "${SRC_DIR}"/alternative/*                                                       ${THEME_DIR}
     fi
 
     if [[ ${theme} != '' ]]; then
       cp -r "${SRC_DIR}"/colors/color${theme}/*.svg                                          ${THEME_DIR}/places/scalable
     fi
+
+    cp -r "${SRC_DIR}"/links/{actions,apps,categories,devices,emblems,mimes,places,status}   ${THEME_DIR}
+  fi
+
+  if [[ ${color} == '-light' ]]; then
+    mkdir -p                                                                                 ${THEME_DIR}/status
+    cp -r "${SRC_DIR}"/src/status/{16,22,24}                                                 ${THEME_DIR}/status
+
+    if [[ ${bold:-} == 'true' ]]; then
+      cp -r "${SRC_DIR}"/bold/status/{16,22,24}                                             ${THEME_DIR}/status
+    fi
+
+    # Change icon color for light theme
+    sed -i "s/#ffffff/#363636/g" "${THEME_DIR}"/status/{16,22,24}/*
+
+    cp -r "${SRC_DIR}"/links/status/{16,22,24}                                               ${THEME_DIR}/status
+
+    cd ${dest}
+    ln -s ../${name}${theme}/actions ${name}${theme}-light/actions
+    ln -s ../${name}${theme}/animations ${name}${theme}-light/animations
+    ln -s ../${name}${theme}/apps ${name}${theme}-light/apps
+    ln -s ../${name}${theme}/categories ${name}${theme}-light/categories
+    ln -s ../${name}${theme}/devices ${name}${theme}-light/devices
+    ln -s ../${name}${theme}/emblems ${name}${theme}-light/emblems
+    ln -s ../${name}${theme}/mimes ${name}${theme}-light/mimes
+    ln -s ../${name}${theme}/places ${name}${theme}-light/places
+    ln -s ../../${name}${theme}/status/32 ${name}${theme}-light/status/32
+    ln -s ../../${name}${theme}/status/symbolic ${name}${theme}-light/status/symbolic
   fi
 
   if [[ ${color} == '-dark' ]]; then
@@ -97,25 +122,29 @@ install() {
     cp -r "${SRC_DIR}"/src/mimes/symbolic                                                    ${THEME_DIR}/mimes
     cp -r "${SRC_DIR}"/src/devices/{16,22,24,symbolic}                                       ${THEME_DIR}/devices
     cp -r "${SRC_DIR}"/src/places/{16,22,24,symbolic}                                        ${THEME_DIR}/places
-    cp -r "${SRC_DIR}"/src/status/{16,22,24,symbolic}                                        ${THEME_DIR}/status
+    cp -r "${SRC_DIR}"/src/status/symbolic                                                   ${THEME_DIR}/status
 
     if [[ ${bold:-} == 'true' ]]; then
       cp -r "${SRC_DIR}"/bold/*                                                              ${THEME_DIR}
     fi
 
+    if [[ ${alternative:-} == 'true' ]]; then
+      cp -r "${SRC_DIR}"/alternative/apps/symbolic/*.svg                                     ${THEME_DIR}/apps/symbolic
+    fi
+
     if [[ $DESKTOP_SESSION == '/usr/share/xsessions/budgie-desktop' ]]; then
       cp -r "${SRC_DIR}"/src/status/symbolic-budgie/*.svg                                    ${THEME_DIR}/status/symbolic
     fi
 
     # Change icon color for dark theme
-    sed -i "s/#363636/#dedede/g" "${THEME_DIR}"/{actions,devices,places,status}/{16,22,24}/*
+    sed -i "s/#363636/#dedede/g" "${THEME_DIR}"/{actions,devices,places}/{16,22,24}/*
     sed -i "s/#363636/#dedede/g" "${THEME_DIR}"/actions/32/*
     sed -i "s/#363636/#dedede/g" "${THEME_DIR}"/{actions,apps,categories,emblems,devices,mimes,places,status}/symbolic/*
 
     cp -r "${SRC_DIR}"/links/actions/{16,22,24,32,symbolic}                                  ${THEME_DIR}/actions
     cp -r "${SRC_DIR}"/links/devices/{16,22,24,symbolic}                                     ${THEME_DIR}/devices
     cp -r "${SRC_DIR}"/links/places/{16,22,24,symbolic}                                      ${THEME_DIR}/places
-    cp -r "${SRC_DIR}"/links/status/{16,22,24,symbolic}                                      ${THEME_DIR}/status
+    cp -r "${SRC_DIR}"/links/status/symbolic                                                 ${THEME_DIR}/status
     cp -r "${SRC_DIR}"/links/apps/symbolic                                                   ${THEME_DIR}/apps
     cp -r "${SRC_DIR}"/links/categories/symbolic                                             ${THEME_DIR}/categories
     cp -r "${SRC_DIR}"/links/mimes/symbolic                                                  ${THEME_DIR}/mimes
@@ -132,6 +161,9 @@ install() {
     ln -s ../../${name}${theme}/apps/scalable ${name}${theme}-dark/apps/scalable
     ln -s ../../${name}${theme}/devices/scalable ${name}${theme}-dark/devices/scalable
     ln -s ../../${name}${theme}/places/scalable ${name}${theme}-dark/places/scalable
+    ln -s ../../${name}${theme}/status/16 ${name}${theme}-dark/status/16
+    ln -s ../../${name}${theme}/status/22 ${name}${theme}-dark/status/22
+    ln -s ../../${name}${theme}/status/24 ${name}${theme}-dark/status/24
     ln -s ../../${name}${theme}/status/32 ${name}${theme}-dark/status/32
   fi
 
@@ -185,11 +217,6 @@ while [[ "$#" -gt 0 ]]; do
       echo "Installing 'bold' version..."
       shift
       ;;
-    --black)
-      black='true'
-      echo "Installing 'black on panel' version..."
-      shift
-      ;;
     -r|--remove|-u|--uninstall)
       remove='true'
       shift

links/apps/scalable/Geogebra.svg

@@ -0,0 +1 @@
+geogebra.svg

links/apps/scalable/appimagekit-retroarch.svg

@@ -0,0 +1 @@
+retroarch.svg

links/apps/scalable/com.belmoussaoui.Authenticator.svg

@@ -0,0 +1 @@
+gnome-twofactorauth.svg

links/apps/scalable/com.github.bilelmoussaoui.Authenticator.svg

@@ -0,0 +1 @@
+gnome-twofactorauth.svg

links/apps/scalable/com.github.hluk.copyq.svg

@@ -0,0 +1 @@
+copyq.svg

links/apps/scalable/com.github.taiko2k.tauonmb.svg

@@ -0,0 +1 @@
+tauonmb.svg

links/apps/scalable/geogebra-classic.svg

@@ -0,0 +1 @@
+geogebra.svg

links/apps/scalable/no.mifi.losslesscut.svg

@@ -0,0 +1 @@
+losslesscut.svg

links/apps/scalable/org.geogebra.GeoGebra.svg

@@ -0,0 +1 @@
+geogebra.svg

links/apps/scalable/org.gnome.Authenticator.svg

@@ -0,0 +1 @@
+gnome-twofactorauth.svg

links/apps/scalable/org.koreader.KOReader.svg

@@ -0,0 +1 @@
+koreader.svg

links/apps/scalable/org.libretro.RetroArch.svg

@@ -0,0 +1 @@
+retroarch.svg

links/apps/scalable/org.shotcut.Shotcut.svg

@@ -0,0 +1 @@
+shotcut.svg

src/status/24/network-wired.svg

@@ -1,3 +1,3 @@
 <svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m7 6c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h1c0 1.108 0.892 2 2 2h4c1.108 0 2-0.892 2-2h1c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2zm0 1h10c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-2v1c0 0.554-0.446 1-1 1h-4c-0.554 0-1-0.446-1-1v-1h-2c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1z" fill="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.0016"/>
+ <path d="m7 6c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h1c0 1.108 0.892 2 2 2h4c1.108 0 2-0.892 2-2h1c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2zm0 1h10c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-2v1c0 0.554-0.446 1-1 1h-4c-0.554 0-1-0.446-1-1v-1h-2c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1z" fill="#ffffff"/>
 </svg>