iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Require twbs/bootstrap via composer

This commit is contained in:
Igor Scheller 2017-01-02 03:15:57 +01:00
parent 84f6990db2
commit b839e40106
11 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "vendor/bootstrap"]
path = themes/assets/bootstrap
url = https://github.com/twbs/bootstrap.git

2
README-ENG.md
View File

@ -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

2
README.md
View File

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

3
composer.json
View File

@ -15,6 +15,7 @@
],
"require": {
"php": ">=5.4",
"erusev/parsedown": "1.6.*"
"erusev/parsedown": "1.6.*",
"twbs/bootstrap": "^3.3"
}
}

2
public/vendor/bootstrap vendored
View File

@ -1 +1 @@
../../themes/assets/bootstrap/dist
../../vendor/twbs/bootstrap/dist

1
themes/assets/bootstrap

@ -1 +0,0 @@
Subproject commit ad716b9ea9506456f28e2c1bcdd7b4a81b44c11c

4
themes/base.less
View File

@ -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;

2
themes/theme1.less
View File

@ -1,4 +1,4 @@
@import "assets/bootstrap/less/variables";
@import "../vendor/twbs/bootstrap/less/variables";
/*
The MIT License (MIT)

2
themes/theme2.less
View File

@ -1,4 +1,4 @@
@import "assets/bootstrap/less/variables";
@import "../vendor/twbs/bootstrap/less/variables";
@brand-primary: #758499;
@brand-success: #7b9c41;

2
themes/theme3.less
View File

@ -1,4 +1,4 @@
@import "assets/bootstrap/less/variables";
@import "../vendor/twbs/bootstrap/less/variables";
@brand-primary: #f19224;
@brand-success: #39AB50;

2
themes/theme4.less
View File

@ -1,4 +1,4 @@
@import "assets/bootstrap/less/variables";
@import "../vendor/twbs/bootstrap/less/variables";
/*
The MIT License (MIT)