From ad952a580874f47b4261cedb33c8ccdec8197ece Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Fri, 7 Apr 2017 11:38:39 +0200 Subject: bootstrap is no longer deployed as a submodule --- .gitmodules | 3 --- bower.json | 3 ++- src/web/static/css/bootstrap-theme.min.css | 2 +- src/web/static/css/bootstrap-theme.min.css.map | 2 +- src/web/static/css/bootstrap.min.css | 2 +- src/web/static/css/bootstrap.min.css.map | 2 +- src/web/static/fonts | 2 +- submodules/bootstrap | 1 - 8 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 .gitmodules delete mode 160000 submodules/bootstrap diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 91931bb4..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "submodules/bootstrap"] - path = submodules/bootstrap - url = https://github.com/twbs/bootstrap.git diff --git a/bower.json b/bower.json index cf816f65..56d4ff1d 100644 --- a/bower.json +++ b/bower.json @@ -12,6 +12,7 @@ "dependencies": { "datatables.net": "^1.10.12", "datatables.net-dt": "^1.10.12", - "datatables.net-bs": "^1.10.12" + "datatables.net-bs": "^1.10.12", + "bootstrap": "^3.3.7" } } diff --git a/src/web/static/css/bootstrap-theme.min.css b/src/web/static/css/bootstrap-theme.min.css index 27d5b351..06469c8d 120000 --- a/src/web/static/css/bootstrap-theme.min.css +++ b/src/web/static/css/bootstrap-theme.min.css @@ -1 +1 @@ -../../../../submodules/bootstrap/dist/css/bootstrap-theme.min.css \ No newline at end of file +../bower_components/bootstrap/dist/css/bootstrap-theme.min.css \ No newline at end of file diff --git a/src/web/static/css/bootstrap-theme.min.css.map b/src/web/static/css/bootstrap-theme.min.css.map index 8172f381..0448a4a0 120000 --- a/src/web/static/css/bootstrap-theme.min.css.map +++ b/src/web/static/css/bootstrap-theme.min.css.map @@ -1 +1 @@ -../../../../submodules/bootstrap/dist/css/bootstrap-theme.min.css.map \ No newline at end of file +../bower_components/bootstrap/dist/css/bootstrap-theme.min.css.map \ No newline at end of file diff --git a/src/web/static/css/bootstrap.min.css b/src/web/static/css/bootstrap.min.css index 9293a126..30c399cb 120000 --- a/src/web/static/css/bootstrap.min.css +++ b/src/web/static/css/bootstrap.min.css @@ -1 +1 @@ -../../../../submodules/bootstrap/dist/css/bootstrap.min.css \ No newline at end of file +../bower_components/bootstrap/dist/css/bootstrap.min.css \ No newline at end of file diff --git a/src/web/static/css/bootstrap.min.css.map b/src/web/static/css/bootstrap.min.css.map index 655b0135..146f88dd 120000 --- a/src/web/static/css/bootstrap.min.css.map +++ b/src/web/static/css/bootstrap.min.css.map @@ -1 +1 @@ -../../../../submodules/bootstrap/dist/css/bootstrap.min.css.map \ No newline at end of file +../bower_components/bootstrap/dist/css/bootstrap.min.css.map \ No newline at end of file diff --git a/src/web/static/fonts b/src/web/static/fonts index 0061ad7b..4097ea8b 120000 --- a/src/web/static/fonts +++ b/src/web/static/fonts @@ -1 +1 @@ -../../../submodules/bootstrap/dist/fonts/ \ No newline at end of file +bower_components/bootstrap/dist/fonts/ \ No newline at end of file diff --git a/submodules/bootstrap b/submodules/bootstrap deleted file mode 160000 index bb554265..00000000 --- a/submodules/bootstrap +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bb5542651d89ba4c26950d349f74845d0d3384a3 -- cgit