From 697291e6f5c40da4f0f3287d0981d8e9ace3ed17 Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Fri, 10 Jul 2020 22:35:02 -0600
Subject: [PATCH 1/2] Light/dark theme toggle in top navbar

---
 app/soapbox/features/preferences/index.js     | Bin 7506 -> 6916 bytes
 .../features/ui/components/tabs_bar.js        | Bin 6181 -> 7272 bytes
 app/styles/components/tabs-bar.scss           |  10 +++++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/features/preferences/index.js b/app/soapbox/features/preferences/index.js
index 148a70c572004ef33526228c6c36f502e6503bb3..80a49a7b7d8f625f8e52478e7154ed98efe12315 100644
GIT binary patch
delta 17
Ycmca))nc~c0Q=@djtb_@ZM<jr0Yml%_5c6?

delta 256
zcmZoMyJWTD0K15SLP<tyZmLgadPa$rLbXC>ij~6TKmk!3uyA}1NL*b<Atf~}u{5W|
zH?_DpF+J5vK^?3?U7=Qo3u=N(Vo^4-0ZI@9Qh>tP^n;Xd-pyXi%nDXFc_NPlO9;><
zlRxr`3S^d~<`&ylS1W+62Rf*ZOGX&14s5L^&^=(=K;k@LagcGE3bm74xOKR}0>1ev
csp^`Ock(DszRAtc0TY}2mOEtgYc5Fv0HixtdjJ3c

diff --git a/app/soapbox/features/ui/components/tabs_bar.js b/app/soapbox/features/ui/components/tabs_bar.js
index 391ca3a2be2cfd34ef7a5297291a12218d791133..04dd8def9033ee05eb864ef93bb8458c48b56fd7 100644
GIT binary patch
delta 931
zcmb7DL5tHs6lS+MXi+NGwTBgXi-$=do86nz8hfZ0W!FoK7g@?AnI^-gnUI;VLJ5Wa
z2QnA$izhEae~61me}O;4$t1(p6$G#Eee-?ad*7Qc$G={Dd)j$UmpLm0tRPHq7LzFv
zf@U#PuqfCP5N9|K*vBIr3d%Bm#G5{s`<?k3fL~A%CNp+I<3tP<3yp?=1P=H-z=bCg
zvLtiC;y5Mqw8kJ8BC^0`DozRKI3@}{)g&MoXb9+62r9RGBk&p*=ePMsw*(@E`8R)!
zXy~uX&Q7;6Hd7|$u{DsTHLexSgrBX+1c35(Hjz;7<ps;RXCPiogpIV_Qx*~AfbaW&
znn7U<q9_S$t}Xx0S|Q(&i&~1j$7xAy2Ubc<@h`ysUup*mBFZ8Iq(>fgHIu0|@*`EN
z>V}FnO4nqjL(m4m2PN;nY8`B;-z<bQrvA3=v}*d5TEtXfL2MPg+0#MOsmoqlglf~d
z|9$taYfzgXy|Z2Uvj6NvFYmC?g`gCIWe8X{NojcQuQZh&VB3EMxS;qj#Q{nEmC+c3
zyzW1FU@o#g7zc*B*fT{PrBlgIdwU0OLYAp>-6lXwR?DlC<Yk6ruRoCY9zEW;4}V%J
zDU<pTxE@Z2Z;D9n48Fbvb;R|p>owbL&m<jDo@4b}>_2{*{bB2X&RnA+uLhUD0g3rP
A{r~^~

delta 51
zcmV-30L=gBIHfSK9s`qD16-4H1pAYZ1wWJY1t+s<1~Le<qYuRbvvCq#0<-!R*94RH
J8m5!)8+jC!6-WR8

diff --git a/app/styles/components/tabs-bar.scss b/app/styles/components/tabs-bar.scss
index fd2e3e55e2..91a6c678a1 100644
--- a/app/styles/components/tabs-bar.scss
+++ b/app/styles/components/tabs-bar.scss
@@ -55,7 +55,7 @@
   &__profile {
     position: relative;
     overflow: hidden;
-    margin: 0 0 0 20px;
+    margin: 0 0 0 10px;
     height: 34px;
     width: 34px;
 
@@ -111,6 +111,14 @@
     }
   }
 
+  &__button-theme-toggle {
+    margin-left: 10px;
+    padding: 0 10px;
+    font-size: 20px;
+
+    .fa { margin-right: 0; }
+  }
+
   &__button-compose {
     display: block;
     @media screen and (max-width: $nav-breakpoint-3) {display: none;}

From 8b376b81cf9e6ace1495affc9a01850f4123c4b0 Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Sat, 11 Jul 2020 14:22:39 -0600
Subject: [PATCH 2/2] State condition isLight unnecessary

---
 .../features/ui/components/tabs_bar.js        | Bin 7272 -> 7201 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/features/ui/components/tabs_bar.js b/app/soapbox/features/ui/components/tabs_bar.js
index 04dd8def9033ee05eb864ef93bb8458c48b56fd7..ce10d5c7d85a333faa3bf5b8ac2329ee1c58056e 100644
GIT binary patch
delta 82
zcmaE1vCv|JG~4D(w!a*k=kPCM;?hwlPAw_P%u6qx>?EYNxlrg3(_}+7jmdH1GLs`k
lBSCC__2SYzbp<O0_1ygYJoVbi8zjXhUl$kK{9Uw=4FIkv92fuq

delta 157
zcmZ2z@xo$*G#j^qLT0f~W_m`6mBQpKJ_8N~dxess(o}`b0&E<d##{<OP?C{ZtXG^`
z5?qp4lB!XS(4YvB0SW6tO;M=bEXu!<Y4Ujv(aCoO1vzzKsyDwAJjBEfRW<plNQD?o
YhrNP&Zhn5Ax`LI0dU5IIM$rXq0GquuQ2+n{