&aboutTor.title;

&aboutTor.viewChangelog.label;

&aboutTor.ready.label;

-
-

&aboutTor.ready2.label;

&aboutTBUpdate.updated;

-
-

&aboutTBUpdate.linkPrefix;&aboutTBUpdate.linkLabel;&aboutTBUpdate.linkSuffix;

&aboutTor.failure.label;

-
-

&aboutTor.failure2.label;

- - - -

&aboutTor.donationBanner.freeToUse; - &aboutTor.donationBanner.buttonA; » -

&aboutTor.torbrowser_user_manual_questions.label; - &aboutTor.torbrowser_user_manual_link.label;

- -

&aboutTor.tor_mission.label; - &aboutTor.getInvolved.label;

- - -

- -

- - + + + + + %htmlDTD; + + %globalDTD; + + %aboutTorDTD; + + %tbUpdateDTD; +]> + + + + + + &aboutTor.title; + + + + + +

&aboutTor.viewChangelog.label;

&aboutTor.ready.label;

+
+

&aboutTor.ready2.label;

&aboutTBUpdate.updated;

+
+

&aboutTBUpdate.linkPrefix;&aboutTBUpdate.linkLabel;&aboutTBUpdate.linkSuffix;

&aboutTor.failure.label;

+
+

&aboutTor.failure2.label;

+ + + +

&aboutTor.donationBanner.freeToUse; + &aboutTor.donationBanner.buttonA; » +

&aboutTor.torbrowser_user_manual_questions.label; + &aboutTor.torbrowser_user_manual_link.label;

+ +

&aboutTor.tor_mission.label; + &aboutTor.getInvolved.label;

+#include ../../../../../../browser/themes/shared/onionPattern.inc.xhtml + + diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index 39c1abeb..48539a96 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -934,8 +934,7 @@ function torbutton_do_tor_check() { let checkSvc = Cc["@torproject.org/torbutton-torCheckService;1"] .getService(Ci.nsISupports).wrappedJSObject; - if (checkSvc.kCheckNotInitiated != checkSvc.statusOfTorCheck || - m_tb_prefs.getBoolPref("extensions.torbutton.use_nontor_proxy") || + if (m_tb_prefs.getBoolPref("extensions.torbutton.use_nontor_proxy") || !m_tb_prefs.getBoolPref("extensions.torbutton.test_enabled")) return; // Only do the check once. @@ -1119,6 +1118,7 @@ function torbutton_initiate_remote_tor_check() { function torbutton_tor_check_ok() { + torbutton_do_tor_check(); let checkSvc = Cc["@torproject.org/torbutton-torCheckService;1"] .getService(Ci.nsISupports).wrappedJSObject; return (checkSvc.kCheckFailed != checkSvc.statusOfTorCheck); diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css index 8d5c4a83..38486241 100644 --- a/chrome/skin/aboutTor.css +++ b/chrome/skin/aboutTor.css @@ -9,6 +9,9 @@ --abouttor-text-color: white; --abouttor-bg-toron-color: #420C5D; --abouttor-bg-toroff-color: #A4000F; + --onion-opacity: 0.2; + --onion-color: #fff; + --onion-radius: 50px; } * { @@ -23,6 +26,7 @@ html { body { display: flex; flex-direction: column; + justify-content: space-between; width: 100%; height: 100%; margin: 0px auto; @@ -159,7 +163,11 @@ body:not([showmanual]) .showForManual { } #bottom img.imageStyle { - padding-inline-end: 10px; + padding-inline-end: 0.5em; + height: 1.5em; + vertical-align: bottom; + -moz-context-properties: fill; + fill: white; } /* Hide the linebreaks on large enough screens (desktops, laptops, and @@ -195,7 +203,7 @@ body:not([showmanual]) .showForManual { height: auto; width: 50px; display: inline-block; - background: url('searchLogo.png') no-repeat center center; + background: url('dax-logo.svg') no-repeat center center; background-size: 30px 30px; } @@ -203,8 +211,8 @@ body:not([showmanual]) .showForManual { height: auto; width: 36px; border: 0; - background: url('forwardArrow.png') no-repeat center center; - background-size: 16px 14px; + background: url('chrome://browser/skin/forward.svg') no-repeat center center; + background-size: 16px 16px; cursor: pointer; } @@ -220,91 +228,6 @@ body:not([showmanual]) .showForManual { margin: 0; font-size: 15px; } - -.onion-pattern-container { - flex: auto; /* grow to consume remaining space on the page */ - display: flex; - flex-direction: column; - justify-content: end; /* position circles at the bottom */ - margin: 0px auto; - width: 100%; - max-width: 2200px; /* room for our 20 circles */ - min-height: 232px; /* room for 2 rows of circles */ - overflow-x: hidden; /* clip extra circles on the sides */ - direction: ltr; -} - -.onion-pattern-row { - width: 2200px; - display: flex; - flex-direction: row; - position: relative; -} - -.onion-pattern-offset-row { - left: -40px; -} - -/* With borders, circles range in size from 100 x 100px to 116 x 116px. */ -.circle { - opacity: 0.2; - position: relative; - width: 100px; - height: 100px; - border-radius: 50%; -} - -.inner { - position: absolute; -} - -.inner:nth-child(1){ - transform: translate(calc(12.5% - 2px),calc(12.5% - 2px)); - width: calc(100% * 0.75); - height: calc(100% * 0.75); - border-radius: 50%; -} - -.inner:nth-child(2){ - transform: translate(calc(40% - 2px),calc(40% - 2px)); - width: calc(100% * 0.5); - height: calc(100% * 0.5); - border-radius: 50%; -} - -.inner:nth-child(3){ - transform: translate(calc(108% - 2px),calc(108% - 2px)); - width: calc(100% * 0.25); - height: calc(100% * 0.25); - border-radius: 50%; -} - -.solid { - background-color: #fff; -} - -.border { - border: 4px solid #fff; -} - -.dashed { - border: 4px dashed #fff; -} - -.dotted { - border: 4px dotted #fff; -} - -.bold { - border: 8px solid #fff; -} - -.half { - width: 100px; - height: 50px; - border-radius: 50px 50px 0 0; -} - /* * Mobile specific css */ diff --git a/chrome/skin/dax-logo.svg b/chrome/skin/dax-logo.svg new file mode 100644 index 00000000..94ad7c35 --- /dev/null +++ b/chrome/skin/dax-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/chrome/skin/forwardArrow.png b/chrome/skin/forwardArrow.png deleted file mode 100644 index ceea950fe52e1a936b79bc4207e29bffe9296d01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcwPel00001 literal 258 zcwXxa@N?(olHy`uVBq!ia0vp^0zk~i!3HGN^yhQ|DVB6cUq=Rpjs4tz5?O)#ot`d^ zAsV8|2?`7qm6g>E6@2#g`xVTV`rKf-c!Z^)ruqN>|L2dSaX2#1m@&gkQd06gBX7W= zG!Elgxe|Bg+t>el@ZiA><|!K(C7BjE)=aSQFmz;g==vaeh$F~BhoP16gtWr+hCQrD zUiQ?~)Ce~+T{|MxwCtVIK?j%14F{Lr;g)cFByix_|9*Mx|u9-I@;s^7U0$GvgFJ?KiF*3|@FEE)lV`etc6AYfNelF{r G5}E+tVqe+- diff --git a/chrome/skin/searchLogo.png b/chrome/skin/searchLogo.png deleted file mode 100644 index 98ae319eb4c3579813b6e0acc3291edb6269bd60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcwPel00001 literal 1912 zcwPZ`2Z#8HP){#!Psox@Pfzoc$s~9w|@+ahZ!d{J^wuEoO|wf ze&v*LsHxdk0NWn9}V^YdoAVmmzKy(33QgT3-tvi~x>x}QK_7h*Vp#9|; zGa{tUNUKbd+Qhk)Z*?E+@g3CcO2>30%MEK~>+=8ui=q{%~gC ze+IWLFSo0zuS#Q0b6CH>Mp))9LTI%}DN%=Aga>+2eI7K{G_+|MCKsMNwNvs;#aZ0umTy0;Cy!r-ue^A3R2|4(eN1X?N?@|g@S7RxSwt>Fqb`pud#vN zof}cTZtTm}VE9G}fm=kblZzy75K7>cHmvHrIxW-GnBHsWij+fz`}uqGk+mZS8D zbqI zy0)$&+}X0apr*b$2HfJ9UZH!uXn)T3y@a~k>Dsyy>GQ;FWMB3Zj5EK5E+-!$1QGWz zBefqfcxW%u=T5AAN-0^ts3O$WM&~An(`++6k+HkZtpLc%N(I<%cdP>;aK5`G7Ah3- zsy@NC^oQtk3lJh&ug08$tztE~J3d6{4GF>iD-8_&eINR~37E^DOZT`u>j4yiwx+)= z)K8o`*;qUq&lj}>Tbg2$Q-81?ZCV!LuuQo5*;XrJ>CeV&`Ov{?BAyX!-+K+<4O#iL zR*5QNiMeb+bkU&?;u4Leb7}8^(+$InxFa#KNCak1HIY95c@&E+Az1Z{Fmn6=y7X-H zg-@oo-f)*IQc5A=h2)Ysg!}IhY;B55)L3lfWx|}2Q>1EB4H6U3xaYOJ@=$$xr|xV1MmpmT%aH&mVIZaQMVk-u~m~7)#2> z1P88NLiM^aOqvRk60KCi+1k`}07AW836mm&{b(#Uax$#sW?IqfwK4HmmzLsqekyd{ z06;NDFcuD>&-D`OH865+97vUL{~a``8AwUC79q1WwsCg>eTl2Rc?Esm1ZEZIF{?N) zHmDAR=QK&-9)d&vBzx6$^jTgIp!zio_GUd0;Bt~wG!2kBv89h;{>F1yo?aXu82St9 z?KM$2pw$3b;BPbIxopSNXh((+;g>kh42GxwtGL7%2($bf6#qM65gIE&BGJ z#x&W*_}8x>6p7HOARy3b!d3e~NYcb&6r&k`^92x`*9swIt7G~nzVn~`DCOA~(H9iO zom>F^=8N&*h>G{B74KCm2+*YlPz+&0gGs2K*mfIB=K|nu_zV;dMNcltLHC)X09Y5T zOeosl*bwK_+R{c<0ipgR0-dHfsA95UnO8x`*-h}q<$?S{^C<=3@uEea2CrRc^j`V` z)9m@^3yR_(fty$2d_t#3pFb&Kp`*>ZWEC2dg~5;Z0K6?K>%t0vsH{|hU%G0lKuXfr zzKKXS#UzLC+(r%hX?9(tb-4My-(0>BfQv;*R99HzpoS@>Sf5)?u;V7~&p+)o*-bkE z?)Rji=G=i>4sq1==iLiZ9qY(g_vZbFzfwsOk*56<@di^nX5sD6Rd(1E?ePS3dL zU-KFSMt}4c(`Mz7@x~5hC`j)+n-Qwql(D|C(^;tv&Z%A93LE zd;i_96`G2^s$UHZAN!c($))7{=1=!;9e>k#EV^hrQw%ne12)n^kFmO79pAhbB6TQ& zNikx7aV^`3HFym`I=%vqt z8uUX%Md)-0gAqla6m9ijAA^7Wnh*NX7Bj+>lnZ0YQ|L0sM@JZ=naE&&bcAVbj*c+b yF8qHZ%)>U;&<5NQLUaO62o7p9bw?g$X!|d)tw9_zOtgCd0000