From 76b3c5fc73995b4a4a8bf39bbe7372501406e638 Mon Sep 17 00:00:00 2001 From: Lucy Cifferello <12953208+elvece@users.noreply.github.com> Date: Mon, 11 Jan 2021 08:27:44 -0700 Subject: [PATCH] merge padding directives --- source/_static/default.css | 11 ++-- source/_static/js/main.js | 8 +++ source/user-manual/connecting.rst | 6 ++- source/user-manuals/tor/firefox/index.rst | 24 +++++++++ source/user-manuals/tor/index.rst | 63 +++++++++++++++++++++++ 5 files changed, 102 insertions(+), 10 deletions(-) create mode 100644 source/user-manuals/tor/firefox/index.rst create mode 100644 source/user-manuals/tor/index.rst diff --git a/source/_static/default.css b/source/_static/default.css index d75abe4..2524443 100644 --- a/source/_static/default.css +++ b/source/_static/default.css @@ -5,7 +5,7 @@ body, h1, h2, h3, h4, nav, .topbar, .topbar-main, .tocsection, .form-control, .b h1 { font-size: 2rem; - margin-top: 2rem; + margin-top: 3.5rem; } h2 { @@ -25,7 +25,6 @@ p, nav a { letter-spacing: 0.75px; } - a, a:visited, .headerlink { color: #ff4961!important; } @@ -60,10 +59,6 @@ h1, h2 { display: inline; } -.main-content { - margin-top: 1rem; -} - .bd-sidebar { background: none; } @@ -174,6 +169,6 @@ nav.bd-links > ul.nav { background-color: lightgray; } -#main-content.row { - margin-top: 6rem!important; +.set-padding { + padding-top: 75px!important; } \ No newline at end of file diff --git a/source/_static/js/main.js b/source/_static/js/main.js index 6620bf7..686b208 100644 --- a/source/_static/js/main.js +++ b/source/_static/js/main.js @@ -9,3 +9,11 @@ $(document).ready(function () { $(this).parent().children(".admonition-title").toggleClass("open"); }) }); +$(window).on('load', function () { + console.log("loaded") + + $('a').click(function () { + console.log('tag clicked') + $("body.scrolled").addClass("set-padding") + }) +}) diff --git a/source/user-manual/connecting.rst b/source/user-manual/connecting.rst index f691fa3..187f0fd 100644 --- a/source/user-manual/connecting.rst +++ b/source/user-manual/connecting.rst @@ -12,7 +12,7 @@ If you accidentally leak your Embassy's addresses, do not worry. You Embassy is Tor === -Connecting to your Embassy over :ref:`tor` requires using a browser that supports *.onion* URLs. +Connecting to your Embassy over :ref:`tor` requires using a browser that supports :code:`.onion` URLs. Currently, Tor is the default and our recommended approach for most users. It *just works*. The one drawback, however, is latency; onion-routed communications over Tor can be slow. For a lightning fast experience, you can connect to your Embassy over LAN (below), but this requires additional setup. @@ -24,7 +24,9 @@ Below are a list of our recommended browsers for Tor: * `Tor Browser `_ (Mac, Windows, Linux, Android) * `Brave `_ (Mac, Windows, Linux) -.. seealso:: :ref:`Setting up Tor for browsers ` +.. seealso:: :ref:`Setting up Tor on your operating system ` + +.. seealso:: :ref:`Setting up Firefox with Tor ` .. seealso:: `Announcing the Consulate Browser! `_ diff --git a/source/user-manuals/tor/firefox/index.rst b/source/user-manuals/tor/firefox/index.rst new file mode 100644 index 0000000..103633c --- /dev/null +++ b/source/user-manuals/tor/firefox/index.rst @@ -0,0 +1,24 @@ +.. _tor-firefox-setup: + +***************** +Firefox Tor Setup +***************** + +.. warning:: + These guides assume you have completed :ref:`setting up Tor for your operating system`. Please visit this section first before you proceed as it is required for Firefox to properly work with Tor. + +After completing the steps above to setup Tor on your operating system: + +#. Go to :code:`about:config` in the URL bar. +#. Accept any warnings that may appear about accessing advanced settings. +#. Search for :code:`dom.securecontext.whitelist_onions` and set the value to :code:`true`. +#. Restart Firefox. +#. Select your platform below to complete setup: + +.. toctree:: + :maxdepth: 1 + + Android + Mac + Linux + Windows \ No newline at end of file diff --git a/source/user-manuals/tor/index.rst b/source/user-manuals/tor/index.rst new file mode 100644 index 0000000..8d5cae3 --- /dev/null +++ b/source/user-manuals/tor/index.rst @@ -0,0 +1,63 @@ +.. _tor-system-setup: + + +************** +Setting up Tor +************** + +Operating Systems +================= + +Setting up Tor on your operating system enables other applications to utilize its functionality beyond Tor Browser. For example, a bitcoin wallet software that connects to a remote bitcoin node over Tor, or Firefox web browser. In the following guides, we will walk you through setting up Tor globally. That way, you can integrate other applications that use Embassy services all over Tor! + +Select your operating system to get started: + +.. toctree:: + :maxdepth: 1 + + MacOS + Windows + Linux + Android + +.. _tor-browser-setup: + +Browsers +======== + +To access websites that provide a Tor address (the :code:`.onion` URL), a Tor enabled browser is required. + +Tor Browser +----------- + +The `Tor Browser `_ works right out of the box. Simply download, launch, and plug in a :code:`.onion` URL to access a website over Tor. No extra configuration is needed. However, it is important to note that this is the least flexible option - browser extensions are not enabled, so utilizing password managers such as Bitwarden is not possible. It is also the slowest experience for ordinary web browsing due to the extra hops it makes across the internet. + +Brave Browser +------------- + +Alternatively, you can use `Brave `_ to access websites over Tor. After downloading and launching, you can open a Brave Private Window with Tor by pressing :code`Option ⌥ + Command ⌘ + N`. +However, this approach is also restricting, since browser extensions are disabled in this mode as well. Ordinary web browsing is also somewhat slower in a Private Window with Tor, so you might choose to navigate between Brave browser windows for either clearnet or Tor websites. This is a somewhat less uniform experience. + +Firefox Browser +--------------- + +Start9 recommends configuring Firefox to resolve Tor addresses. This is by far the most featureful and flexible approach. It requires a bit more work (< 5 minutes), but the resulting experience is worth the effort. It gives you the best of both worlds: you can browse clearnet websites without latency and visit Onion websites without switching browsers. And for Embassy owners, there is the added benefit of using your `Bitwarden password manager `_! + +After completing the steps above to setup Tor on your operating system: + +#. Go to :code:`about:config` in the URL bar. +#. Accept any warnings that may appear about accessing advanced settings. +#. Search for :code:`dom.securecontext.whitelist_onions` and set the value to :code:`true`. +#. Restart Firefox. +#. Select your platform below to complete setup: + +- :ref:`Android ` +- :ref:`Linux ` +- :ref:`Mac ` +- :ref:`Windows ` + +.. toctree:: + :maxdepth: 1 + :hidden: + + Firefox \ No newline at end of file