diff options
| author | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2017-04-07 11:38:39 +0200 |
|---|---|---|
| committer | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2017-04-07 11:38:39 +0200 |
| commit | ad952a580874f47b4261cedb33c8ccdec8197ece (patch) | |
| tree | ef9105e2060d4f37a4a405b5542a0ee5b8097223 | |
| parent | Heroku Button will not work with repos that have Git submodules. Heroku Butto... (diff) | |
| download | newspipe-ad952a580874f47b4261cedb33c8ccdec8197ece.tar.gz newspipe-ad952a580874f47b4261cedb33c8ccdec8197ece.tar.bz2 newspipe-ad952a580874f47b4261cedb33c8ccdec8197ece.zip | |
bootstrap is no longer deployed as a submodule
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | bower.json | 3 | ||||
| l--------- | src/web/static/css/bootstrap-theme.min.css | 2 | ||||
| l--------- | src/web/static/css/bootstrap-theme.min.css.map | 2 | ||||
| l--------- | src/web/static/css/bootstrap.min.css | 2 | ||||
| l--------- | src/web/static/css/bootstrap.min.css.map | 2 | ||||
| l--------- | src/web/static/fonts | 2 | ||||
| m--------- | submodules/bootstrap | 0 |
8 files changed, 7 insertions, 9 deletions
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 @@ -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 -Subproject bb5542651d89ba4c26950d349f74845d0d3384a |