Merge branch '483-style-und-funktionsfehler-nach-merge-beheben' into 'development'
Resolve "Style und Funktionsfehler nach Merge beheben" Closes #483 See merge request !843
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- build.sh 4 additions, 0 deletionsbuild.sh
- public/build/css/themes/default.css.map 1 addition, 1 deletionpublic/build/css/themes/default.css.map
- public/build/js/scriptResultPage-f8cfabc6d9.js 1 addition, 1 deletionpublic/build/js/scriptResultPage-f8cfabc6d9.js
- public/build/js/scriptStartPage-be605a6afa.js 10 additions, 2 deletionspublic/build/js/scriptStartPage-be605a6afa.js
- public/build/rev-manifest.json 2 additions, 2 deletionspublic/build/rev-manifest.json
- public/css/styleResultPage.css 598 additions, 0 deletionspublic/css/styleResultPage.css
- public/css/theme.css.php 3 additions, 2 deletionspublic/css/theme.css.php
- public/css/themes/default.css 31 additions, 6 deletionspublic/css/themes/default.css
- public/css/themes/default.css.map 1 addition, 1 deletionpublic/css/themes/default.css.map
- public/js/scriptResultPage.js 1 addition, 1 deletionpublic/js/scriptResultPage.js
- public/js/scriptStartPage.js 10 additions, 2 deletionspublic/js/scriptStartPage.js
- resources/assets/less/metager/result-page.less 19 additions, 14 deletionsresources/assets/less/metager/result-page.less
- resources/assets/less/metager/result-page.less-base 548 additions, 0 deletionsresources/assets/less/metager/result-page.less-base
- resources/assets/less/metager/result-page.less-ours 552 additions, 0 deletionsresources/assets/less/metager/result-page.less-ours
- resources/assets/less/metager/result-page.less-theirs 572 additions, 0 deletionsresources/assets/less/metager/result-page.less-theirs
- resources/assets/less/metager/static-pages.less 24 additions, 0 deletionsresources/assets/less/metager/static-pages.less
- resources/views/datenschutz.blade.php 2 additions, 2 deletionsresources/views/datenschutz.blade.php
- resources/views/index.blade.php 2 additions, 2 deletionsresources/views/index.blade.php
- resources/views/layouts/resultPage.blade.php 2 additions, 2 deletionsresources/views/layouts/resultPage.blade.php
Loading
Please register or sign in to comment