UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-23 05:23:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1442 from pixelfed/frontend-ui-refactor

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-06-20 12:48:05 -06:00 committed by GitHub
commit 2f8c87b6dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/css/quill.css vendored Normal file
View file

Binary file not shown.

BIN
public/js/app.js vendored
View file

Binary file not shown.

BIN
public/js/quill.js vendored Normal file
View file

Binary file not shown.

BIN
public/js/search.js vendored
View file

Binary file not shown.

BIN
public/js/status.js vendored
View file

Binary file not shown.

BIN
public/js/timeline.js vendored
View file

Binary file not shown.

BIN
public/js/vendor.js vendored
View file

Binary file not shown.

1
resources/assets/js/quill.js vendored Normal file
View file

@ -0,0 +1 @@
window.Quill = require('quill');

1
resources/assets/sass/quill.scss vendored Normal file
View file

@ -0,0 +1 @@
@import '~quill/dist/quill.snow.css';

4
resources/views/admin/pages/edit.blade.php
View file

@ -38,7 +38,7 @@
@endsection @endsection
@push('styles') @push('styles')
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/quill/1.3.6/quill.snow.min.css" integrity="sha256-qc/vMbPSg7/JfxMwKeMv3wlx7ojG33FXfYfO0UJIsc0=" crossorigin="anonymous" /> <link rel="stylesheet" href="{{mix('css/quill.css')}}"/>
<style type="text/css"> <style type="text/css">
.ql-container { .ql-container {
box-sizing: border-box; box-sizing: border-box;
@ -52,7 +52,7 @@
</style> </style>
@endpush @endpush
@push('scripts') @push('scripts')
<script src="https://cdnjs.cloudflare.com/ajax/libs/quill/1.3.6/quill.min.js" integrity="sha256-3oYBiGm16EW9wQH8G1VhGh43XgivbO5KaB10RhA9phE=" crossorigin="anonymous"></script> <script src="{{mix('js/quill.js')}}"></script>
<script> <script>
window.editor = new Quill('#editor', { window.editor = new Quill('#editor', {

4
webpack.mix.js vendored
View file

@ -8,6 +8,9 @@ mix.sass('resources/assets/sass/app.scss', 'public/css', {
}) })
.sass('resources/assets/sass/landing.scss', 'public/css', { .sass('resources/assets/sass/landing.scss', 'public/css', {
implementation: require('node-sass') implementation: require('node-sass')
})
.sass('resources/assets/sass/quill.scss', 'public/css', {
implementation: require('node-sass')
}).version(); }).version();
mix.js('resources/assets/js/app.js', 'public/js') mix.js('resources/assets/js/app.js', 'public/js')
@ -21,6 +24,7 @@ mix.js('resources/assets/js/app.js', 'public/js')
.js('resources/assets/js/search.js', 'public/js') .js('resources/assets/js/search.js', 'public/js')
.js('resources/assets/js/developers.js', 'public/js') .js('resources/assets/js/developers.js', 'public/js')
.js('resources/assets/js/loops.js', 'public/js') .js('resources/assets/js/loops.js', 'public/js')
.js('resources/assets/js/quill.js', 'public/js')
// .js('resources/assets/js/embed.js', 'public') // .js('resources/assets/js/embed.js', 'public')
// .js('resources/assets/js/direct.js', 'public/js') // .js('resources/assets/js/direct.js', 'public/js')
.extract([ .extract([