From fbacdf6c585a19c26fbdf074ee59427660dfc107 Mon Sep 17 00:00:00 2001
From: chr <chr@cybre.space>
Date: Sun, 16 Feb 2020 16:49:21 -0800
Subject: [PATCH] Apply blackle patches and icons

---
 app/javascript/images/icon_bookmarks.png      | Bin 0 -> 418 bytes
 app/javascript/images/icon_developers.png     | Bin 0 -> 488 bytes
 app/javascript/images/icon_mobile_apps.png    | Bin 0 -> 650 bytes
 .../images/icon_profile_directory.png         | Bin 0 -> 340 bytes
 app/javascript/images/icon_security.png       | Bin 0 -> 780 bytes
 app/javascript/styles/win95.scss              |  59 ++++++++++++++++--
 6 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 app/javascript/images/icon_bookmarks.png
 create mode 100644 app/javascript/images/icon_developers.png
 create mode 100644 app/javascript/images/icon_mobile_apps.png
 create mode 100644 app/javascript/images/icon_profile_directory.png
 create mode 100644 app/javascript/images/icon_security.png

diff --git a/app/javascript/images/icon_bookmarks.png b/app/javascript/images/icon_bookmarks.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0cff134425027d75188de49038f0f4e8d657020
GIT binary patch
literal 418
zcmV;T0bTxyP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XT
z000XT0n*)m`~Uy}R7pfZR9HvtmH`ffAPfNAvS;is`k4Jg{F%ONqZJ4OEiIC4$<!<)
zio2t<)nT}fe~-ZJOaRPa-tfE~VQBiVd#eD#ksAa+28A?7lXZYQff(qbA&!VzfP=S)
zs05^NjfhyF1uhX0CE;0kl&D#LRwK{@&Xp<~fzI$^b&>)-;l>o|)#(%kdc&t_B74&#
zy#sJ;CdV$PX>OrA!pb=~Ow0s4$%ieB-bkPV3n1Xost<`z3V3s^ND02KE55LzHXW8h
z3c!qU9PxK(C^oE5d%o;h*uHG#0N-~M_cSYeRv-q<^PGvq4Tf4d2QM1=cf89a98x%3
zTb5;?;z}&t^V-V&YN$>ae`th?;6&nVm%@t?NcL4MvTYkas)0)cyiZjG1hjCCKve{D
zg30!*WZZ@7+mLuLk4OWYlG0qq4^dY+>JL&4s5bYj@S5Cp|F<LX0gphQmnKFsJ^%m!
M07*qoM6N<$g2Obf(*OVf

literal 0
HcmV?d00001

diff --git a/app/javascript/images/icon_developers.png b/app/javascript/images/icon_developers.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6d2e18294b83368c574944addce8cb9d415f5d6
GIT binary patch
literal 488
zcmV<E0T=#>P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv00000
z008+zyMF)x010qNS#tmYE+YT{E+YYWr9XB6000McNliru;|dc5D+jv;<4OPk0d+}4
zK~z}7?N(ckgD?ynSKKSUS?rr7C-Z&;hX6&SOA1<PBUMT%>Ws(Z2k`JA5wWMhMFbN7
zF!Sx;DJ1|X1PY0CbM#mf7#khKmGwxscc3tMJ#E6TDA0Q9=)NQ1vJFbY=O*+Acbry<
zRSIH^w-CrV*Zbc#p{ib1Z@L2RpgCs{5zOqn1XRiUSOsp)TNDuh(yhq!33!YKfB*<o
z1tEk@1xbB}NV*j1Hlc_sVDo2Rz7F14<2nIVf-2SFu{B>?)BfBC8xf6BphSiy1;G0T
zCIAc}Fw6{Q=Om^c=^fO45F>%8EEMYwm*)HfA~e1VoJ@=*x<w6FhCj-Grvg$VbyE{9
zo?uQ$seBhHX=2XR8)q}-b)NqSGpm3_-sSfY0z?*as#GVdnblIgT!u$0l{cp?vEiMN
zIf01l-7L)Q7qbF}oEPbP+j2L75W?F(ZL93)ov%&9-wdB&9vHq4F!O3txs|}3`{2$)
etI_s<9ymWxytvv;?3$qf0000<MNUMnLSTX@C&91)

literal 0
HcmV?d00001

diff --git a/app/javascript/images/icon_mobile_apps.png b/app/javascript/images/icon_mobile_apps.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7cbd78c189708a00aa599a0a0f0f74a1d89792f
GIT binary patch
literal 650
zcmV;50(Jd~P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv00000
z008+zyMF)x010qNS#tmYE+YT{E+YYWr9XB6000McNliru;|dc5D<0o&ONsyh0vAa{
zK~z}7?N(ck<RA<zN4ZyXGtAALlhu6ihzTT}^vvvPrA3N5X~1O{WgFoC_{&55hbnkn
zpxUpwJ5+UIO9xx42M@sj0A>L(*8M`&(b;#vF~+h<fK(?-fXARzK{F!>lBB9q73CWQ
zMrO{yNz%*+g3!qW5^(HfAU1F_V>t?{qP^dWyadvLgA;Hzo2xgnZ5zz&TcQfDkSX^P
zPz4Z?CnBH%Xve@TdSyA!d(nfFX#JyY-ptAxurNRXg4c@(p&6ZK%6lPP_^Sd7hG3!n
zwd@%5SmK_Wz*3$xnM{Cc27iSi&pQ#`ReWz`Kf)>fGjWz9SX3b??F<y=`LPP4W1~jz
z#d#P@UlfT_Kb|rml4Qq=-e$~MkcK?~AWJQ`DeX>ti-m|ur14su7h2#`E%@^V=!%)w
z#cp@)n~pH|fTo30CZ<hFTRIgc1u+6C4H+#H4fJzIEvN!9(lx15c1rrn%<hod>m;hi
zLjBF+6o_=p+-dbp>3Y#J`*YhiSD1*Dq|sPg_Py?yqgBNd$9;Pyy*QtC$fLMtdzLfL
zLkNY5a;=cs9~4h6D0P2I_$a;G#l)rMC-s46Of2tQuSF^sh=*r6+&wdsZ_@CZ#<R=o
z9YM}ALLSoCQqvo|x;cAi>t4^o`jAHMf`qFRJBTV|23mW~@d!Q{^jEo~z{dAZbi@yj
k6K8%G^wOC>4f^koFX{W?Bs?lfg8%>k07*qoM6N<$g0pTLxc~qF

literal 0
HcmV?d00001

diff --git a/app/javascript/images/icon_profile_directory.png b/app/javascript/images/icon_profile_directory.png
new file mode 100644
index 0000000000000000000000000000000000000000..05a94213a2b172bc75f568fc5c84526892118c03
GIT binary patch
literal 340
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7a$D;Kb?2i11Zh|kH}&M
z20djEW~^9hUj`IpFY)wsWq-^i%%USuKK+9iQ0Sqji(^Q{;iJ<6`3@`aIC~!5`ylOX
z9-I2<y0%s8qFiM*KRYk9Of75Pq)UfYH?xOcl}T@%6%?8ql6^KRd%M+A6Irv}x4v4*
zr5)9i(hO&~{WeUWzo6=4-8%*;j#m!v|1R>@3}81~zwrCKthGi?HLs_d{>%H_^Thw{
zOeRh?uKUW9<s;bk?AZ|fY?npXtqJyBw>s>N1G|413vWd*>XR3nJ?dX1_UUxi6}#S~
zLSIJCqim`!fnGPK1x_*Amde$o%&~ldMN<KsA=M>$+o<c2>g`YWU-7o6{G6`J@$Mba
OvkacDelF{r5}E)WA%M>S

literal 0
HcmV?d00001

diff --git a/app/javascript/images/icon_security.png b/app/javascript/images/icon_security.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccdbfaf78d6e69b0ffea00a7ac34175a539db39c
GIT binary patch
literal 780
zcmV+n1M~ceP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv00000
z008+zyMF)x010qNS#tmYE+YT{E+YYWr9XB6000McNliru;|dc5D<^<!!-4<+0+~rf
zK~z}7wN|@s+b|S8GQ4~95TNK#{{b^=;NGc2|3E?w6zwN)>fkM-_!R~`hl6Hu%8*4F
zf&dykC11b}@})_NdfCne1c@TSbME^lm?4~V)3>LTqR(W`oy$4EyWOMr|Mleo0Pytu
z4gg5g6ha6yhs0tE_-^-T!3mV!t~AX7oO1v$HzN>gOW#k=@Ae_>_xm@@mF3ifU%&mq
z>&pXv{r-nr$`oIj^?Gd=+wHbvc9Q-64PTB&=o$AfC&U2KG>rnrWW_nSpB2*y#L`SD
z6}>FWSm)pIc)Z*NZmNY5PJ!l%5aK3oPGTuHmJKmNeG(y>46+-lc726tj{Nxf*TWt(
z4+{#4{)EgMOB2HYFm?{S`&?7Ci}nI{@ANOZl&Pr-W*A^H)_$9+FsCwWIOpc%E<<O-
z{W&E$O2AZwsS0K<4?#lk*xpsWKx^5?0?VMa1Y;SQ235iAoAzn1$bhO~*Egf~V(o$Z
zdlFh}yZ($`V1TnWF%Xx;nOuARKG&ldi>U-%Gl!O7j3LVk`<^3{=K*p<ABjudu$bZk
zt+f}3F%p-`atK%mfwC--O9dcDmKB|V%=0|jDV?}5L-CgM0lQL`C6rPqGDJzlEaFzo
z)37>Nip^My9U~EDMJ~I;On_mVks(u4Jr9Y{6jawMOM+63w53#a!8e-^+}(X2YSW1&
zKw7$uB{uaCiLo(mv-#-Vm$G$_Qpyj)&|Fd~2qDlk2h{b-546Jcrliah09_JNYLB2&
zP8RsXW~*f%_*ALul_f!118`iUyLEs}JOs`;hs={`e~@_+ofm`<p6f{AMJ&h&d`fj3
zTGO3%y+YF*ED2Ysg?os!6GHSxuWJP@{UQ{uLn1K}$+c6<welaR7SEGEA`#XA0000<
KMNUMnLSTY6Z&*?Q

literal 0
HcmV?d00001

diff --git a/app/javascript/styles/win95.scss b/app/javascript/styles/win95.scss
index 27bb065e8..5dbe1db74 100644
--- a/app/javascript/styles/win95.scss
+++ b/app/javascript/styles/win95.scss
@@ -480,14 +480,13 @@ body.admin {
   button {
     background: transparent;
     color: black;
-    padding: 4px 0;
+    padding: 8px 0;
     align-self: end;
     @include win95-tab();
 
     &.active {
       color: black;
       top: 2px;
-      padding:8px 0;
       background-color: $win95-bg;
 
       &::before, &::after {
@@ -1425,9 +1424,13 @@ body.admin {
   background-image: url("../images/icon_mutes.png");
   &:hover { background-image: url("../images/icon_mutes.png"); }
 }
-.column-link[href="/settings/preferences"] {
-  background-image: url("../images/icon_settings.png");
-  &:hover { background-image: url("../images/icon_settings.png"); }
+.column-link[href="/web/directory"] {
+  background-image: url("../images/icon_profile_directory.png");
+  &:hover { background-image: url("../images/icon_profile_directory.png"); }
+}
+.column-link[href="/web/bookmarks"] {
+  background-image: url("../images/icon_bookmarks.png");
+  &:hover { background-image: url("../images/icon_bookmarks.png"); }
 }
 
 .getting-started__footer ul li a[href="/web/keyboard-shortcuts"] {
@@ -1454,6 +1457,18 @@ body.admin {
   background-image: url("../images/icon_logout.png");
   &:hover { background-image: url("../images/icon_logout.png"); }
 }
+.getting-started__footer ul li a[href="https://joinmastodon.org/apps"] {
+  background-image: url("../images/icon_mobile_apps.png");
+  &:hover { background-image: url("../images/icon_mobile_apps.png"); }
+}
+.getting-started__footer ul li a[href="/settings/applications"] {
+  background-image: url("../images/icon_developers.png");
+  &:hover { background-image: url("../images/icon_developers.png"); }
+}
+.getting-started__footer ul li a[href="/auth/edit"] {
+  background-image: url("../images/icon_settings.png");
+  &:hover { background-image: url("../images/icon_settings.png"); }
+}
 
 .column .static-content.getting-started {
   display:none;
@@ -2470,6 +2485,9 @@ body {
   .card-grid {
     margin-left: 10px;
   }
+  .status {
+    padding: 15px 15px 55px 78px;
+  }
 }
 
 @media screen and (max-width: 1255px) {
@@ -2536,3 +2554,34 @@ body {
 .layout-single-column .status__wrapper .status {
   padding-bottom: 50px;
 }
+
+::-webkit-scrollbar {
+  width: 14px;
+}
+
+::-webkit-scrollbar-track {
+  background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAAAAABX3VL4AAAADklEQVQIW2P4f4DhwH8ACoADf0PlskQAAAAASUVORK5CYII=');
+
+  &:hover {
+    background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAAAAABX3VL4AAAADklEQVQIW2P4f4DhwH8ACoADf0PlskQAAAAASUVORK5CYII=');
+  }
+}
+
+::-webkit-scrollbar-thumb {
+  background: #bfbfbf;
+  border-color: #efefef #404040 #404040 #efefef;
+  border-style: solid;
+  border-width: 2px;
+
+  &:hover {
+    background: #bfbfbf;
+    border-color: #efefef #404040 #404040 #efefef;
+    border-style: solid;
+    border-width: 2px;
+  }
+
+  &:active {
+    background: #bfbfbf;
+    border-color: #404040 #efefef #efefef #404040;
+  }
+}