From 3de8dcced0dd465a028022a110cf5cc4792d6a26 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 20 Sep 2021 17:05:59 -0500
Subject: [PATCH] Tabler: add icons to ThumbNavigation

---
 app/icons/dashboard-filled.svg              |   3 +++
 app/icons/home-2-filled.svg                 |   3 +++
 app/soapbox/components/icon.js              | Bin 726 -> 715 bytes
 app/soapbox/components/icon_with_counter.js | Bin 580 -> 569 bytes
 app/soapbox/components/thumb_navigation.js  | Bin 3080 -> 4031 bytes
 app/styles/navigation.scss                  |  26 ++++++++++++++++++++
 app/styles/ui.scss                          |   2 +-
 webpack/rules/assets.js                     | Bin 1702 -> 1676 bytes
 webpack/shared.js                           | Bin 3453 -> 3493 bytes
 9 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 app/icons/dashboard-filled.svg
 create mode 100644 app/icons/home-2-filled.svg

diff --git a/app/icons/dashboard-filled.svg b/app/icons/dashboard-filled.svg
new file mode 100644
index 0000000000..69de13b005
--- /dev/null
+++ b/app/icons/dashboard-filled.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler" width="24" height="24" stroke-width="2" stroke="currentColor" fill="currentColor" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M11.969 3.955A9 9 0 0 0 6.4 20H17.6a9 9 0 0 0-5.631-16.045zM15.529 8.5a1 1 0 0 1 .678 1.707l-1.51 1.51c.189.391.303.823.303 1.283 0 1.645-1.355 3-3 3s-3-1.355-3-3 1.355-3 3-3c.46 0 .892.114 1.283.303l1.51-1.51a1 1 0 0 1 .736-.293zM12 12c-.564 0-1 .436-1 1s.436 1 1 1 1-.436 1-1-.436-1-1-1z"/>
+</svg>
diff --git a/app/icons/home-2-filled.svg b/app/icons/home-2-filled.svg
new file mode 100644
index 0000000000..f08cd6fea3
--- /dev/null
+++ b/app/icons/home-2-filled.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler" width="24" height="24" stroke-width="2" stroke="currentColor" fill="currentColor" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M12 3l-9 9h2v7a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-7h2l-9-9zm-2 9h4v4h-4v-4z"/>
+</svg>
diff --git a/app/soapbox/components/icon.js b/app/soapbox/components/icon.js
index 4dff5cf61533f321a9229506966c542095d42c85..9c0ec0d2c4b561a8150828f89ccf3325f52a73f8 100644
GIT binary patch
delta 12
Tcmcb{dYW~^LB`Ez7`Ye$Bl-lX

delta 24
fcmX@jdX06%K}K%9%;KQb!qUv5)RfH!8Mzn%ciRZ`

diff --git a/app/soapbox/components/icon_with_counter.js b/app/soapbox/components/icon_with_counter.js
index fcbfe707ed45a5c17209db00958c39c8c31637a9..3a8f1b64ee3bef98e9d6961d4c530a8b2012c2ae 100644
GIT binary patch
delta 11
ScmX@YvXf=QTgJ&h7<~XAB?SBc

delta 23
ecmdnVa)f2WTSjiZ%;KQb!qUv5)Rf6@8GQh60|`d}

diff --git a/app/soapbox/components/thumb_navigation.js b/app/soapbox/components/thumb_navigation.js
index 91e65d9733bbc62b43824de5deb7dbd7e813b120..1b968f51b0fb705114411e64daec5d27545c531f 100644
GIT binary patch
delta 1123
zcmb7D%SyvQ6h%dgj}LI6ctLPlHHql18Wj{5F2sf4dODppBT1&tjDnO>T<Jc)Ah;E}
zaOoGg@gw{T!AYi$X&ZcmEb=(_&N=6vdq4lO^t3n*ENXF~fP`4e6C6<q4Z$No*@qZM
zz4`ICi3Na=6Ra4It8glK>+GgQrORs<l&Iu=va%L)#Tv{&4)|59)}fANP~%wC`|n>J
zlEtZqt`x*?e|>RVSOxkl3cl|H@(}ESpqE!n&@y6#$I=UUM4e5i!NQQ%U3uL^6{voL
z_7$#$RCorQFEQ8-c)K%TubpIWW-FO1J$KKU3Nn6F<o>6?jNynZ*oBQeyP|_@Gz=ZV
z;-<cx%^%5jwKT&vE$VX}B4S75x9y`Ww*hGvoV3_+Fj4H9qN<(Ju%me$5<#cZF^9O;
z5|R$hZ|8xTFMXiF^<GP>W8EQsnNfCJMTY29N!-+d$>uiDQTMf?{-|#?jp49B5@3}V
zX80zrrK99{`f-r*?}R1Af&@i$|4Y_zT^`K0X`dTI%C`40y;AJ$$eOrPVWDK2-7@lU
mJz}w5hmoDJ3;6f7In;TyWkve+xJ*ziYBVL<_3h+t_VyD@aA=MI

delta 147
zcmdll-yyL<mT9vS(^=-p`fRF`)7b<jH?l3_%}lXX&&bbBRaelr<C;8?TXynYPQ}Sr
z*|&2kfTWUAb8^%tcXPW<{>S-*7c7*VpPQSSR{|1!D*zTLPE9OI&OkLGhWCk(LS}M)
co~?RGVlv2vlGGyg$q)F%f%>c`+wnI707eWlWdHyG

diff --git a/app/styles/navigation.scss b/app/styles/navigation.scss
index f02d14a44b..82c21475d7 100644
--- a/app/styles/navigation.scss
+++ b/app/styles/navigation.scss
@@ -60,6 +60,32 @@
     span {
       display: none;
     }
+
+    .svg-icon {
+      width: 24px;
+      height: 24px;
+
+      svg {
+        stroke-width: 1px;
+      }
+
+      &--active {
+        svg.icon-tabler-search {
+          stroke-width: 2px;
+        }
+
+        svg.icon-tabler-bell,
+        svg.icon-tabler-messages {
+          path:nth-child(2) {
+            fill: var(--primary-text-color);
+          }
+        }
+      }
+    }
+
+    .icon-with-counter__counter {
+      right: -8px;
+    }
   }
 
   @media (min-width: 895px) {
diff --git a/app/styles/ui.scss b/app/styles/ui.scss
index d1116ed7d1..ed3530e3df 100644
--- a/app/styles/ui.scss
+++ b/app/styles/ui.scss
@@ -733,7 +733,7 @@
     @include line-height(14);
     position: absolute;
     box-sizing: border-box;
-    left: 8px;
+    right: -5px;
     top: -12px;
     min-width: 16px;
     height: 16px;
diff --git a/webpack/rules/assets.js b/webpack/rules/assets.js
index 14ed250adfbf8b76d97069183b9a3e9e583cc568..60b7d49cb4578cbfe24a5d0e1d9386cb51037d0b 100644
GIT binary patch
delta 28
kcmZ3++rztI3k!E*L4mrCf_i3he%|ClW{J%oS++6)0E<Kk!2kdN

delta 42
ycmeC-UB<g%3(I6~HUUwG+{BX9qRhk`-IUbg%=A3n%;fyM$%V`ko3FEMWdr~=%nt1U

diff --git a/webpack/shared.js b/webpack/shared.js
index 0e732d81e71ccb0a882800537aec1354354e29b1..c7343f005178927c91728cbef6ddd727718fbaf1 100644
GIT binary patch
delta 44
ucmew>wN!e;IUWTC1@+A2{JdgyD}|!e;{2SlR1NjSf&z6NsQBb#Jlg?c?+@qz

delta 11
TcmZ1~{a0$kIiAVic-8{|A-V;o