[bridgedb] branch main updated (a05d4ce -> f07614a)
This is an automated email from the git hooks/post-receive script. meskio pushed a change to branch main in repository bridgedb. from a05d4ce Add changelog for version 0.14 new 7aa9f62 Fix <picture> not rendering on prod new b8e7e03 Merge branch 'fix-card-images' into 'main' new 79ad6f2 Use lektor-scss to build the SCSS during the lektor site build new 08da841 Merge branch 'fix-frontend-scss' into 'main' new 8ae4021 lektor-scss package was never actually committed new a8469ef Update lego new f07614a Merge branch 'mr/48' The 7 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: frontend/.gitignore | 2 ++ frontend/assets/scss/_cryptocurrency.scss | 1 - frontend/assets/scss/_donate.scss | 1 - frontend/assets/scss/_eoy.scss | 1 - frontend/assets/scss/_includes.scss | 1 + frontend/assets/scss/_tpo.scss | 1 - frontend/assets/scss/bootstrap-grid.css | 1 - frontend/assets/scss/bootstrap-grid.css.map | 1 - frontend/assets/scss/bootstrap.scss | 3 ++- frontend/assets/static/css | 1 - frontend/assets/static/css/digital-climate-strike | 1 + frontend/assets/static/css/images | 1 + frontend/build.sh | 2 +- frontend/configs/scss.ini | 2 ++ frontend/lego | 2 +- frontend/packages/lektor-scss | 1 + frontend/templates/home.html | 7 +------ 17 files changed, 13 insertions(+), 16 deletions(-) delete mode 120000 frontend/assets/scss/_cryptocurrency.scss delete mode 120000 frontend/assets/scss/_donate.scss delete mode 120000 frontend/assets/scss/_eoy.scss create mode 120000 frontend/assets/scss/_includes.scss delete mode 120000 frontend/assets/scss/_tpo.scss delete mode 120000 frontend/assets/scss/bootstrap-grid.css delete mode 120000 frontend/assets/scss/bootstrap-grid.css.map mode change 120000 => 100644 frontend/assets/scss/bootstrap.scss delete mode 120000 frontend/assets/static/css create mode 120000 frontend/assets/static/css/digital-climate-strike create mode 120000 frontend/assets/static/css/images create mode 100644 frontend/configs/scss.ini create mode 120000 frontend/packages/lektor-scss -- To stop receiving notification emails like this one, please contact the administrator of this repository.
This is an automated email from the git hooks/post-receive script. meskio pushed a commit to branch main in repository bridgedb. commit 7aa9f62b9ba4ddaa0a939f8f7dbb41bca7b193a2 Author: kez <kez@torproject.org> AuthorDate: Wed Aug 24 14:29:52 2022 -0700 Fix <picture> not rendering on prod Closes #40055 --- frontend/templates/home.html | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/frontend/templates/home.html b/frontend/templates/home.html index 52578a2..27f9c7f 100644 --- a/frontend/templates/home.html +++ b/frontend/templates/home.html @@ -4,12 +4,7 @@ <div class="card-body"> <h2 class="card-title ">{{ _('Step ' + number|string) }}</h2> <p class="card-text">{{ _(text) }}</p> - <div class=""> - <picture> - <source type="image/svg+xml" srcset="{{ '/static/images/{}.svg'.format(image_name) | asseturl }}"> - <img src="{{ '/static/images/{}.png'.format(image_name) | asseturl }}"> - </picture> - </div> + <img src="{{ '/static/images/{}.svg'.format(image_name) | asseturl }}"> </div> <a href="{{ link }}" class="btn btn-primary">{{ _(text) }}</a> </div> -- To stop receiving notification emails like this one, please contact the administrator of this repository.
This is an automated email from the git hooks/post-receive script. meskio pushed a commit to branch main in repository bridgedb. commit 79ad6f2d71a767778773a2a8d2b303e0ef9d0c63 Author: kez <kez@torproject.org> AuthorDate: Wed Aug 24 15:15:25 2022 -0700 Use lektor-scss to build the SCSS during the lektor site build Fixes broken CSS on the production site --- frontend/.gitignore | 2 ++ frontend/assets/scss/{bootstrap.scss => _includes.scss} | 0 frontend/assets/scss/bootstrap.scss | 3 ++- frontend/assets/static/css | 1 - frontend/assets/static/css/digital-climate-strike | 1 + frontend/assets/static/css/images | 1 + frontend/build.sh | 2 +- frontend/configs/scss.ini | 2 ++ 8 files changed, 9 insertions(+), 3 deletions(-) diff --git a/frontend/.gitignore b/frontend/.gitignore index a82e424..0f85329 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -1,3 +1,5 @@ +assets/static/css/*.css + node_modules .sass-cache diff --git a/frontend/assets/scss/bootstrap.scss b/frontend/assets/scss/_includes.scss similarity index 100% copy from frontend/assets/scss/bootstrap.scss copy to frontend/assets/scss/_includes.scss diff --git a/frontend/assets/scss/bootstrap.scss b/frontend/assets/scss/bootstrap.scss deleted file mode 120000 index e655926..0000000 --- a/frontend/assets/scss/bootstrap.scss +++ /dev/null @@ -1 +0,0 @@ -../../lego/assets/scss/bootstrap.scss \ No newline at end of file diff --git a/frontend/assets/scss/bootstrap.scss b/frontend/assets/scss/bootstrap.scss new file mode 100644 index 0000000..f5b3ffc --- /dev/null +++ b/frontend/assets/scss/bootstrap.scss @@ -0,0 +1,2 @@ +@import "includes"; +@import "bridges"; diff --git a/frontend/assets/static/css b/frontend/assets/static/css deleted file mode 120000 index 12e4567..0000000 --- a/frontend/assets/static/css +++ /dev/null @@ -1 +0,0 @@ -../../lego/assets/static/css \ No newline at end of file diff --git a/frontend/assets/static/css/digital-climate-strike b/frontend/assets/static/css/digital-climate-strike new file mode 120000 index 0000000..b910197 --- /dev/null +++ b/frontend/assets/static/css/digital-climate-strike @@ -0,0 +1 @@ +../../../lego/assets/static/css/digital-climate-strike/ \ No newline at end of file diff --git a/frontend/assets/static/css/images b/frontend/assets/static/css/images new file mode 120000 index 0000000..227bf12 --- /dev/null +++ b/frontend/assets/static/css/images @@ -0,0 +1 @@ +../../../lego/assets/static/css/images/ \ No newline at end of file diff --git a/frontend/build.sh b/frontend/build.sh index 2781682..6e6323b 100755 --- a/frontend/build.sh +++ b/frontend/build.sh @@ -28,7 +28,7 @@ then git clone https://gitlab.torproject.org/tpo/translation/ --single-branch --branch=bridgedb i18n fi -lektor build -O public_tmp +lektor build -O public_tmp -f scss rm -rf public mkdir public diff --git a/frontend/configs/scss.ini b/frontend/configs/scss.ini new file mode 100644 index 0000000..e9bd5f5 --- /dev/null +++ b/frontend/configs/scss.ini @@ -0,0 +1,2 @@ +output_dir = assets/static/css +output_style = compact -- To stop receiving notification emails like this one, please contact the administrator of this repository.
This is an automated email from the git hooks/post-receive script. meskio pushed a commit to branch main in repository bridgedb. commit b8e7e037cb54bfda3e6999be7d06975e4abcfa8b Merge: a05d4ce 7aa9f62 Author: kezzle <kez@torproject.org> AuthorDate: Wed Aug 24 22:16:40 2022 +0000 Merge branch 'fix-card-images' into 'main' Fix <picture> not rendering on prod Closes #40055 See merge request tpo/anti-censorship/bridgedb!45 frontend/templates/home.html | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.
This is an automated email from the git hooks/post-receive script. meskio pushed a commit to branch main in repository bridgedb. commit 08da8419b8eec4e2856a552e2bb156747ea42999 Merge: b8e7e03 79ad6f2 Author: kezzle <kez@torproject.org> AuthorDate: Wed Aug 24 22:27:09 2022 +0000 Merge branch 'fix-frontend-scss' into 'main' Use lektor-scss to build the SCSS during the lektor site build See merge request tpo/anti-censorship/bridgedb!46 frontend/.gitignore | 2 ++ frontend/assets/scss/{bootstrap.scss => _includes.scss} | 0 frontend/assets/scss/bootstrap.scss | 3 ++- frontend/assets/static/css | 1 - frontend/assets/static/css/digital-climate-strike | 1 + frontend/assets/static/css/images | 1 + frontend/build.sh | 2 +- frontend/configs/scss.ini | 2 ++ 8 files changed, 9 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.
This is an automated email from the git hooks/post-receive script. meskio pushed a commit to branch main in repository bridgedb. commit 8ae4021a0f4e42161d16985bf841125bdbd00f98 Author: kez <kez@torproject.org> AuthorDate: Thu Aug 25 11:02:34 2022 -0700 lektor-scss package was never actually committed --- frontend/packages/lektor-scss | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/packages/lektor-scss b/frontend/packages/lektor-scss new file mode 120000 index 0000000..9af740e --- /dev/null +++ b/frontend/packages/lektor-scss @@ -0,0 +1 @@ +../lego/packages/lektor-scss/ \ No newline at end of file -- To stop receiving notification emails like this one, please contact the administrator of this repository.
This is an automated email from the git hooks/post-receive script. meskio pushed a commit to branch main in repository bridgedb. commit a8469efd54fd5a2beeb46d42208d105e29e9017e Author: kez <kez@torproject.org> AuthorDate: Thu Aug 25 11:12:58 2022 -0700 Update lego --- frontend/assets/scss/_cryptocurrency.scss | 1 - frontend/assets/scss/_donate.scss | 1 - frontend/assets/scss/_eoy.scss | 1 - frontend/assets/scss/_includes.scss | 2 +- frontend/assets/scss/_tpo.scss | 1 - frontend/assets/scss/bootstrap-grid.css | 1 - frontend/assets/scss/bootstrap-grid.css.map | 1 - frontend/lego | 2 +- 8 files changed, 2 insertions(+), 8 deletions(-) diff --git a/frontend/assets/scss/_cryptocurrency.scss b/frontend/assets/scss/_cryptocurrency.scss deleted file mode 120000 index 062a224..0000000 --- a/frontend/assets/scss/_cryptocurrency.scss +++ /dev/null @@ -1 +0,0 @@ -../../lego/assets/scss/_cryptocurrency.scss \ No newline at end of file diff --git a/frontend/assets/scss/_donate.scss b/frontend/assets/scss/_donate.scss deleted file mode 120000 index c6cdc1c..0000000 --- a/frontend/assets/scss/_donate.scss +++ /dev/null @@ -1 +0,0 @@ -../../lego/assets/scss/_donate.scss \ No newline at end of file diff --git a/frontend/assets/scss/_eoy.scss b/frontend/assets/scss/_eoy.scss deleted file mode 120000 index 6c6792f..0000000 --- a/frontend/assets/scss/_eoy.scss +++ /dev/null @@ -1 +0,0 @@ -../../lego/assets/scss/_eoy.scss \ No newline at end of file diff --git a/frontend/assets/scss/_includes.scss b/frontend/assets/scss/_includes.scss index e655926..0a4fb6b 120000 --- a/frontend/assets/scss/_includes.scss +++ b/frontend/assets/scss/_includes.scss @@ -1 +1 @@ -../../lego/assets/scss/bootstrap.scss \ No newline at end of file +../../lego/assets/scss/_includes.scss \ No newline at end of file diff --git a/frontend/assets/scss/_tpo.scss b/frontend/assets/scss/_tpo.scss deleted file mode 120000 index f10bdcc..0000000 --- a/frontend/assets/scss/_tpo.scss +++ /dev/null @@ -1 +0,0 @@ -../../lego/assets/scss/_tpo.scss \ No newline at end of file diff --git a/frontend/assets/scss/bootstrap-grid.css b/frontend/assets/scss/bootstrap-grid.css deleted file mode 120000 index 9f8f7ca..0000000 --- a/frontend/assets/scss/bootstrap-grid.css +++ /dev/null @@ -1 +0,0 @@ -../../lego/assets/scss/bootstrap-grid.css \ No newline at end of file diff --git a/frontend/assets/scss/bootstrap-grid.css.map b/frontend/assets/scss/bootstrap-grid.css.map deleted file mode 120000 index 6ddaa58..0000000 --- a/frontend/assets/scss/bootstrap-grid.css.map +++ /dev/null @@ -1 +0,0 @@ -../../lego/assets/scss/bootstrap-grid.css.map \ No newline at end of file diff --git a/frontend/lego b/frontend/lego index 6045d3a..08b7a15 160000 --- a/frontend/lego +++ b/frontend/lego @@ -1 +1 @@ -Subproject commit 6045d3ad4cb91cec197f094abcb6feaabefa3294 +Subproject commit 08b7a15fafc2a00acf001826e315fd9b716817bd -- To stop receiving notification emails like this one, please contact the administrator of this repository.
This is an automated email from the git hooks/post-receive script. meskio pushed a commit to branch main in repository bridgedb. commit f07614a7e405a019800cd768cd78cea42cb9c1e7 Merge: 08da841 a8469ef Author: meskio <meskio@torproject.org> AuthorDate: Fri Aug 26 10:31:48 2022 +0200 Merge branch 'mr/48' frontend/assets/scss/_cryptocurrency.scss | 1 - frontend/assets/scss/_donate.scss | 1 - frontend/assets/scss/_eoy.scss | 1 - frontend/assets/scss/_includes.scss | 2 +- frontend/assets/scss/_tpo.scss | 1 - frontend/assets/scss/bootstrap-grid.css | 1 - frontend/assets/scss/bootstrap-grid.css.map | 1 - frontend/lego | 2 +- frontend/packages/lektor-scss | 1 + 9 files changed, 3 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.
participants (1)
-
gitolite role