[tor-commits] [bridgedb] 04/07: Merge branch 'fix-frontend-scss' into 'main'

[gitolite role]

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 at 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.