February 2015 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'public/bug9635_warnings_025'
by nickm＠torproject.org 02 Feb '15

02 Feb '15

commit d03e1da232ada2e0d3a3de3dbf6885caec74e4e0 Merge: 3b96bf6 41ba4f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 2 16:31:32 2015 -0500 Merge remote-tracking branch 'public/bug9635_warnings_025' Conflicts: src/test/test.c changes/bug9635 | 3 +++ src/or/circuitbuild.c | 11 ++++++++--- src/or/command.c | 1 - src/or/onion.c | 24 +++++++++++++++--------- src/or/onion.h | 3 ++- src/or/onion_fast.c | 10 ++++++---- src/or/onion_fast.h | 3 ++- src/or/onion_ntor.c | 19 ++++++++++++++++--- src/or/onion_ntor.h | 3 ++- src/or/onion_tap.c | 10 ++++++---- src/or/onion_tap.h | 3 ++- src/or/relay.c | 5 +++-- src/test/bench.c | 6 ++++-- src/test/test.c | 10 +++++----- src/test/test_ntor_cl.c | 2 +- 15 files changed, 75 insertions(+), 38 deletions(-) diff --cc src/or/onion.c index 43fb63c,b5e801d..4864792 --- a/src/or/onion.c +++ b/src/or/onion.c @@@ -562,9 -582,11 +567,10 @@@ onion_skin_client_handshake(int type memcpy(rend_authenticator_out, reply+DIGEST_LEN, DIGEST_LEN); return 0; -#ifdef CURVE25519_ENABLED case ONION_HANDSHAKE_TYPE_NTOR: if (reply_len < NTOR_REPLY_LEN) { - log_warn(LD_CIRC, "ntor reply was not of the correct length."); + if (msg_out) + *msg_out = "ntor reply was not of the correct length."; return -1; } { diff --cc src/test/test.c index ff4f517,e6f79a6..85a7ad6 --- a/src/test/test.c +++ b/src/test/test.c @@@ -106,11 -264,12 +106,11 @@@ test_onion_handshake(void *arg /* client handshake 2 */ memset(c_keys, 0, 40); - tt_assert(! onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40)); - test_assert(! onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40, - NULL)); ++ tt_assert(! onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40, NULL)); - test_memeq(c_keys, s_keys, 40); + tt_mem_op(c_keys,OP_EQ, s_keys, 40); memset(s_buf, 0, 40); - test_memneq(c_keys, s_buf, 40); + tt_mem_op(c_keys,OP_NE, s_buf, 40); } done: crypto_dh_free(c_dh); @@@ -178,19 -337,19 +178,19 @@@ test_bad_onion_handshake(void *arg /* Client: Case 1: The server sent back junk. */ s_buf[64] ^= 33; - tt_int_op(-1, ==, + tt_int_op(-1, OP_EQ, - onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40)); + onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40, NULL)); s_buf[64] ^= 33; /* Let the client finish; make sure it can. */ - tt_int_op(0, ==, + tt_int_op(0, OP_EQ, - onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40)); + onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40, NULL)); - test_memeq(s_keys, c_keys, 40); + tt_mem_op(s_keys,OP_EQ, c_keys, 40); /* Client: Case 2: The server sent back a degenerate DH. */ memset(s_buf, 0, sizeof(s_buf)); - tt_int_op(-1, ==, + tt_int_op(-1, OP_EQ, - onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40)); + onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40, NULL)); done: crypto_dh_free(c_dh); @@@ -238,12 -398,12 +238,12 @@@ test_ntor_handshake(void *arg /* client handshake 2 */ memset(c_keys, 0, 40); - tt_int_op(0, ==, onion_skin_ntor_client_handshake(c_state, s_buf, - c_keys, 400, NULL)); + tt_int_op(0, OP_EQ, onion_skin_ntor_client_handshake(c_state, s_buf, - c_keys, 400)); ++ c_keys, 400, NULL)); - test_memeq(c_keys, s_keys, 400); + tt_mem_op(c_keys,OP_EQ, s_keys, 400); memset(s_buf, 0, 40); - test_memneq(c_keys, s_buf, 40); + tt_mem_op(c_keys,OP_NE, s_buf, 40); done: ntor_handshake_state_free(c_state);

1 0

[webwml/master] PM position taken down.
by nickm＠torproject.org 02 Feb '15

02 Feb '15

commit b9a6e81d6fa3abfb9563980f71de361b82558eed Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 2 15:39:29 2015 -0500 PM position taken down. --- about/en/jobs-projectmanager.wml | 2 ++ about/en/jobs.wml | 14 +++++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/about/en/jobs-projectmanager.wml b/about/en/jobs-projectmanager.wml index 4ecec03..fe5bb4e 100644 --- a/about/en/jobs-projectmanager.wml +++ b/about/en/jobs-projectmanager.wml @@ -11,6 +11,8 @@ </div> <div id="maincol"> <h1>The Tor Project is looking for a Project Manager!</h1> +<h1>Note: we've gotten enough applications for this position for now. Thank you!</h1> + <p> A project manager is the person who brings order to chaos. You will coordinate and help track diff --git a/about/en/jobs.wml b/about/en/jobs.wml index 05cdca4..5ffc56b 100644 --- a/about/en/jobs.wml +++ b/about/en/jobs.wml @@ -12,16 +12,12 @@ <div id="maincol"> <h1>The Tor Project is always looking for more great people to join our team!</h1> -#<p>At the moment, we don't have any official open positions. Please check back -#soon, though! In the meantime, you may want to glance at our -#<a href="<page getinvolved/volunteer>">volunteers</a> page. +<p>At the moment, we don't have any official open positions. Please check back +soon, though! In the meantime, you may want to glance at our +<a href="<page getinvolved/volunteer>">volunteers</a> page. -<p>Specifically, we're looking for the following people currently: -</p> - -<ul> -<li><a href="<page about/jobs-projectmanager>">Project Manager</a></li> -</ul> +#<p>Specifically, we're looking for the following people currently: +#</p> <p>In the past, we looked for the following people:</p>

1 0

[bridgedb/develop] Add support for generating QRCodes for bridge lines on bridges.html.
by isis＠torproject.org 02 Feb '15

02 Feb '15

commit 9692235f7f08724be7bfd542553f563c8bab517d Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jan 15 21:58:55 2015 +0000 Add support for generating QRCodes for bridge lines on bridges.html. * FIXES #11345 https://bugs.torproject.org/11345 --- lib/bridgedb/HTTPServer.py | 9 ++++- lib/bridgedb/qrcodes.py | 59 ++++++++++++++++++++++++++++++++ lib/bridgedb/templates/bridges.html | 64 ++++++++++++++++++++++++++++++++++- 3 files changed, 130 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 6aebba1..b073542 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -49,6 +49,7 @@ from bridgedb.Filters import filterBridgesByIP6 from bridgedb.Filters import filterBridgesByTransport from bridgedb.Filters import filterBridgesByNotBlockedIn from bridgedb.parse import headers +from bridgedb.qrcodes import generateQR from bridgedb.safelog import logSafely @@ -785,6 +786,11 @@ class WebResourceBridges(resource.Resource): rendered = bridgeLines else: request.setHeader("Content-Type", "text/html; charset=utf-8") + qrcode = None + qrjpeg = generateQR(bridgeLines) + + if qrjpeg: + qrcode = 'data:image/jpeg;base64,%s' % base64.b64encode(qrjpeg) try: langs = translations.getLocaleFromHTTPRequest(request) rtl = translations.usingRTLLang(langs) @@ -792,7 +798,8 @@ class WebResourceBridges(resource.Resource): rendered = template.render(strings, rtl=rtl, lang=langs[0], - answer=bridgeLines) + answer=bridgeLines, + qrcode=qrcode) except Exception as err: rendered = replaceErrorPage(err) diff --git a/lib/bridgedb/qrcodes.py b/lib/bridgedb/qrcodes.py new file mode 100644 index 0000000..ae25f06 --- /dev/null +++ b/lib/bridgedb/qrcodes.py @@ -0,0 +1,59 @@ +# -*- coding: utf-8 ; test-case-name: bridgedb.test.test_qrcodes ; -*- +#_____________________________________________________________________________ +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2014-2015, Isis Lovecruft +# :license: see LICENSE for licensing information +#_____________________________________________________________________________ + +"""Utilities for working with QRCodes.""" + + +import cStringIO +import logging + + +def generateQR(bridgelines, imageFormat=u'JPEG'): + """Generate a QRCode for the client's bridge lines. + + :param str bridgelines: The Bridge Lines which we are distributing to the + client. + :rtype: str or ``None`` + + :returns: The generated QRCode, as a string. + """ + logging.debug("Attempting to encode bridge lines into a QRCode...") + + if not bridgelines: + return + + try: + import qrcode + + qr = qrcode.QRCode() + qr.add_data(bridgelines) + buf = cStringIO.StringIO() + img = qr.make_image().resize([350, 350]) + img.save(buf, imageFormat) + buf.seek(0) + imgstr = buf.read() + logging.debug("Got QRCode image string.") + + return imgstr + + except ImportError as error: + logging.error(str(error)) + logging.debug(("You'll need the qrcode Python module for this to " + "work. On Debian-based systems, this should be in the " + "python-qrcode package.")) + except KeyError as error: + logging.error(str(error)) + logging.debug(("It seems python-imaging doesn't understand how to " + "save in the %s format.") % imgFormat) + except Exception as error: + logging.error(("There was an error while attempting to generate the " + "QRCode: %s") % str(error)) diff --git a/lib/bridgedb/templates/bridges.html b/lib/bridgedb/templates/bridges.html index d3c10c1..8048919 100644 --- a/lib/bridgedb/templates/bridges.html +++ b/lib/bridgedb/templates/bridges.html @@ -1,7 +1,7 @@ ## -*- coding: utf-8 -*- <%inherit file="base.html"/> -<%page args="strings, rtl=False, lang='en', answer=0, **kwargs"/> +<%page args="strings, rtl=False, lang='en', answer=0, qrcode=0, **kwargs"/> </div> </div> @@ -31,6 +31,20 @@ window.alert(e); } } + + function displayOrHide(element) { + try { + e = document.getElementById(element); + + if (e.style.display === 'none') { + document.getElementById(element).style.display = 'block'; + } else if (e.style.display === 'block') { + document.getElementById(element).style.display = 'none'; + } + } catch (e) { + window.alert(e); + } + } </script> <div class="container-narrow"> @@ -66,6 +80,50 @@ ${answer.replace("\n", "<br />")} title="Select all bridge lines"> <i class="icon icon-2x icon-paste"></i>   ${_("""Select All""")} </button> +% if qrcode: + <a class="btn btn-primary" type="button" id="qrcodebtn" + href="${qrcode}" title="Show QRCode for bridge lines" + onclick="displayOrHide('qrcode')"> + <i class="icon icon-2x icon-qrcode"></i>   ${_("""Show QRCode""")} + </a> +% endif + </div> + + <div class="modal" id="qrcode" style="display: none;"> + <div class="modal-dialog modal-sm" style="width: 400px;"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" aria-hidden="true" + onclick="displayOrHide('qrcode')"> + × + </button> + <h4 class="modal-title">${_("""QRCode for your bridge lines""")}</h4> + </div> + <div class="modal-body"> +% if qrcode: + <p style="text-align: center;"> + <img width="350" height="350" + title="QRCode for your bridge lines from BridgeDB" + src="${qrcode}" /> + </p> +% else: + <p class="text-danger"> +## TRANSLATORS: Please translate this into some silly way to say +## "There was a problem!" in your language. For example, +## for Italian, you might translate this into "Mama mia!", +## or for French: "Sacrebleu!". :) +${_("""Uh oh, spaghettios!""")} +${_("""It seems there was an error getting your QRCode.""")} + <i class="icon icon-frown"></i> + </p> +% endif + <p> +${_("""This QRCode contains your bridge lines. Scan it with a QRCode """ \ + """reader to copy your bridge lines onto mobile and other devices.""")} + </p> + </div> + </div> + </div> </div> </div> @@ -133,6 +191,10 @@ ${_("""Uh oh, spaghettios!""")} <script type="text/javascript"> // Make the 'Select All' button clickable: document.getElementById('selectbtn').className = "btn btn-primary"; + + // Remove the href attribute which opens the QRCode image as a data URL if + // JS is disabled: + document.getElementById('qrcodebtn').removeAttribute('href'); </script> <hr />

1 0

[bridgedb/develop] Add qrcode==5.0.1 and pillow>=2.6.1 to Pip requirements.txt file.
by isis＠torproject.org 02 Feb '15

02 Feb '15

commit 6917daa0b38dd276a87e39d2d9f1a7f1eb90031e Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jan 15 22:01:21 2015 +0000 Add qrcode==5.0.1 and pillow>=2.6.1 to Pip requirements.txt file. Pillow, in Debian jessie, is in the `python-imaging` package (currently version 2.6.1). However, on PyPI, Pillow is simply `pillow` (currently version 2.7.0). Both of these are backwards compatible with the python-imaging package in Debian wheezy (currently version 1.1.6, and likely to never get updated, because it is being replaced with pillow). And any of these will currently work with BridgeDB. --- requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/requirements.txt b/requirements.txt index de393b1..6448920 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,5 +7,7 @@ pycrypto==2.6.1 pyOpenSSL==0.13.1 pygeoip==0.2.7 pygpgme==0.3 +pillow>=2.6.1 +qrcode==5.0.1 recaptcha-client==1.0.6 zope.interface==3.6.1

1 0

[bridgedb/develop] Change qrcode module import to be attempted only once.
by isis＠torproject.org 02 Feb '15

02 Feb '15

commit 438021c278906a08c2a74e154673a5e26cbfbedc Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Feb 1 00:13:25 2015 +0000 Change qrcode module import to be attempted only once. --- lib/bridgedb/qrcodes.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/qrcodes.py b/lib/bridgedb/qrcodes.py index ae25f06..a76cf8f 100644 --- a/lib/bridgedb/qrcodes.py +++ b/lib/bridgedb/qrcodes.py @@ -16,6 +16,14 @@ import cStringIO import logging +try: + import qrcode +except ImportError: + qrcode = False + logging.warn("Could not import Python qrcode module.") + logging.debug(("You'll need the qrcode Python module for this to " + "work. On Debian-based systems, this should be in the " + "python-qrcode package.")) def generateQR(bridgelines, imageFormat=u'JPEG'): """Generate a QRCode for the client's bridge lines. @@ -31,8 +39,10 @@ def generateQR(bridgelines, imageFormat=u'JPEG'): if not bridgelines: return + if not qrcode: + logging.info("Not creating QRCode for bridgelines; no qrcode module.") + try: - import qrcode qr = qrcode.QRCode() qr.add_data(bridgelines) @@ -45,11 +55,6 @@ def generateQR(bridgelines, imageFormat=u'JPEG'): return imgstr - except ImportError as error: - logging.error(str(error)) - logging.debug(("You'll need the qrcode Python module for this to " - "work. On Debian-based systems, this should be in the " - "python-qrcode package.")) except KeyError as error: logging.error(str(error)) logging.debug(("It seems python-imaging doesn't understand how to "

1 0

[bridgedb/develop] Add support for generating QRCodes with 'bridge://' schema for Orbot.
by isis＠torproject.org 02 Feb '15

02 Feb '15

commit 66ef631c51176777da212ab02f7a0d47dff00579 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Feb 1 00:15:59 2015 +0000 Add support for generating QRCodes with 'bridge://' schema for Orbot. --- lib/bridgedb/qrcodes.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/qrcodes.py b/lib/bridgedb/qrcodes.py index a76cf8f..8016262 100644 --- a/lib/bridgedb/qrcodes.py +++ b/lib/bridgedb/qrcodes.py @@ -25,13 +25,15 @@ except ImportError: "work. On Debian-based systems, this should be in the " "python-qrcode package.")) -def generateQR(bridgelines, imageFormat=u'JPEG'): + +def generateQR(bridgelines, imageFormat=u'JPEG', bridgeSchema=False): """Generate a QRCode for the client's bridge lines. :param str bridgelines: The Bridge Lines which we are distributing to the client. + :param bool bridgeSchema: If ``True``, prepend ``'bridge://'`` to the + beginning of each bridge line before QR encoding. :rtype: str or ``None`` - :returns: The generated QRCode, as a string. """ logging.debug("Attempting to encode bridge lines into a QRCode...") @@ -43,16 +45,26 @@ def generateQR(bridgelines, imageFormat=u'JPEG'): logging.info("Not creating QRCode for bridgelines; no qrcode module.") try: + if bridgeSchema: + # See https://bugs.torproject.org/12639 for why bridge:// is used. + # (Hopefully, Orbot will pick up the ACTION_VIEW intent.) + schema = 'bridge://' + prefixed = [] + for line in bridgelines.strip().split('\n'): + prefixed.append(schema + line) + bridgelines = '\n'.join(prefixed) + + logging.debug("QR encoding bridge lines: %s" % bridgelines) qr = qrcode.QRCode() qr.add_data(bridgelines) + buf = cStringIO.StringIO() img = qr.make_image().resize([350, 350]) img.save(buf, imageFormat) buf.seek(0) + imgstr = buf.read() - logging.debug("Got QRCode image string.") - return imgstr except KeyError as error: @@ -62,3 +74,4 @@ def generateQR(bridgelines, imageFormat=u'JPEG'): except Exception as error: logging.error(("There was an error while attempting to generate the " "QRCode: %s") % str(error)) +

1 0

[bridgedb/develop] Merge branch 'fix/11345-qrcodes_r2' into develop
by isis＠torproject.org 02 Feb '15

02 Feb '15

commit 0ade64bf9da9fed955501d02085121f07b6db3a3 Merge: f1bdddb 66ef631 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Feb 2 19:38:14 2015 +0000 Merge branch 'fix/11345-qrcodes_r2' into develop lib/bridgedb/HTTPServer.py | 9 +++- lib/bridgedb/qrcodes.py | 77 +++++++++++++++++++++++++++++++++++ lib/bridgedb/templates/bridges.html | 64 ++++++++++++++++++++++++++++- requirements.txt | 2 + 4 files changed, 150 insertions(+), 2 deletions(-) diff --cc requirements.txt index 0844c14,6448920..5e71d4a --- a/requirements.txt +++ b/requirements.txt @@@ -4,8 -4,10 +4,10 @@@ Mako==0.8. Twisted==13.2.0 https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b07… pycrypto==2.6.1 -pyOpenSSL==0.13.1 +pyOpenSSL==0.14 pygeoip==0.2.7 pygpgme==0.3 + pillow>=2.6.1 + qrcode==5.0.1 recaptcha-client==1.0.6 zope.interface==3.6.1

1 0

[tor/master] Test for 13865.
by nickm＠torproject.org 02 Feb '15

02 Feb '15

commit a9caeb961fbaa796c99dab5e35f6622f25ddd59a Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Feb 2 21:11:23 2015 +0200 Test for 13865. --- src/test/test_cmdline_args.py | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/src/test/test_cmdline_args.py b/src/test/test_cmdline_args.py index c8e68e8..5764197 100755 --- a/src/test/test_cmdline_args.py +++ b/src/test/test_cmdline_args.py @@ -49,9 +49,12 @@ def contents(fn): finally: f.close() -def run_tor(args, failure=False): - p = subprocess.Popen([TOR] + args, stdout=subprocess.PIPE) - output, _ = p.communicate() +def run_tor(args, failure=False, stdin=None): + kwargs = {} + if stdin != None: + kwargs['stdin'] = subprocess.PIPE + p = subprocess.Popen([TOR] + args, stdout=subprocess.PIPE, **kwargs) + output, _ = p.communicate(input=stdin) result = p.poll() if result and not failure: raise UnexpectedFailure() @@ -234,20 +237,26 @@ class CmdlineTests(unittest.TestCase): def test_cmdline_args(self): default_torrc = NamedTemporaryFile() torrc = NamedTemporaryFile() - torrc.write("SocksPort 9999\n") - torrc.write("SocksPort 9998\n") - torrc.write("ORPort 9000\n") - torrc.write("ORPort 9001\n") - torrc.write("Nickname eleventeen\n") - torrc.write("ControlPort 9500\n") - torrc.close() + contents = ("SocksPort 9999\n" + "SocksPort 9998\n" + "ORPort 9000\n" + "ORPort 9001\n" + "Nickname eleventeen\n" + "ControlPort 9500\n") + torrc.write(contents) default_torrc.write("") default_torrc.close() + torrc.close() out_sh = out_nb = out_fl = None + + opts_stdin = [ "-f", "-", + "--defaults-torrc", default_torrc.name, + "--dump-config", "short" ] opts = [ "-f", torrc.name, "--defaults-torrc", default_torrc.name, "--dump-config", "short" ] try: + out_0 = run_tor(opts_stdin,stdin=contents) out_1 = run_tor(opts) out_2 = run_tor(opts+["+ORPort", "9003", "SocksPort", "9090", @@ -258,9 +267,18 @@ class CmdlineTests(unittest.TestCase): os.unlink(torrc.name) os.unlink(default_torrc.name) + out_0 = [ l for l in lines(out_0) if not l.startswith("DataDir") ] out_1 = [ l for l in lines(out_1) if not l.startswith("DataDir") ] out_2 = [ l for l in lines(out_2) if not l.startswith("DataDir") ] + self.assertEqual(out_0, + ["ControlPort 9500", + "Nickname eleventeen", + "ORPort 9000", + "ORPort 9001", + "SocksPort 9999", + "SocksPort 9998"]) + self.assertEqual(out_1, ["ControlPort 9500", "Nickname eleventeen", @@ -268,6 +286,7 @@ class CmdlineTests(unittest.TestCase): "ORPort 9001", "SocksPort 9999", "SocksPort 9998"]) + self.assertEqual(out_2, ["ExtORPort 9005", "Nickname eleventeen",

1 0

[tor/master] Merge branch 'feature13865_test'
by nickm＠torproject.org 02 Feb '15

02 Feb '15

commit 3b96bf68315083f83a5f807ccf6f41feafeeb445 Merge: 5c807f3 a9caeb9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 2 14:38:47 2015 -0500 Merge branch 'feature13865_test' src/test/test_cmdline_args.py | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-)

1 0

[bridgedb/develop] Change base.html template background to use <body style="...">.
by isis＠torproject.org 02 Feb '15

02 Feb '15

commit a27070b26e95b1cf5388ff43613751fd0ef3f364 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jan 15 20:41:44 2015 +0000 Change base.html template background to use <body style="...">. --- lib/bridgedb/templates/base.html | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html index 69a4a80..0c80e46 100644 --- a/lib/bridgedb/templates/base.html +++ b/lib/bridgedb/templates/base.html @@ -32,7 +32,11 @@ span { % endif </head> -<body> +<body style="background: url(/assets/tor-roots-blue.svg); + background-repeat: no-repeat; + background-attachment: scroll; + background-position: 2% 100px; + background-size: 23%;"> <div class="container-narrow"> <div class="masthead"> <div class="nav nav-tabs"> @@ -45,12 +49,6 @@ span { </li> </ul> </div> - <p style="float: left; text-align: left; - margin-left: -23%; margin-bottom: -30%;"> - <a href="https://www.torproject.org"> - <img src="/assets/tor-roots-blue.svg" - height="23%" width="23%"/></a> - </p> </div>

1 0