diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | README-ENG.md | 2 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | composer.json | 3 | ||||
| l--------- | public/vendor/bootstrap | 2 | ||||
| m--------- | themes/assets/bootstrap | 0 | ||||
| -rw-r--r-- | themes/base.less | 4 | ||||
| -rw-r--r-- | themes/theme1.less | 2 | ||||
| -rw-r--r-- | themes/theme2.less | 2 | ||||
| -rw-r--r-- | themes/theme3.less | 2 | ||||
| -rw-r--r-- | themes/theme4.less | 2 |
11 files changed, 11 insertions, 13 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 2d19e8e9..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "vendor/bootstrap"] - path = themes/assets/bootstrap - url = https://github.com/twbs/bootstrap.git
\ No newline at end of file diff --git a/README-ENG.md b/README-ENG.md index d379e192..0c39ba45 100644 --- a/README-ENG.md +++ b/README-ENG.md @@ -6,7 +6,7 @@ * Webserver, i.e. lighttpd, nginx, or Apache ## Directions: - * Clone the master branch with the submodules: `git clone --recursive https://github.com/engelsystem/engelsystem.git` + * Clone the master branch: `git clone https://github.com/engelsystem/engelsystem.git` * Install [Composer](https://getcomposer.org/download/) * Install project dependencies: `composer install` * Webserver must have write access to the 'import' directory and read access for all other directories @@ -9,7 +9,7 @@ * Webserver mit PHP-Anbindung, z.B. lighttpd, nginx oder Apache ## Vorgehen: - * Klonen des `master` inkl. submodules in lokales Verzeichnis: `git clone --recursive https://github.com/engelsystem/engelsystem.git` + * Klonen des `master` in lokales Verzeichnis: `git clone https://github.com/engelsystem/engelsystem.git` * [Composer](https://getcomposer.org/download/) installieren * Abhängigkeiten installieren: `composer install` * Der Webserver muss Schreibrechte auf das Verzeichnis `import` bekommen, für alle anderen Dateien reichen Leserechte. diff --git a/composer.json b/composer.json index 5b56395b..5b2498da 100644 --- a/composer.json +++ b/composer.json @@ -15,6 +15,7 @@ ], "require": { "php": ">=5.4", - "erusev/parsedown": "1.6.*" + "erusev/parsedown": "1.6.*", + "twbs/bootstrap": "^3.3" } } diff --git a/public/vendor/bootstrap b/public/vendor/bootstrap index 250b0a66..c4f820a9 120000 --- a/public/vendor/bootstrap +++ b/public/vendor/bootstrap @@ -1 +1 @@ -../../themes/assets/bootstrap/dist
\ No newline at end of file +../../vendor/twbs/bootstrap/dist
\ No newline at end of file diff --git a/themes/assets/bootstrap b/themes/assets/bootstrap deleted file mode 160000 -Subproject ad716b9ea9506456f28e2c1bcdd7b4a81b44c11 diff --git a/themes/base.less b/themes/base.less index a4fa7e77..c866e50e 100644 --- a/themes/base.less +++ b/themes/base.less @@ -1,6 +1,6 @@ -@import "assets/bootstrap/less/bootstrap"; +@import "../vendor/twbs/bootstrap/less/bootstrap"; -@icon-font-path: "../fonts/"; +@icon-font-path: "../vendor/bootstrap/fonts/"; body { padding-top: 50px; diff --git a/themes/theme1.less b/themes/theme1.less index 134e79b7..7a893951 100644 --- a/themes/theme1.less +++ b/themes/theme1.less @@ -1,4 +1,4 @@ -@import "assets/bootstrap/less/variables"; +@import "../vendor/twbs/bootstrap/less/variables"; /* The MIT License (MIT) diff --git a/themes/theme2.less b/themes/theme2.less index 344e23c6..c4486444 100644 --- a/themes/theme2.less +++ b/themes/theme2.less @@ -1,4 +1,4 @@ -@import "assets/bootstrap/less/variables"; +@import "../vendor/twbs/bootstrap/less/variables"; @brand-primary: #758499; @brand-success: #7b9c41; diff --git a/themes/theme3.less b/themes/theme3.less index 7e7e0f69..e6be3637 100644 --- a/themes/theme3.less +++ b/themes/theme3.less @@ -1,4 +1,4 @@ -@import "assets/bootstrap/less/variables"; +@import "../vendor/twbs/bootstrap/less/variables"; @brand-primary: #f19224; @brand-success: #39AB50; diff --git a/themes/theme4.less b/themes/theme4.less index 2ad8593d..4234de9c 100644 --- a/themes/theme4.less +++ b/themes/theme4.less @@ -1,4 +1,4 @@ -@import "assets/bootstrap/less/variables"; +@import "../vendor/twbs/bootstrap/less/variables"; /* The MIT License (MIT) |