webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-07 23:03:00 +03:00
Code Activity

Finished off intitial conversion to webpack

Browse Source
This commit is contained in:
Dan Brown
2018-03-17 13:03:13 +00:00
parent e52bfc0c24
commit ced4e58137
6 changed files with 640 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/assets/js/index.js
View File

@@ -1,7 +1,3 @@
import "../sass/styles.scss"
import "../sass/print-styles.scss"
import "../sass/export-styles.scss"
import "babel-polyfill"
import "./dom-polyfills"
import "./pages/page-show"
@@ -125,8 +121,6 @@ jQuery.expr[":"].contains = $.expr.createPseudo(function (arg) {
};
});
console.log('test');
// Detect IE for css
if(navigator.userAgent.indexOf('MSIE')!==-1
|| navigator.appVersion.indexOf('Trident/') > 0

6
resources/views/base.blade.php
View File

@@ -10,8 +10,8 @@
<meta charset="utf-8">
<!-- Styles and Fonts -->
<link rel="stylesheet" href="{{ versioned_asset('css/styles.css') }}">
<link rel="stylesheet" media="print" href="{{ versioned_asset('css/print-styles.css') }}">
<link rel="stylesheet" href="{{ versioned_asset('dist/styles.css') }}">
<link rel="stylesheet" media="print" href="{{ versioned_asset('dist/print-styles.css') }}">
<!-- Scripts -->
<script src="{{ baseUrl('/libs/jquery/jquery.min.js?version=2.1.4') }}"></script>
@@ -82,7 +82,7 @@
</div>
</div>
@yield('bottom')
<script src="{{ versioned_asset('dist/bundle.js') }}"></script>
<script src="{{ versioned_asset('dist/app.js') }}"></script>
@yield('scripts')
</body>
</html>

6
resources/views/public.blade.php
View File

@@ -10,8 +10,8 @@
<meta charset="utf-8">
<!-- Styles and Fonts -->
<link rel="stylesheet" href="{{ versioned_asset('css/styles.css') }}">
<link rel="stylesheet" media="print" href="{{ versioned_asset('css/print-styles.css') }}">
<link rel="stylesheet" href="{{ versioned_asset('dist/styles.css') }}">
<link rel="stylesheet" media="print" href="{{ versioned_asset('dist/print-styles.css') }}">
<!-- Scripts -->
<script src="{{ baseUrl("/libs/jquery/jquery.min.js?version=2.1.4") }}"></script>
@@ -58,6 +58,6 @@
@yield('content')
</section>
<script src="{{ versioned_asset('js/common.js') }}"></script>
<script src="{{ versioned_asset('dist/app.js') }}"></script>
</body>
</html>