Merge branch...
Merge branch '379-das-quicktip-iframe-sollte-seine-grosse-an-die-ergebnisseite-ubertragen-damit-die-optimale-hohe-eingestellt-wird' into 'development' Das Quicktip Iframe übermittelt nun die korrekte Höhe für den Resizer Closes #379 See merge request !589
Showing
- gulpfile.js 2 additions, 1 deletiongulpfile.js
- public/css/themes/default.css 7765 additions, 1 deletionpublic/css/themes/default.css
- public/css/themes/default.css.map 1 addition, 1 deletionpublic/css/themes/default.css.map
- public/js/all.js 4154 additions, 14 deletionspublic/js/all.js
- public/js/quicktips.js 16 additions, 0 deletionspublic/js/quicktips.js
- public/js/quicktips.js.map 1 addition, 0 deletionspublic/js/quicktips.js.map
- resources/assets/js/lib/iframeResizer.contentWindow.min.js 10 additions, 0 deletionsresources/assets/js/lib/iframeResizer.contentWindow.min.js
- resources/assets/js/lib/iframeResizer.min.js 0 additions, 0 deletionsresources/assets/js/lib/iframeResizer.min.js
- resources/assets/less/metager/result-page.less 0 additions, 2 deletionsresources/assets/less/metager/result-page.less
- resources/views/quicktip.blade.php 3 additions, 0 deletionsresources/views/quicktip.blade.php
Loading
Please register or sign in to comment