This is an automated email from the git hooks/post-receive script.
meskio pushed a change to branch main in repository bridgedb.
from f07614a Merge branch 'mr/48' new ef6d3d1 Fix missing assets on info, maintenance, howto pages new f4a5ae7 Add missing padding on main new ba694e1 Merge remote-tracking branch 'gitlab/mr/50'
The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Summary of changes: bridgedb/distributors/https/templates/base.html | 14 +++++++------- frontend/assets/scss/_bridges.scss | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-)
This is an automated email from the git hooks/post-receive script.
meskio pushed a commit to branch main in repository bridgedb.
commit ef6d3d1ed1f711f6f2ffc5266d385d74dbfe322a Author: kez kez@torproject.org AuthorDate: Wed Sep 7 14:23:49 2022 -0700
Fix missing assets on info, maintenance, howto pages
Closes #40057 --- bridgedb/distributors/https/templates/base.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/bridgedb/distributors/https/templates/base.html b/bridgedb/distributors/https/templates/base.html index 1f16ca0..16394b5 100644 --- a/bridgedb/distributors/https/templates/base.html +++ b/bridgedb/distributors/https/templates/base.html @@ -13,18 +13,18 @@ <meta name="description" content="Tor Bridges"> <meta name="author" content="The Tor Project">
- <link rel="icon" type="image/x-icon" href="/assets/images/favicon.ico"> - <link rel="stylesheet" href="/assets/css/bootstrap.min.css"> - <link rel="stylesheet" href="/assets/css/font-awesome.min.css"> - <link rel="stylesheet" href="/assets/css/main.css"> + <link rel="icon" type="image/x-icon" href="/static/images/favicon.ico"> + <link rel="stylesheet" href="/static/css/bootstrap.css"> + <link rel="stylesheet" href="/static/fonts/fontawesome/css/all.min.css"> + <link rel="stylesheet" href="/static/css/main.css"> <!--[if IE 7]> - <link rel="stylesheet" href="/assets/css/font-awesome-ie7.min.css"> + <link rel="stylesheet" href="/static/css/font-awesome-ie7.min.css"> <![endif]--> % if rtl: - <link rel="stylesheet" href="/assets/css/rtl.css"> + <link rel="stylesheet" href="/static/css/rtl.css"> % endif
- <script type="text/javascript" src="/assets/js/bridges.js"></script> + <script type="text/javascript" src="/static/js/bridges.js"></script> </head>
<body>
This is an automated email from the git hooks/post-receive script.
meskio pushed a commit to branch main in repository bridgedb.
commit f4a5ae7c9556e69007879bdc6c0351bcfb38d9a2 Author: kez kez@torproject.org AuthorDate: Wed Sep 7 14:34:10 2022 -0700
Add missing padding on main
Closes #40058 --- frontend/assets/scss/_bridges.scss | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/frontend/assets/scss/_bridges.scss b/frontend/assets/scss/_bridges.scss index e14d767..3fd940b 100644 --- a/frontend/assets/scss/_bridges.scss +++ b/frontend/assets/scss/_bridges.scss @@ -92,3 +92,7 @@ border-top-left-radius: 0; border-bottom-left-radius: 0; } + +main { + padding-bottom: 5rem; +}
This is an automated email from the git hooks/post-receive script.
meskio pushed a commit to branch main in repository bridgedb.
commit ba694e10bd81ed88b05c75de9d7af4b9ed90ac9b Merge: ef6d3d1 f4a5ae7 Author: meskio meskio@torproject.org AuthorDate: Thu Sep 8 17:24:08 2022 +0200
Merge remote-tracking branch 'gitlab/mr/50'
frontend/assets/scss/_bridges.scss | 4 ++++ 1 file changed, 4 insertions(+)
tor-commits@lists.torproject.org
-
gitolite role