commit b7fb21282277a5144a9e271da7c25b11912fb14f Author: hiro hiro@torproject.org Date: Thu Jun 20 12:39:36 2019 +0200

Use submodule and links in templates --- .gitmodules | 3 +++ assets/static/{ => css}/bootstrap-grid.css | 0 assets/static/{ => css}/bootstrap-grid.css.map | 0 assets/static/{ => css}/bootstrap-reboot.css | 0 assets/static/{ => css}/bootstrap-reboot.css.map | 0 assets/static/{ => css}/bootstrap.css | 0 assets/static/{ => css}/bootstrap.css.map | 0 assets/static/{ => css}/style.css | 0 assets/static/{ => js}/collapse.min.js | 0 lego | 1 + templates/meta.html | 2 +- 11 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..01cf3ad --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "lego"] + path = lego + url = git@git-rw.torproject.org:project/web/lego diff --git a/assets/static/bootstrap-grid.css b/assets/static/css/bootstrap-grid.css similarity index 100% rename from assets/static/bootstrap-grid.css rename to assets/static/css/bootstrap-grid.css diff --git a/assets/static/bootstrap-grid.css.map b/assets/static/css/bootstrap-grid.css.map similarity index 100% rename from assets/static/bootstrap-grid.css.map rename to assets/static/css/bootstrap-grid.css.map diff --git a/assets/static/bootstrap-reboot.css b/assets/static/css/bootstrap-reboot.css similarity index 100% rename from assets/static/bootstrap-reboot.css rename to assets/static/css/bootstrap-reboot.css diff --git a/assets/static/bootstrap-reboot.css.map b/assets/static/css/bootstrap-reboot.css.map similarity index 100% rename from assets/static/bootstrap-reboot.css.map rename to assets/static/css/bootstrap-reboot.css.map diff --git a/assets/static/bootstrap.css b/assets/static/css/bootstrap.css similarity index 100% rename from assets/static/bootstrap.css rename to assets/static/css/bootstrap.css diff --git a/assets/static/bootstrap.css.map b/assets/static/css/bootstrap.css.map similarity index 100% rename from assets/static/bootstrap.css.map rename to assets/static/css/bootstrap.css.map diff --git a/assets/static/style.css b/assets/static/css/style.css similarity index 100% rename from assets/static/style.css rename to assets/static/css/style.css diff --git a/assets/static/collapse.min.js b/assets/static/js/collapse.min.js similarity index 100% rename from assets/static/collapse.min.js rename to assets/static/js/collapse.min.js diff --git a/lego b/lego new file mode 160000 index 0000000..7bc659e --- /dev/null +++ b/lego @@ -0,0 +1 @@ +Subproject commit 7bc659e2564b5f131e24042802d43cf7e6384713 diff --git a/templates/meta.html b/templates/meta.html index 387f9f4..325d57a 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -11,6 +11,6 @@ <meta property="og:title" content="{{ _('The Tor Project | Privacy & Freedom Online') }}" /> <meta property="og:description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }}" /> <meta property="og:image" content="https://www.torproject.org/static/images/tor-project-logo-onions.png" /> -<link rel="stylesheet" href="{{ '/static/bootstrap.css'|asseturl }}"> +<link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title>