[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [webwml/staging] Merge branch 'master' into staging



commit b817b1e8254219fbbe34f703e1340cfe31b2e686
Merge: 3d40243 d603837
Author: Sebastian Hahn <sebastian@xxxxxxxxxxxxxx>
Date:   Fri Nov 18 14:04:09 2016 +0100

    Merge branch 'master' into staging

 .htaccess                                     |  35 +++
 Makefile                                      |   4 +-
 about/en/board.wml                            | 126 +++++----
 about/en/contact.wml                          |   2 +-
 about/en/contributors.wml                     |  18 +-
 about/en/corepeople.wml                       |  45 ++-
 about/en/jobs-ooni-ux-designer.wml            | 105 +++++++
 about/en/jobs-ooni.wml                        | 151 ----------
 about/en/jobs.wml                             |  10 +-
 css/donate-style.css                          |   2 +
 css/layout.css                                |  14 -
 docs/en/debian.wml                            |  19 +-
 docs/en/faq-abuse.wml                         |   2 +-
 docs/en/faq.wml                               |  38 +--
 docs/en/hidden-services.wml                   |   2 +-
 docs/en/pluggable-transports.wml              | 271 ++++++++++--------
 docs/en/rpms.wml                              | 100 +------
 docs/en/signing-keys.wml                      |  30 +-
 docs/en/tor-doc-osx.wml                       |   4 +-
 docs/en/tor-doc-relay.wml                     |   3 +-
 docs/en/tor-doc-unix.wml                      |   2 -
 docs/en/tor-manual.wml                        |   2 +-
 docs/en/verifying-signatures.wml              |  20 +-
 donate/en/donate-options.wml                  |  79 ++----
 donate/en/donor-faq.wml                       |   2 +-
 download/en/download-easy.wml                 |  64 ++---
 download/en/download-unix.wml                 |   2 +-
 download/en/download.wml                      |  35 +--
 eff/en/tor-legal-faq.wml                      |   4 +-
 en/index.wml                                  |   2 +-
 getinvolved/en/tshirt.wml                     |  10 +-
 getinvolved/en/volunteer.wml                  | 185 ++++++-------
 images/2016-tor-logo-heart.png                | Bin 0 -> 35104 bytes
 images/PT/2016-07-how-to-use-PT.png           | Bin 0 -> 494386 bytes
 images/tbb-macosx-step-1.png                  | Bin 21334 -> 0 bytes
 images/tbb-macosx-step-2.png                  | Bin 20451 -> 0 bytes
 images/tbb-macosx-step-3.png                  | Bin 13846 -> 0 bytes
 include/donatehead.wmi                        |   2 +-
 include/head.wmi                              |  15 +-
 include/mirrors-table.wmi                     | 202 ++++++--------
 include/tor-mirrors.csv                       | 209 +++++++-------
 include/versions.wmi                          |  58 ++--
 projects/en/gettor.wml                        |   6 +
 projects/en/obfsproxy-debian-instructions.wml | 150 ----------
 projects/en/obfsproxy-instructions.wml        | 164 -----------
 projects/en/obfsproxy.wml                     | 102 -------
 projects/en/projects.wml                      |  12 +-
 projects/en/sidenav.wmi                       |  10 +-
 projects/en/torbrowser.wml                    |  17 +-
 projects/torbrowser/RecommendedTBBVersions    |  20 +-
 rule-41/widget.js.orig                        | 381 ++++++++++++++++++++++++++
 rule-41/widget.min.js-orig                    |  42 +++
 52 files changed, 1328 insertions(+), 1450 deletions(-)

diff --cc css/donate-style.css
index 8dfbcc2,55cae54..671d097
--- a/css/donate-style.css
+++ b/css/donate-style.css
@@@ -229,100 -218,9 +229,102 @@@ blockquote::before 
  blockquote footer{
  	color: rgb(240,240,240);
  }
 +.donate-button {
 +	background-color: #4FAB76;
 +	border-color: #47996A;
 +}
 +.donate-button:hover,
 +.donate-button:focus,
 +.donate-button:active,
 +.donate-button:active:hover,
 +.donate-button:active:focus{
 +	background-color: #47996A;
 +	border-color: #47996A; 
 +}
 +#other-ways-section{
 +	display: none;
 +}
 +#other-ways-section > .container-fluid{
 +	padding: 0;
 +}
 +.hundred.toptwenty{
 +	text-align: justify;
 +	margin-top: 0;
 +}
 +.row-eqheight{
 +    overflow: hidden; 
 +    padding-bottom: 20px
 +}
 +.row-eqheight > [class*="col-"]{
 +    margin-bottom: -99999px;
 +    padding-bottom: 99999px;
 +}
 +.other-ways-title{
 +	margin: 10px 0;
 +}
 +.other-ways-title > h3{
 +	display: inline;
 +}
 +.other-ways-icon{
 +	background: transparent;
 +	margin-top: -10px;
 +	margin-right: 5px;
 +	border:0;
 +}
 +.bitcoin{
 +	padding-top: 10px;
 +	padding-left: 30px;
 +	padding-right: 30px;
 +}
 +#bitpayDonation > .well > .form-group {
 +    margin-right: 0;
 +    margin-left: 0;
 +}
 +#bitpayDonation > .well {
 +	box-shadow: none;
 +	border-radius: 7px;
 +	margin-bottom: 0;
 +}
 +.check-eutransfer{
 +	padding-top: 10px;
 +	padding-left: 30px;
 +	padding-right: 30px;
 +	border-left: 1px dashed #e3e3e3;
 +}
 +.minor-other-ways{
 +	background-color: #FAFAFA;
 +}
 +.even-more{
 +	padding: 25px 0;
 +	background-color: #FAFAFA;
 +}
 +.other-ways-img{
 +	width: 100%;
 +	max-width: 160px;
 +}
 +.img-thumbnail.other-ways-img {
 +	padding: 1px;
 +	transition: none 0s ease 0s;
 +	border: 2px solid rgb(221, 221, 221);
 +}
 +.get-in-touch{
 +	background-color: #35734F;
 +	color: #fff;
 +}
 +.title {
 +    min-height: 80px;
 +    margin-top: 20px;
 +    margin-bottom: 20px;
 +    border-right: 3px solid #3D855B;
 +    padding-top: 25px;
 +}
 +.detail {
 +    margin-bottom: 0px;
 +    margin-top: 50px;
 +}
  footer.footer{
+ 	margin-top: 20px;
+     bottom: 0;
      width: 100%;
      /* Set the height of the footer here */
      /*height: 65px;*/
diff --cc include/head.wmi
index 7dd267a,faf8dd1..296a54c
--- a/include/head.wmi
+++ b/include/head.wmi
@@@ -39,21 -40,6 +40,7 @@@
     <![endif]-->
   #  <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script>
     # end WML to generate css/js paths 
-    <!--[if !(lt IE 8)]><!-->
-    <script type="text/javascript">
-      var banner_config = {
-        localAssets: true, //
-      };
 +
-      (function(){
-        var e = document.createElement('script'); e.type='text/javascript'; e.async = true;
-        e.src = 'rule-41/widget.min.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(e, s);
-      })();
-    </script>
-    <!--<![endif]-->
- 
-  
  </head>
  <body>
  <div id="wrap">

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits