- tbb-commits - lists.torproject.org

[tor-browser-build/maint-10.5] Bug 40363: Change bsaes git url
by sysrqb＠torproject.org 01 Oct '21

01 Oct '21

commit 1dca300f0de003e8d70332cc611010a5b1201ee5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Sep 21 23:05:29 2021 +0000 Bug 40363: Change bsaes git url --- projects/gobsaes/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/gobsaes/config b/projects/gobsaes/config index 0ced258..3674488 100644 --- a/projects/gobsaes/config +++ b/projects/gobsaes/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -git_url: https://git.schwanenlied.me/yawning/bsaes.git +git_url: https://gitlab.com/yawning/bsaes.git version: '[% c("abbrev") %]' git_hash: 26d1add596b6d800bdeeb3bc3b2c7b316c056b6d filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'

1 0

[tor-browser/tor-browser-78.15.0esr-10.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 30 Sep '21

30 Sep '21

commit 6799172f3ec7654db40f492b8ab175ee111cab04 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 30 20:01:10 2021 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 32c71313e4e1..1ecd3f264126 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 32c71313e4e1da24510402b9051543e144a3129b +Subproject commit 1ecd3f2641264b1389c90af03c6310dbdb53e7e6

1 0

[torbutton/maint-10.5] Bug 40049: Add banner for VPN survey to about:tor
by sysrqb＠torproject.org 30 Sep '21

30 Sep '21

commit 1ecd3f2641264b1389c90af03c6310dbdb53e7e6 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Sep 29 19:41:15 2021 +0000 Bug 40049: Add banner for VPN survey to about:tor --- chrome/content/aboutTor/aboutTor.xhtml | 11 ++++++++ chrome/skin/aboutTor.css | 47 ++++++++++++++++++++++++++++++++++ chrome/skin/tor-survey-icon.svg | 1 + 3 files changed, 59 insertions(+) diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml index f3a9032f..56318d48 100644 --- a/chrome/content/aboutTor/aboutTor.xhtml +++ b/chrome/content/aboutTor/aboutTor.xhtml @@ -65,6 +65,17 @@ </form> </div> + <div id="surveyBanner"> + <img id="surveyImg" src="resource://torbutton-assets/tor-survey-icon.svg" /> + <div id="surveyTextCol"> + <div id="surveyHeader">Do you use a VPN?</div> + <br /> + <div id="surveyDescription">We’d like to learn more about how and why our users use VPNs. Complete this short ten-minute survey to tell us about your experience:</div> + <br /> + <a id="surveyLink" target="_blank" href="http://eh5esdnd6fkbkapfc6nuyvkjgbtnzq2is72lmpwbdbxepd2z7zbgzsqd.onion/index…">Launch the Survey</a> + </div> + </div> + <div id="bottom"> <p id="donate" class="moreInfoLink">&aboutTor.donationBanner.freeToUse; <a href="https://donate.torproject.org/">&aboutTor.donationBanner.buttonA; »</a> diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css index 38486241..e0d692c9 100644 --- a/chrome/skin/aboutTor.css +++ b/chrome/skin/aboutTor.css @@ -220,6 +220,53 @@ body:not([showmanual]) .showForManual { background-color: rgba(12, 12, 13, 0.1); /* same as Firefox's about:home */ } +#surveyBanner { + width: 690px; + padding: 20px 25px 25px; + background: rgba(0, 0, 0, 0.3); + border-radius: 6px; + margin: 35px auto 0px; + display: flex; + flex-direction: row; + align-items: flex-start; + position: static; +} + +@media only screen and (min-width: 900px) { + #surveyBanner { + margin: 35px 0px 0px 135px; + } +} + +#surveyTextCol { + padding: 8px 0px 0px 15px; + font-size: 15px; + line-height: normal; + color: #FFFFFF; + width: 633px; +} + +#surveyHeader { + font-weight: bold; +} + +#surveyImg { + width: 32px; + position: static; +} + +div.surveyDescription, div.surveyLink { + padding-top: 10px; +} + +a#surveyLink { + text-decoration: underline; +} + +a#surveyLink:hover { + text-decoration: none; +} + /* #search-text is the search input field */ #search-text { flex: 1; diff --git a/chrome/skin/tor-survey-icon.svg b/chrome/skin/tor-survey-icon.svg new file mode 100644 index 00000000..2a0749bd --- /dev/null +++ b/chrome/skin/tor-survey-icon.svg @@ -0,0 +1 @@ +<svg fill="none" height="32" viewBox="0 0 32 32" width="32" xmlns="http://www.w3.org/2000/svg"><circle cx="16" cy="16" fill="#df58a9" r="16"/><path d="m16 5.6875c-2.735 0-5.3581 1.08649-7.29204 3.02046-1.93397 1.93394-3.02046 4.55704-3.02046 7.29204s1.08649 5.3581 3.02046 7.292c1.93394 1.934 4.55704 3.0205 7.29204 3.0205s5.3581-1.0865 7.292-3.0205c1.934-1.9339 3.0205-4.557 3.0205-7.292s-1.0865-5.3581-3.0205-7.29204c-1.9339-1.93397-4.557-3.02046-7.292-3.02046zm3.3646 2.40625c1.4118.60622 2.6355 1.57956 3.5437 2.81885.9082 1.2393 1.4679 2.6992 1.6208 4.228h-3.0649c-.1692-2.5604-1.0947-5.0129-2.6592-7.04685zm-2.8174 0c1.8605 1.89985 2.9907 4.39535 3.1914 7.04685h-7.4772c.2007-2.6515 1.3309-5.147 3.1914-7.04685zm-3.9132 0h.561c-1.5639 2.03425-2.4893 4.48665-2.6592 7.04685h-3.06493c.15266-1.5287.71207-2.9886 1.62007-4.2279.908-1.23927 2.13146-2.21266 3.54306-2.81895zm0 15.81245c-1.4118-.606-2.63538-1.5793-3.54342-2.8187-.90803-1.2393-1.46734-2.6993-1.61971-4.2281h3.06493c.1692 2.5604 1.0 947 5.0129 2.6592 7.0468zm2.8188 0c-1.8605-1.8998-2.9907-4.3953-3.1914-7.0468h7.4759c-.2008 2.6515-1.331 5.147-3.1914 7.0468zm3.9132 0h-.5624c1.5651-2.0335 2.4906-4.4863 2.6593-7.0468h3.0648c-.1523 1.5286-.7115 2.9885-1.6193 4.2278-.9077 1.2392-2.1309 2.2127-3.5424 2.819z" fill="#240a3b"/></svg> \ No newline at end of file

1 0

[Git][tpo/applications/fenix] Pushed new tag tor-browser-91.2.0-10.5-2-build2
by Matthew Finkel (＠sysrqb) 30 Sep '21

30 Sep '21

Matthew Finkel pushed new tag tor-browser-91.2.0-10.5-2-build2 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-91.… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-91.2.0-10.5-2] Bug 40193: Add banner for VPN survey to Android homepage
by Matthew Finkel (＠sysrqb) 30 Sep '21

30 Sep '21

Matthew Finkel pushed to branch tor-browser-91.2.0-10.5-2 at The Tor Project / Applications / fenix Commits: 0dffacd8 by Matthew Finkel at 2021-09-30T18:16:20+00:00 Bug 40193: Add banner for VPN survey to Android homepage - - - - - 11 changed files: - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt - + app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorInfoBannerViewHolder.kt - app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt - + app/src/main/res/drawable/info_banner_padded_background.xml - + app/src/main/res/drawable/vpn_survey_icon.png - app/src/main/res/layout/fragment_home.xml - + app/src/main/res/layout/tor_info_banner.xml - app/src/main/res/values/colors.xml Changes: ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt ===================================== @@ -25,6 +25,7 @@ import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.NoCollectionsMessageViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.PrivateBrowsingDescriptionViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.TorBootstrapPagerViewHolder +import org.mozilla.fenix.home.sessioncontrol.viewholders.TorInfoBannerViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.TabInCollectionViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.TopSitePagerViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding.ExperimentDefaultBrowserCardViewHolder @@ -90,6 +91,7 @@ sealed class AdapterItem(@LayoutRes val viewType: Int) { } object PrivateBrowsingDescription : AdapterItem(PrivateBrowsingDescriptionViewHolder.LAYOUT_ID) + object TorInfoBanner : AdapterItem(TorInfoBannerViewHolder.LAYOUT_ID) object NoCollectionsMessage : AdapterItem(NoCollectionsMessageViewHolder.LAYOUT_ID) object TorBootstrap : AdapterItem(TorBootstrapPagerViewHolder.LAYOUT_ID) @@ -229,6 +231,10 @@ class SessionControlAdapter( view, interactor ) + TorInfoBannerViewHolder.LAYOUT_ID -> TorInfoBannerViewHolder( + view, + interactor + ) TorBootstrapPagerViewHolder.LAYOUT_ID -> TorBootstrapPagerViewHolder( view, components, ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt ===================================== @@ -94,6 +94,11 @@ interface SessionControlController { */ fun handlePrivateBrowsingLearnMoreClicked() + /** + * @see [TabSessionInteractor.onTorInfoBannerLaunchClicked] + */ + fun handleTorInfoBannerLaunchClicked() + /** * @see [TopSiteInteractor.onRenameTopSiteClicked] */ @@ -647,4 +652,12 @@ class DefaultSessionControlController( override fun handleTorNetworkSettingsClicked() { openTorNetworkSettings() } + + override fun handleTorInfoBannerLaunchClicked() { + activity.openToBrowserAndLoad( + searchTermOrURL = SupportUtils.TOR_INFO_BANNER_URL, + newTab = true, + from = BrowserDirection.FromHome + ) + } } ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt ===================================== @@ -23,6 +23,12 @@ interface TabSessionInteractor { * "Common myths about private browsing" link in private mode. */ fun onPrivateBrowsingLearnMoreClicked() + + /** + * Shows the Info Banner web page in a new tab. Called when a user clicks on the + * "Learn More" button. + */ + fun onTorInfoBannerLaunchClicked() } /** @@ -412,4 +418,8 @@ class SessionControlInteractor( override fun onTorBootstrapNetworkSettingsClicked() { controller.handleTorNetworkSettingsClicked() } + + override fun onTorInfoBannerLaunchClicked() { + controller.handleTorInfoBannerLaunchClicked() + } } ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt ===================================== @@ -92,7 +92,7 @@ private fun showCollections( } } -private fun privateModeAdapterItems() = listOf(AdapterItem.PrivateBrowsingDescription) +private fun privateModeAdapterItems() = listOf(AdapterItem.TorInfoBanner) private fun bootstrapAdapterItems() = listOf(AdapterItem.TorBootstrap) ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorInfoBannerViewHolder.kt ===================================== @@ -0,0 +1,33 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.mozilla.fenix.home.sessioncontrol.viewholders + +import android.graphics.Typeface +import android.text.SpannableString +import android.text.Spanned +import android.text.style.StyleSpan +import android.view.View +import androidx.recyclerview.widget.RecyclerView +import kotlinx.android.synthetic.main.tor_info_banner.view.* +import org.mozilla.fenix.R +import org.mozilla.fenix.home.sessioncontrol.TabSessionInteractor + +class TorInfoBannerViewHolder( + view: View, + private val interactor: TabSessionInteractor +) : RecyclerView.ViewHolder(view) { + + init { + with(view.info_banner_launch_button) { + setOnClickListener { + interactor.onTorInfoBannerLaunchClicked() + } + } + } + + companion object { + const val LAYOUT_ID = R.layout.tor_info_banner + } +} ===================================== app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt ===================================== @@ -40,6 +40,7 @@ object SupportUtils { const val DONATE_URL = "https://donate.torproject.org/" const val TB_MANUAL_URL = "https://tb-manual.torproject.org/mobile-tor" const val TOR_RELEASES = "https://www.torproject.org/releases/" + const val TOR_INFO_BANNER_URL = "http://eh5esdnd6fkbkapfc6nuyvkjgbtnzq2is72lmpwbdbxepd2z7zbgzsqd.onion/index…" enum class SumoTopic(internal val topicStr: String) { FENIX_MOVING("sync-delist"), ===================================== app/src/main/res/drawable/info_banner_padded_background.xml ===================================== @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="@color/info_banner_padded_background_color"> + <item + android:bottom="6dp" + android:top="6dp"> + <shape android:shape="rectangle"> + <corners android:radius="4dp" /> + </shape> + </item> +</ripple> ===================================== app/src/main/res/drawable/vpn_survey_icon.png ===================================== Binary files /dev/null and b/app/src/main/res/drawable/vpn_survey_icon.png differ ===================================== app/src/main/res/layout/fragment_home.xml ===================================== @@ -94,7 +94,8 @@ android:textColor="#DEFFFFFF" android:textSize="40sp" android:lineSpacingMultiplier="1.1" - app:layout_scrollFlags="scroll" /> + app:layout_scrollFlags="scroll" + android:visibility="gone" /> </com.google.android.material.appbar.AppBarLayout> ===================================== app/src/main/res/layout/tor_info_banner.xml ===================================== @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="utf-8"?> + +<androidx.constraintlayout.widget.ConstraintLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/info_banner_wrapper" + style="@style/OnboardingCardLightWithPadding" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clipChildren="false" + android:clipToPadding="false"> + + <LinearLayout + android:id="@+id/info_banner_header_wrapper" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + android:importantForAccessibility="no"> + + <ImageView + android:id="@+id/tor_info_banner_icon" + android:layout_width="wrap_content" + android:layout_height="32dp" + android:layout_marginEnd="10dp" + android:adjustViewBounds="true" + android:clickable="false" + android:focusable="false" + android:importantForAccessibility="no" + app:srcCompat="@drawable/vpn_survey_icon"/> + + <TextView + android:id="@+id/info_banner_header" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ellipsize="none" + android:lineSpacingExtra="6dp" + android:paddingHorizontal="4dp" + android:paddingTop="4dp" + android:scrollHorizontally="false" + android:textAlignment="viewStart" + android:textColor="?primaryText" + android:textSize="20sp" + android:text="Do you use a VPN?" /> + </LinearLayout> + + <TextView + android:id="@+id/info_banner_description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ellipsize="none" + android:lineSpacingExtra="6dp" + android:paddingHorizontal="4dp" + android:paddingTop="4dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/info_banner_header_wrapper" + android:scrollHorizontally="false" + android:textAlignment="viewStart" + android:textColor="?primaryText" + android:textSize="16sp" + android:text="We’d like to learn more about how and why our users use VPNs. Complete this short ten-minute survey to tell us about your experience:" /> + + <Button + style="@style/PositiveButton" + android:id="@+id/info_banner_launch_button" + android:text="Learn More" + android:layout_marginTop="16dp" + android:textSize="18dp" + android:textColor="@android:color/black" + android:background="@drawable/info_banner_padded_background" + android:fontFamily="Roboto-Medium" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/info_banner_description" /> + +</androidx.constraintlayout.widget.ConstraintLayout> ===================================== app/src/main/res/values/colors.xml ===================================== @@ -424,4 +424,7 @@  <color name="toolbar_menu_transparent">@android:color/transparent</color> + +  + <color name="info_banner_padded_background_color">#A76FFA</color> </resources> View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/0dffacd86eee8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/0dffacd86eee8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[torbutton/master] Bug 40047: New string for Security Level panel
by sysrqb＠torproject.org 28 Sep '21

28 Sep '21

commit 775ba23e4753c0692b0e32c7e36a716ad1d85dbb Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Sep 15 18:16:21 2021 -0500 Bug 40047: New string for Security Level panel --- chrome/locale/en-US/torbutton.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/chrome/locale/en-US/torbutton.dtd b/chrome/locale/en-US/torbutton.dtd index b9ae0f00..e5d56b64 100644 --- a/chrome/locale/en-US/torbutton.dtd +++ b/chrome/locale/en-US/torbutton.dtd @@ -45,6 +45,7 @@ <!ENTITY torbutton.prefs.sec_custom_summary "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> <!ENTITY torbutton.prefs.sec_restore_defaults "Restore Defaults"> <!ENTITY torbutton.prefs.sec_advanced_security_settings "Advanced Security Settings…"> +<!ENTITY torbutton.prefs.sec_change "Change…"> <!ENTITY torbutton.circuit_display.title "Tor Circuit"> <!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site">

1 0

[torbutton/master] Merge remote-tracking branch 'richardgl/40048'
by sysrqb＠torproject.org 28 Sep '21

28 Sep '21

commit 77d1306c3b8de9a0ce5eb62b80c68cee1629ab79 Merge: c35cfae7 61da3213 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Sep 28 20:25:44 2021 +0000 Merge remote-tracking branch 'richardgl/40048' chrome/skin/tor-circuit-display.css | 131 ++++++++++++++++++--------------- chrome/skin/tor-circuit-line-first.svg | 10 +-- chrome/skin/tor-circuit-line-last.svg | 10 +-- chrome/skin/tor-circuit-line.svg | 9 ++- 4 files changed, 85 insertions(+), 75 deletions(-)

1 0

[torbutton/master] Merge remote-tracking branch 'richardgl/40047'
by sysrqb＠torproject.org 28 Sep '21

28 Sep '21

commit c35cfae73c2fbdd67cd85ae1f49c05475c28744f Merge: f3fa2a7a 775ba23e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Sep 28 20:25:38 2021 +0000 Merge remote-tracking branch 'richardgl/40047' chrome/locale/en-US/torbutton.dtd | 1 + 1 file changed, 1 insertion(+)

1 0

[torbutton/master] Bug 40048: Protonify Circuit Display Panel
by sysrqb＠torproject.org 28 Sep '21

28 Sep '21

commit 61da3213a2e22836d2c1b0c4069ddb776ca3ac0d Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Sep 20 16:01:51 2021 -0500 Bug 40048: Protonify Circuit Display Panel --- chrome/skin/tor-circuit-display.css | 131 ++++++++++++++++++--------------- chrome/skin/tor-circuit-line-first.svg | 10 +-- chrome/skin/tor-circuit-line-last.svg | 10 +-- chrome/skin/tor-circuit-line.svg | 9 ++- 4 files changed, 85 insertions(+), 75 deletions(-) diff --git a/chrome/skin/tor-circuit-display.css b/chrome/skin/tor-circuit-display.css index 6f132db8..5f37bb71 100644 --- a/chrome/skin/tor-circuit-display.css +++ b/chrome/skin/tor-circuit-display.css @@ -6,39 +6,64 @@ Each bullet in the circuit node list is supposed to represent a Tor circuit node and lines drawn between them to represent Tor network inter-relay connections. */ +#circuit-display-container { + margin-inline: 8px; + margin-top: 0px; + margin-bottom: 4px; + padding: 0px 3px; +} + +#circuit-display-container > toolbarseparator { + margin-block: 0px; + margin-inline: -3px; + width: calc(100% + 6px); +} + #circuit-display-headline { - margin: 0; + margin-inline-start: 8px; } #circuit-display-header { background-image: url(chrome://torbutton/skin/torbutton.svg); background-repeat: no-repeat; - background-position: 0 50%; + background-position: 4px 50%; background-size: 16px auto; min-height: 16px; -moz-context-properties: fill, fill-opacity; fill: currentColor; - /* icon indent + 16px icon width + 6px description margin - (total of 12px margin with the native 6px description margin) */ - padding-inline: calc(2em + 22px) 1em; - /* 16px icon width + 12px margin */ - padding-inline-start: 28px; + margin-block: 8px; } #circuit-display-header:-moz-locale-dir(rtl) { background-position-x: right; } +#circuit-display-header > hbox { + margin-inline-start: 16px; +} + #circuit-display-content { - padding-inline: 2em 1em; - padding-block: 1em; + width: 100%; +} + +#circuit-display-content > * { + margin-inline: 0px; + margin-inline-start: 16px; + margin-top: 0px; + margin-bottom: 8px; +} + +#circuit-display-content > hbox { + display: flex; +} + +#circuit-reload-button-container { + padding-top: 8px; + justify-content: flex-end; } #circuit-reload-content { cursor: default; - padding: 0 0 1em; - padding-inline-end: 3em; - padding-inline-start: calc(2em + 24px); width: 100%; } @@ -54,10 +79,8 @@ and lines drawn between them to represent Tor network inter-relay connections. /* Format the circuit node list. */ ul#circuit-display-nodes { - line-height: 26px; - margin-top: 8px; - margin-bottom: 0; - padding-inline-start: 28px; + line-height:32px; + padding-inline-start: 8px; } /* Hide default bullets, and draw our own bullets */ @@ -68,6 +91,10 @@ ul#circuit-display-nodes li { list-style: none; padding-inline-start: 1.5em; white-space: nowrap; + max-height: 32px; + -moz-context-properties: stroke, stroke-opacity; + stroke: currentColor; + stroke-opacity: 100%; } ul#circuit-display-nodes li:dir(rtl) { @@ -82,78 +109,51 @@ ul#circuit-display-nodes li:last-child { background-image: url(chrome://torbutton/skin/tor-circuit-line-last.svg); } -.circuit-guard-help { - -moz-context-properties: fill, stroke; - fill: #6200a4; - stroke: #6200a4; -} - -.circuit-guard-help:-moz-lwtheme-brighttext { - fill: #D476FF; - stroke: #D476FF; -} - .circuit-ip-address { font-size: 80%; - opacity: 0.4; + opacity: 0.7; padding-inline-start: 3px; } .circuit-guard-info { font-size: 80%; + color: var(--button-primary-bgcolor); font-weight: bold; - color: #6200a4; padding-inline-start: 3px; } -.circuit-guard-info:-moz-lwtheme-brighttext { - color:#D476FF; -} - #circuit-reload-button { - background-color: #0060df; - border-radius: 3px; - border: none; - color: white; - cursor: pointer; - font-size: 18px; - padding: 10px; + background-color: var(--button-primary-bgcolor); + border-radius: 4px; + border-width: 0px; + color: var(--button-primary-color); + font-weight: 600; + padding: 8px 16px; + margin: 0; } - #circuit-reload-button:hover { - background-color: #0058cf; + background-color: var(--button-primary-hover-bgcolor); } #circuit-reload-button:active { - background-color: #0050bf; + background-color: var(--button-primary-active-bgcolor); } #circuit-guard-note-container { - margin-top: 10px; + } #circuit-guard-note-container div { - margin-left: 3px; - margin-right: 3px; + margin-inline-start: 8px; } .circuit-guard-name { font-weight: bold; - color: #6200a4; -} - -.circuit-guard-name:-moz-lwtheme-brighttext { - color:#D476FF; } .circuit-link { cursor: pointer; - color: #0000ee; -} - - -.circuit-link:-moz-lwtheme-brighttext { - color: #A9A9A9; + color: var(--lwt-popup-brighttext-url-color); } .circuit-link:hover { @@ -169,18 +169,27 @@ ul#circuit-display-nodes li:last-child { } .circuit-onion::after { - background-color: #e3e3e3; - border-radius: 2px; - color: black; + background-color: var(--button-bgcolor);; + border-radius: 4px; + color: var(--button-color); content: attr(data-text-clicktocopy); font-size: 80%; opacity: 0; - padding: 5px; + padding: 5px 10px; margin: 10px; text-align: center; transition: opacity 0.3s cubic-bezier(0.07, 0.95, 0, 1); } +.circuit-onion:hover::after { + background-color: var(--button-hover-bgcolor); +} + +.circuit-onion:active::after { + background-color: var(--button-active-bgcolor); +} + + .circuit-onion-copied::after { content: attr(data-text-copied); opacity: 1; diff --git a/chrome/skin/tor-circuit-line-first.svg b/chrome/skin/tor-circuit-line-first.svg index 6c070daa..1981ee87 100644 --- a/chrome/skin/tor-circuit-line-first.svg +++ b/chrome/skin/tor-circuit-line-first.svg @@ -1,6 +1,6 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="15" height="40"> - <g stroke="#9a9a9a" stroke-width="3" fill="white"> - <line x1='50%' y1='50%' x2='50%' y2='100%'/> - <circle cx='50%' cy='50%' r='4.5'/> +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="32"> + <g stroke="context-stroke" opacity="context-stroke-opacity" stroke-width="2" fill="transparent"> + <circle cx="50%" cy="50%" r="6"/> + <line x1="50%" y1="22" x2="50%" y2="100%"/> </g> -</svg> \ No newline at end of file +</svg> diff --git a/chrome/skin/tor-circuit-line-last.svg b/chrome/skin/tor-circuit-line-last.svg index 4ed0ff05..19c4adaa 100644 --- a/chrome/skin/tor-circuit-line-last.svg +++ b/chrome/skin/tor-circuit-line-last.svg @@ -1,6 +1,6 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="15" height="40"> - <g stroke="#9a9a9a" stroke-width="3" fill="white"> - <line x1='50%' y1='0%' x2='50%' y2='50%'/> - <circle cx='50%' cy='50%' r='4.5'/> +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="32"> + <g stroke="context-stroke" opacity="context-stroke-opacity" stroke-width="2" fill="transparent"> + <line x1="50%" y1="0%" x2="50%" y2="10"/> + <circle cx="50%" cy="50%" r="6"/> </g> -</svg> \ No newline at end of file +</svg> diff --git a/chrome/skin/tor-circuit-line.svg b/chrome/skin/tor-circuit-line.svg index ada7cd59..00717f6c 100644 --- a/chrome/skin/tor-circuit-line.svg +++ b/chrome/skin/tor-circuit-line.svg @@ -1,6 +1,7 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="15" height="40"> - <g stroke="#9a9a9a" stroke-width="3" fill="white"> - <line x1="50%" y1="0%" x2="50%" y2="100%"/> - <circle cx="50%" cy="50%" r="4.5"/> +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="32"> + <g stroke="context-stroke" opacity="context-stroke-opacity" stroke-width="2" fill="transparent"> + <line x1="50%" y1="0%" x2="50%" y2="10"/> + <circle cx="50%" cy="50%" r="6"/> + <line x1="50%" y1="22" x2="50%" y2="100%"/> </g> </svg>

1 0

[tor-browser-build/maint-10.5] Bug 40352: Add desktop-only (Windows/macOS/Linux) Makefile rules
by sysrqb＠torproject.org 28 Sep '21

28 Sep '21

commit 13167b5d52bf30eeb115afec4e283916b5ea292c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 2 12:01:34 2021 +0200 Bug 40352: Add desktop-only (Windows/macOS/Linux) Makefile rules --- Makefile | 12 ++++++++++++ doc/MAKEFILE.txt | 10 ++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a3393fc..0660389 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,9 @@ release-android-x86_64: submodule-update release-android-aarch64: submodule-update $(rbm) build release --target release --target torbrowser-android-aarch64 +release-desktop: submodule-update + $(rbm) build release --target release --target torbrowser-all-desktop + release-linux-x86_64: submodule-update $(rbm) build release --target release --target torbrowser-linux-x86_64 @@ -59,6 +62,9 @@ alpha-android-x86_64: submodule-update alpha-android-aarch64: submodule-update $(rbm) build release --target alpha --target torbrowser-android-aarch64 +alpha-desktop: submodule-update + $(rbm) build release --target alpha --target torbrowser-all-desktop + alpha-linux-x86_64: submodule-update $(rbm) build release --target alpha --target torbrowser-linux-x86_64 @@ -98,6 +104,9 @@ nightly-android-x86_64: submodule-update nightly-android-aarch64: submodule-update $(rbm) build release --target nightly --target torbrowser-android-aarch64 +nightly-desktop: submodule-update + $(rbm) build release --target nightly --target torbrowser-all-desktop + nightly-linux-x86_64: submodule-update $(rbm) build release --target nightly --target torbrowser-linux-x86_64 @@ -137,6 +146,9 @@ testbuild-android-x86_64: submodule-update testbuild-android-aarch64: submodule-update $(rbm) build release --target testbuild --target torbrowser-android-aarch64 +testbuild-desktop: submodule-update + $(rbm) build release --target testbuild --target torbrowser-all-desktop + testbuild-linux-x86_64: submodule-update $(rbm) build release --target testbuild --target torbrowser-linux-x86_64 diff --git a/doc/MAKEFILE.txt b/doc/MAKEFILE.txt index b198985..9603463 100644 --- a/doc/MAKEFILE.txt +++ b/doc/MAKEFILE.txt @@ -8,9 +8,11 @@ Build Tor Browser for the release channel, for all supported platforms. The resulting build can be found in directory release/$version. release-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, - android-x86,android-x86_64,android-aarch64} + android-x86,android-x86_64,android-aarch64,desktop,android} ----------------------------------------------------------------------- -Same as release, for the selected platform only. +Same as release, for the selected platform only. The "desktop" platform +means Linux, Windows and macOS. The "android" platform means android for +all architectures we support. alpha ----- @@ -18,7 +20,7 @@ Build Tor Browser for the alpha channel, for all supported platforms. The resulting build can be found in directory alpha/$version. alpha-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, - android-x86,android-x86_64,android-aarch64} + android-x86,android-x86_64,android-aarch64,desktop,android} --------------------------------------------------------------------- Same as alpha, for the selected platform only. @@ -32,7 +34,7 @@ components. The resulting build can be found in directory nightly/$date nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, - android-x86,android-x86_64,android-aarch64} + android-x86,android-x86_64,android-aarch64,desktop,android} ----------------------------------------------------------------------- Same as nightly, for the selected platform only.

1 0