Update dependencies (#1262)
* Update dependencies * Rebuild assets with updated deps
This commit is contained in:
@@ -82,10 +82,6 @@ test:
|
|||||||
phpcs:
|
phpcs:
|
||||||
@vendor/bin/php-cs-fixer fix --config=.php_cs -v --diff --diff-format=udiff --dry-run
|
@vendor/bin/php-cs-fixer fix --config=.php_cs -v --diff --diff-format=udiff --dry-run
|
||||||
|
|
||||||
#.PHONY: phpstan
|
|
||||||
#phpstan:
|
|
||||||
# vendor/bin/phpstan analyse -c phpstan.neon -v --level 2 app
|
|
||||||
|
|
||||||
.PHONY: replay-acars
|
.PHONY: replay-acars
|
||||||
replay-acars:
|
replay-acars:
|
||||||
#@php artisan phpvms:replay AAL10,AAL3113,BAW172,DAL988,FIN6,MSR986 --manual
|
#@php artisan phpvms:replay AAL10,AAL3113,BAW172,DAL988,FIN6,MSR986 --manual
|
||||||
@@ -95,11 +91,6 @@ replay-acars:
|
|||||||
sass-watch:
|
sass-watch:
|
||||||
sass --watch public/assets/admin/sass/paper-dashboard.scss:public/assets/admin/css/paper-dashboard.css
|
sass --watch public/assets/admin/sass/paper-dashboard.scss:public/assets/admin/css/paper-dashboard.css
|
||||||
|
|
||||||
.PHONY: schema
|
|
||||||
schema:
|
|
||||||
#php artisan infyom:scaffold Aircraft --fieldsFile=database/schema/aircraft.json
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
.PHONY: deploy-package
|
.PHONY: deploy-package
|
||||||
deploy-package:
|
deploy-package:
|
||||||
./.travis/deploy_script.sh
|
./.travis/deploy_script.sh
|
||||||
|
|||||||
Generated
+324
-279
File diff suppressed because it is too large
Load Diff
@@ -1,7 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Third Party Services
|
| Third Party Services
|
||||||
|
|||||||
Generated
+10517
-11544
File diff suppressed because it is too large
Load Diff
+6
-6
@@ -27,14 +27,14 @@
|
|||||||
"jquery": "^3.5.1",
|
"jquery": "^3.5.1",
|
||||||
"jquery-pjax": "~2.0",
|
"jquery-pjax": "~2.0",
|
||||||
"js-yaml": "^3.14.0",
|
"js-yaml": "^3.14.0",
|
||||||
"laravel-mix": "^5.0.7",
|
"laravel-mix": "^6.0.25",
|
||||||
"leaflet": "^1.3.4",
|
"leaflet": "^1.3.4",
|
||||||
"leaflet-ajax": "2.1.0",
|
"leaflet-ajax": "2.1.0",
|
||||||
"leaflet-providers": "1.0.*",
|
"leaflet-providers": "1.0.*",
|
||||||
"leaflet-rotatedmarker": "^0.2.0",
|
"leaflet-rotatedmarker": "^0.2.0",
|
||||||
"leaflet.geodesic": "^2.5.2",
|
"leaflet.geodesic": "^2.5.2",
|
||||||
"lodash": ">=4.17.19",
|
"lodash": ">=4.17.19",
|
||||||
"marked": "^1.2.2",
|
"marked": "^2.1.3",
|
||||||
"minimist": "^1.2.2",
|
"minimist": "^1.2.2",
|
||||||
"moment": "^2.29.1",
|
"moment": "^2.29.1",
|
||||||
"paper-dashboard": "^1.1.0",
|
"paper-dashboard": "^1.1.0",
|
||||||
@@ -44,14 +44,14 @@
|
|||||||
"popper.js": "^1.15.0",
|
"popper.js": "^1.15.0",
|
||||||
"rivets": "^0.9.6",
|
"rivets": "^0.9.6",
|
||||||
"select2": "^4.0.13",
|
"select2": "^4.0.13",
|
||||||
"ssri": "^5.3.0",
|
"ssri": "^8.0.1",
|
||||||
"tar": ">=4.4.2",
|
"tar": ">=4.4.2",
|
||||||
"webpack": "^4.44.2",
|
"webpack": "^5.45.1",
|
||||||
"webpack-cli": "^3.3.12",
|
"webpack-cli": "^3.3.12",
|
||||||
"x-editable": "1.5.1"
|
"x-editable": "1.5.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"copy-webpack-plugin": "^4.6.0",
|
"copy-webpack-plugin": "^9.0.1",
|
||||||
"eslint": "^6.2.2",
|
"eslint": "^6.2.2",
|
||||||
"eslint-config-airbnb": "^18.0.1",
|
"eslint-config-airbnb": "^18.0.1",
|
||||||
"eslint-config-airbnb-base": "^14.0.0",
|
"eslint-config-airbnb-base": "^14.0.0",
|
||||||
@@ -63,6 +63,6 @@
|
|||||||
"tailwindcss": "^0.5.3",
|
"tailwindcss": "^0.5.3",
|
||||||
"vue-template-compiler": "^2.6.12",
|
"vue-template-compiler": "^2.6.12",
|
||||||
"webpack-bundle-analyzer": "^3.9.0",
|
"webpack-bundle-analyzer": "^3.9.0",
|
||||||
"webpack-dev-server": "^3.1.11"
|
"webpack-dev-server": "^1.16.5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
+5
-3
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Vendored
+1
-10881
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1
-1263
File diff suppressed because one or more lines are too long
+1
-38
@@ -1,38 +1 @@
|
|||||||
/**
|
CKEDITOR.editorConfig=function(e){e.toolbarGroups=[{name:"clipboard",groups:["clipboard","undo"]},{name:"editing",groups:["find","selection","spellchecker"]},{name:"links"},{name:"insert"},{name:"forms"},{name:"tools"},{name:"document",groups:["mode","document","doctools"]},{name:"others"},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list","indent","blocks","align","bidi"]},{name:"styles"},{name:"colors"},{name:"about"}],e.removeButtons="Underline,Subscript,Superscript",e.format_tags="p;h1;h2;h3;pre",e.removeDialogTabs="image:advanced;link:advanced"};
|
||||||
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
|
|
||||||
* For licensing, see https://ckeditor.com/legal/ckeditor-oss-license
|
|
||||||
*/
|
|
||||||
|
|
||||||
CKEDITOR.editorConfig = function( config ) {
|
|
||||||
// Define changes to default configuration here.
|
|
||||||
// For complete reference see:
|
|
||||||
// https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html
|
|
||||||
|
|
||||||
// The toolbar groups arrangement, optimized for two toolbar rows.
|
|
||||||
config.toolbarGroups = [
|
|
||||||
{ name: 'clipboard', groups: [ 'clipboard', 'undo' ] },
|
|
||||||
{ name: 'editing', groups: [ 'find', 'selection', 'spellchecker' ] },
|
|
||||||
{ name: 'links' },
|
|
||||||
{ name: 'insert' },
|
|
||||||
{ name: 'forms' },
|
|
||||||
{ name: 'tools' },
|
|
||||||
{ name: 'document', groups: [ 'mode', 'document', 'doctools' ] },
|
|
||||||
{ name: 'others' },
|
|
||||||
'/',
|
|
||||||
{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
|
|
||||||
{ name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ] },
|
|
||||||
{ name: 'styles' },
|
|
||||||
{ name: 'colors' },
|
|
||||||
{ name: 'about' }
|
|
||||||
];
|
|
||||||
|
|
||||||
// Remove some buttons provided by the standard plugins, which are
|
|
||||||
// not needed in the Standard(s) toolbar.
|
|
||||||
config.removeButtons = 'Underline,Subscript,Superscript';
|
|
||||||
|
|
||||||
// Set the most common block elements.
|
|
||||||
config.format_tags = 'p;h1;h2;h3;pre';
|
|
||||||
|
|
||||||
// Simplify the dialog windows.
|
|
||||||
config.removeDialogTabs = 'image:advanced;link:advanced';
|
|
||||||
};
|
|
||||||
|
|||||||
+1
-208
@@ -1,208 +1 @@
|
|||||||
/*
|
body{font-family:sans-serif,Arial,Verdana,"Trebuchet MS","Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";font-size:12px;color:#333;background-color:#fff;margin:20px}.cke_editable{font-size:13px;line-height:1.6;word-wrap:break-word}blockquote{font-style:italic;font-family:Georgia,Times,"Times New Roman",serif;padding:2px 0;border-style:solid;border-color:#ccc;border-width:0}.cke_contents_ltr blockquote{padding-left:20px;padding-right:8px;border-left-width:5px}.cke_contents_rtl blockquote{padding-left:8px;padding-right:20px;border-right-width:5px}a{color:#0782c1}dl,ol,ul{padding:0 40px}h1,h2,h3,h4,h5,h6{font-weight:400;line-height:1.2}hr{border:0;border-top:1px solid #ccc}img.right{border:1px solid #ccc;float:right;margin-left:15px;padding:5px}img.left{border:1px solid #ccc;float:left;margin-right:15px;padding:5px}pre{white-space:pre-wrap;word-wrap:break-word;-moz-tab-size:4;tab-size:4}.marker{background-color:#ff0}span[lang]{font-style:italic}figure{text-align:center;outline:solid 1px #ccc;background:rgba(0,0,0,.05);padding:10px;margin:10px 20px;display:inline-block}figure>figcaption{text-align:center;display:block}a>img{padding:1px;margin:1px;border:none;outline:1px solid #0782C1}.code-featured{border:5px solid red}.math-featured{padding:20px;box-shadow:0 0 2px #c80000;background-color:rgba(255,0,0,.05);margin:10px}.image-clean{border:0;background:0 0;padding:0}.image-clean>figcaption{font-size:.9em;text-align:right}.image-grayscale{background-color:#fff;color:#666}.image-grayscale img,img.image-grayscale{filter:grayscale(100%)}.embed-240p{max-width:426px;max-height:240px;margin:0 auto}.embed-360p{max-width:640px;max-height:360px;margin:0 auto}.embed-480p{max-width:854px;max-height:480px;margin:0 auto}.embed-720p{max-width:1280px;max-height:720px;margin:0 auto}.embed-1080p{max-width:1920px;max-height:1080px;margin:0 auto}
|
||||||
Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
|
|
||||||
For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
|
|
||||||
*/
|
|
||||||
|
|
||||||
body
|
|
||||||
{
|
|
||||||
/* Font */
|
|
||||||
/* Emoji fonts are added to visualise them nicely in Internet Explorer. */
|
|
||||||
font-family: sans-serif, Arial, Verdana, "Trebuchet MS", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
|
|
||||||
font-size: 12px;
|
|
||||||
|
|
||||||
/* Text color */
|
|
||||||
color: #333;
|
|
||||||
|
|
||||||
/* Remove the background color to make it transparent. */
|
|
||||||
background-color: #fff;
|
|
||||||
|
|
||||||
margin: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cke_editable
|
|
||||||
{
|
|
||||||
font-size: 13px;
|
|
||||||
line-height: 1.6;
|
|
||||||
|
|
||||||
/* Fix for missing scrollbars with RTL texts. (#10488) */
|
|
||||||
word-wrap: break-word;
|
|
||||||
}
|
|
||||||
|
|
||||||
blockquote
|
|
||||||
{
|
|
||||||
font-style: italic;
|
|
||||||
font-family: Georgia, Times, "Times New Roman", serif;
|
|
||||||
padding: 2px 0;
|
|
||||||
border-style: solid;
|
|
||||||
border-color: #ccc;
|
|
||||||
border-width: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cke_contents_ltr blockquote
|
|
||||||
{
|
|
||||||
padding-left: 20px;
|
|
||||||
padding-right: 8px;
|
|
||||||
border-left-width: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cke_contents_rtl blockquote
|
|
||||||
{
|
|
||||||
padding-left: 8px;
|
|
||||||
padding-right: 20px;
|
|
||||||
border-right-width: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
a
|
|
||||||
{
|
|
||||||
color: #0782C1;
|
|
||||||
}
|
|
||||||
|
|
||||||
ol,ul,dl
|
|
||||||
{
|
|
||||||
/* IE7: reset rtl list margin. (#7334) */
|
|
||||||
*margin-right: 0px;
|
|
||||||
/* Preserved spaces for list items with text direction different than the list. (#6249,#8049)*/
|
|
||||||
padding: 0 40px;
|
|
||||||
}
|
|
||||||
|
|
||||||
h1,h2,h3,h4,h5,h6
|
|
||||||
{
|
|
||||||
font-weight: normal;
|
|
||||||
line-height: 1.2;
|
|
||||||
}
|
|
||||||
|
|
||||||
hr
|
|
||||||
{
|
|
||||||
border: 0px;
|
|
||||||
border-top: 1px solid #ccc;
|
|
||||||
}
|
|
||||||
|
|
||||||
img.right
|
|
||||||
{
|
|
||||||
border: 1px solid #ccc;
|
|
||||||
float: right;
|
|
||||||
margin-left: 15px;
|
|
||||||
padding: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
img.left
|
|
||||||
{
|
|
||||||
border: 1px solid #ccc;
|
|
||||||
float: left;
|
|
||||||
margin-right: 15px;
|
|
||||||
padding: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
pre
|
|
||||||
{
|
|
||||||
white-space: pre-wrap; /* CSS 2.1 */
|
|
||||||
word-wrap: break-word; /* IE7 */
|
|
||||||
-moz-tab-size: 4;
|
|
||||||
tab-size: 4;
|
|
||||||
}
|
|
||||||
|
|
||||||
.marker
|
|
||||||
{
|
|
||||||
background-color: Yellow;
|
|
||||||
}
|
|
||||||
|
|
||||||
span[lang]
|
|
||||||
{
|
|
||||||
font-style: italic;
|
|
||||||
}
|
|
||||||
|
|
||||||
figure
|
|
||||||
{
|
|
||||||
text-align: center;
|
|
||||||
outline: solid 1px #ccc;
|
|
||||||
background: rgba(0,0,0,0.05);
|
|
||||||
padding: 10px;
|
|
||||||
margin: 10px 20px;
|
|
||||||
display: inline-block;
|
|
||||||
}
|
|
||||||
|
|
||||||
figure > figcaption
|
|
||||||
{
|
|
||||||
text-align: center;
|
|
||||||
display: block; /* For IE8 */
|
|
||||||
}
|
|
||||||
|
|
||||||
a > img {
|
|
||||||
padding: 1px;
|
|
||||||
margin: 1px;
|
|
||||||
border: none;
|
|
||||||
outline: 1px solid #0782C1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Widget Styles */
|
|
||||||
.code-featured
|
|
||||||
{
|
|
||||||
border: 5px solid red;
|
|
||||||
}
|
|
||||||
|
|
||||||
.math-featured
|
|
||||||
{
|
|
||||||
padding: 20px;
|
|
||||||
box-shadow: 0 0 2px rgba(200, 0, 0, 1);
|
|
||||||
background-color: rgba(255, 0, 0, 0.05);
|
|
||||||
margin: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.image-clean
|
|
||||||
{
|
|
||||||
border: 0;
|
|
||||||
background: none;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.image-clean > figcaption
|
|
||||||
{
|
|
||||||
font-size: .9em;
|
|
||||||
text-align: right;
|
|
||||||
}
|
|
||||||
|
|
||||||
.image-grayscale
|
|
||||||
{
|
|
||||||
background-color: white;
|
|
||||||
color: #666;
|
|
||||||
}
|
|
||||||
|
|
||||||
.image-grayscale img, img.image-grayscale
|
|
||||||
{
|
|
||||||
filter: grayscale(100%);
|
|
||||||
}
|
|
||||||
|
|
||||||
.embed-240p
|
|
||||||
{
|
|
||||||
max-width: 426px;
|
|
||||||
max-height: 240px;
|
|
||||||
margin:0 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.embed-360p
|
|
||||||
{
|
|
||||||
max-width: 640px;
|
|
||||||
max-height: 360px;
|
|
||||||
margin:0 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.embed-480p
|
|
||||||
{
|
|
||||||
max-width: 854px;
|
|
||||||
max-height: 480px;
|
|
||||||
margin:0 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.embed-720p
|
|
||||||
{
|
|
||||||
max-width: 1280px;
|
|
||||||
max-height: 720px;
|
|
||||||
margin:0 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.embed-1080p
|
|
||||||
{
|
|
||||||
max-width: 1920px;
|
|
||||||
max-height: 1080px;
|
|
||||||
margin:0 auto;
|
|
||||||
}
|
|
||||||
|
|||||||
+1
-137
@@ -1,137 +1 @@
|
|||||||
/**
|
CKEDITOR.stylesSet.add("default",[{name:"Italic Title",element:"h2",styles:{"font-style":"italic"}},{name:"Subtitle",element:"h3",styles:{color:"#aaa","font-style":"italic"}},{name:"Special Container",element:"div",styles:{padding:"5px 10px",background:"#eee",border:"1px solid #ccc"}},{name:"Marker",element:"span",attributes:{class:"marker"}},{name:"Big",element:"big"},{name:"Small",element:"small"},{name:"Typewriter",element:"tt"},{name:"Computer Code",element:"code"},{name:"Keyboard Phrase",element:"kbd"},{name:"Sample Text",element:"samp"},{name:"Variable",element:"var"},{name:"Deleted Text",element:"del"},{name:"Inserted Text",element:"ins"},{name:"Cited Work",element:"cite"},{name:"Inline Quotation",element:"q"},{name:"Language: RTL",element:"span",attributes:{dir:"rtl"}},{name:"Language: LTR",element:"span",attributes:{dir:"ltr"}},{name:"Styled Image (left)",element:"img",attributes:{class:"left"}},{name:"Styled Image (right)",element:"img",attributes:{class:"right"}},{name:"Compact Table",element:"table",attributes:{cellpadding:"5",cellspacing:"0",border:"1",bordercolor:"#ccc"},styles:{"border-collapse":"collapse"}},{name:"Borderless Table",element:"table",styles:{"border-style":"hidden","background-color":"#E6E6FA"}},{name:"Square Bulleted List",element:"ul",styles:{"list-style-type":"square"}},{name:"Clean Image",type:"widget",widget:"image",attributes:{class:"image-clean"}},{name:"Grayscale Image",type:"widget",widget:"image",attributes:{class:"image-grayscale"}},{name:"Featured Snippet",type:"widget",widget:"codeSnippet",attributes:{class:"code-featured"}},{name:"Featured Formula",type:"widget",widget:"mathjax",attributes:{class:"math-featured"}},{name:"240p",type:"widget",widget:"embedSemantic",attributes:{class:"embed-240p"},group:"size"},{name:"360p",type:"widget",widget:"embedSemantic",attributes:{class:"embed-360p"},group:"size"},{name:"480p",type:"widget",widget:"embedSemantic",attributes:{class:"embed-480p"},group:"size"},{name:"720p",type:"widget",widget:"embedSemantic",attributes:{class:"embed-720p"},group:"size"},{name:"1080p",type:"widget",widget:"embedSemantic",attributes:{class:"embed-1080p"},group:"size"},{name:"240p ",type:"widget",widget:"embed",attributes:{class:"embed-240p"},group:"size"},{name:"360p ",type:"widget",widget:"embed",attributes:{class:"embed-360p"},group:"size"},{name:"480p ",type:"widget",widget:"embed",attributes:{class:"embed-480p"},group:"size"},{name:"720p ",type:"widget",widget:"embed",attributes:{class:"embed-720p"},group:"size"},{name:"1080p ",type:"widget",widget:"embed",attributes:{class:"embed-1080p"},group:"size"}]);
|
||||||
* Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
|
|
||||||
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
|
|
||||||
*/
|
|
||||||
|
|
||||||
// This file contains style definitions that can be used by CKEditor plugins.
|
|
||||||
//
|
|
||||||
// The most common use for it is the "stylescombo" plugin which shows the Styles drop-down
|
|
||||||
// list containing all styles in the editor toolbar. Other plugins, like
|
|
||||||
// the "div" plugin, use a subset of the styles for their features.
|
|
||||||
//
|
|
||||||
// If you do not have plugins that depend on this file in your editor build, you can simply
|
|
||||||
// ignore it. Otherwise it is strongly recommended to customize this file to match your
|
|
||||||
// website requirements and design properly.
|
|
||||||
//
|
|
||||||
// For more information refer to: https://ckeditor.com/docs/ckeditor4/latest/guide/dev_styles.html#style-rules
|
|
||||||
|
|
||||||
CKEDITOR.stylesSet.add( 'default', [
|
|
||||||
/* Block styles */
|
|
||||||
|
|
||||||
// These styles are already available in the "Format" drop-down list ("format" plugin),
|
|
||||||
// so they are not needed here by default. You may enable them to avoid
|
|
||||||
// placing the "Format" combo in the toolbar, maintaining the same features.
|
|
||||||
/*
|
|
||||||
{ name: 'Paragraph', element: 'p' },
|
|
||||||
{ name: 'Heading 1', element: 'h1' },
|
|
||||||
{ name: 'Heading 2', element: 'h2' },
|
|
||||||
{ name: 'Heading 3', element: 'h3' },
|
|
||||||
{ name: 'Heading 4', element: 'h4' },
|
|
||||||
{ name: 'Heading 5', element: 'h5' },
|
|
||||||
{ name: 'Heading 6', element: 'h6' },
|
|
||||||
{ name: 'Preformatted Text',element: 'pre' },
|
|
||||||
{ name: 'Address', element: 'address' },
|
|
||||||
*/
|
|
||||||
|
|
||||||
{ name: 'Italic Title', element: 'h2', styles: { 'font-style': 'italic' } },
|
|
||||||
{ name: 'Subtitle', element: 'h3', styles: { 'color': '#aaa', 'font-style': 'italic' } },
|
|
||||||
{
|
|
||||||
name: 'Special Container',
|
|
||||||
element: 'div',
|
|
||||||
styles: {
|
|
||||||
padding: '5px 10px',
|
|
||||||
background: '#eee',
|
|
||||||
border: '1px solid #ccc'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
/* Inline styles */
|
|
||||||
|
|
||||||
// These are core styles available as toolbar buttons. You may opt enabling
|
|
||||||
// some of them in the Styles drop-down list, removing them from the toolbar.
|
|
||||||
// (This requires the "stylescombo" plugin.)
|
|
||||||
/*
|
|
||||||
{ name: 'Strong', element: 'strong', overrides: 'b' },
|
|
||||||
{ name: 'Emphasis', element: 'em' , overrides: 'i' },
|
|
||||||
{ name: 'Underline', element: 'u' },
|
|
||||||
{ name: 'Strikethrough', element: 'strike' },
|
|
||||||
{ name: 'Subscript', element: 'sub' },
|
|
||||||
{ name: 'Superscript', element: 'sup' },
|
|
||||||
*/
|
|
||||||
|
|
||||||
{ name: 'Marker', element: 'span', attributes: { 'class': 'marker' } },
|
|
||||||
|
|
||||||
{ name: 'Big', element: 'big' },
|
|
||||||
{ name: 'Small', element: 'small' },
|
|
||||||
{ name: 'Typewriter', element: 'tt' },
|
|
||||||
|
|
||||||
{ name: 'Computer Code', element: 'code' },
|
|
||||||
{ name: 'Keyboard Phrase', element: 'kbd' },
|
|
||||||
{ name: 'Sample Text', element: 'samp' },
|
|
||||||
{ name: 'Variable', element: 'var' },
|
|
||||||
|
|
||||||
{ name: 'Deleted Text', element: 'del' },
|
|
||||||
{ name: 'Inserted Text', element: 'ins' },
|
|
||||||
|
|
||||||
{ name: 'Cited Work', element: 'cite' },
|
|
||||||
{ name: 'Inline Quotation', element: 'q' },
|
|
||||||
|
|
||||||
{ name: 'Language: RTL', element: 'span', attributes: { 'dir': 'rtl' } },
|
|
||||||
{ name: 'Language: LTR', element: 'span', attributes: { 'dir': 'ltr' } },
|
|
||||||
|
|
||||||
/* Object styles */
|
|
||||||
|
|
||||||
{
|
|
||||||
name: 'Styled Image (left)',
|
|
||||||
element: 'img',
|
|
||||||
attributes: { 'class': 'left' }
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
name: 'Styled Image (right)',
|
|
||||||
element: 'img',
|
|
||||||
attributes: { 'class': 'right' }
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
name: 'Compact Table',
|
|
||||||
element: 'table',
|
|
||||||
attributes: {
|
|
||||||
cellpadding: '5',
|
|
||||||
cellspacing: '0',
|
|
||||||
border: '1',
|
|
||||||
bordercolor: '#ccc'
|
|
||||||
},
|
|
||||||
styles: {
|
|
||||||
'border-collapse': 'collapse'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
{ name: 'Borderless Table', element: 'table', styles: { 'border-style': 'hidden', 'background-color': '#E6E6FA' } },
|
|
||||||
{ name: 'Square Bulleted List', element: 'ul', styles: { 'list-style-type': 'square' } },
|
|
||||||
|
|
||||||
/* Widget styles */
|
|
||||||
|
|
||||||
{ name: 'Clean Image', type: 'widget', widget: 'image', attributes: { 'class': 'image-clean' } },
|
|
||||||
{ name: 'Grayscale Image', type: 'widget', widget: 'image', attributes: { 'class': 'image-grayscale' } },
|
|
||||||
|
|
||||||
{ name: 'Featured Snippet', type: 'widget', widget: 'codeSnippet', attributes: { 'class': 'code-featured' } },
|
|
||||||
|
|
||||||
{ name: 'Featured Formula', type: 'widget', widget: 'mathjax', attributes: { 'class': 'math-featured' } },
|
|
||||||
|
|
||||||
{ name: '240p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-240p' }, group: 'size' },
|
|
||||||
{ name: '360p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-360p' }, group: 'size' },
|
|
||||||
{ name: '480p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-480p' }, group: 'size' },
|
|
||||||
{ name: '720p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-720p' }, group: 'size' },
|
|
||||||
{ name: '1080p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-1080p' }, group: 'size' },
|
|
||||||
|
|
||||||
// Adding space after the style name is an intended workaround. For now, there
|
|
||||||
// is no option to create two styles with the same name for different widget types. See https://dev.ckeditor.com/ticket/16664.
|
|
||||||
{ name: '240p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-240p' }, group: 'size' },
|
|
||||||
{ name: '360p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-360p' }, group: 'size' },
|
|
||||||
{ name: '480p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-480p' }, group: 'size' },
|
|
||||||
{ name: '720p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-720p' }, group: 'size' },
|
|
||||||
{ name: '1080p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-1080p' }, group: 'size' }
|
|
||||||
|
|
||||||
] );
|
|
||||||
|
|
||||||
|
|||||||
+22
-12
@@ -1,25 +1,35 @@
|
|||||||
{
|
{
|
||||||
"/assets/admin/js/app.js": "/assets/admin/js/app.js?id=c6f09efd67f43399c980",
|
"/assets/frontend/js/app.js": "/assets/frontend/js/app.js?id=b4f2e97d5ad74fbbb8c1",
|
||||||
"/assets/admin/js/app.js.map": "/assets/admin/js/app.js.map?id=d7cf2fb613c6991e3725",
|
"/assets/installer/js/app.js": "/assets/installer/js/app.js?id=83f3226250dcffc124b0",
|
||||||
"/assets/frontend/js/app.js": "/assets/frontend/js/app.js?id=cd0e1cc7897d01d2b2c8",
|
"/assets/admin/js/app.js": "/assets/admin/js/app.js?id=b3b38b9ffe987af4c1e7",
|
||||||
"/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=4e7a6eff0f7ee6e041a4",
|
"/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=bdbd85be3fb1f0381fc2",
|
||||||
"/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=71ff475a10f4f7af711c",
|
"/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=c40e60a13efd077c7c02",
|
||||||
"/assets/frontend/js/app.js.map": "/assets/frontend/js/app.js.map?id=354cbdecd6ca9a777054",
|
|
||||||
"/assets/frontend/css/now-ui-kit.css.map": "/assets/frontend/css/now-ui-kit.css.map?id=e5c9b2a4e9d0a7678653",
|
|
||||||
"/assets/admin/css/vendor.min.css.map": "/assets/admin/css/vendor.min.css.map?id=ef71a09a5b9fa35df9a9",
|
|
||||||
"/assets/installer/js/app.js": "/assets/installer/js/app.js?id=4ebdf2b99afe39ca2dc3",
|
|
||||||
"/assets/installer/js/app.js.map": "/assets/installer/js/app.js.map?id=03bfe28bb64a23033bec",
|
|
||||||
"/assets/fonts/glyphicons-halflings-regular.woff2": "/assets/fonts/glyphicons-halflings-regular.woff2?id=349344e92fb16221dd56",
|
"/assets/fonts/glyphicons-halflings-regular.woff2": "/assets/fonts/glyphicons-halflings-regular.woff2?id=349344e92fb16221dd56",
|
||||||
"/assets/admin/fonts/glyphicons-halflings-regular.woff2": "/assets/admin/fonts/glyphicons-halflings-regular.woff2?id=349344e92fb16221dd56",
|
"/assets/admin/fonts/glyphicons-halflings-regular.woff2": "/assets/admin/fonts/glyphicons-halflings-regular.woff2?id=349344e92fb16221dd56",
|
||||||
"/assets/admin/img/clear.png": "/assets/admin/img/clear.png?id=63b3af84650a0145d61a",
|
"/assets/admin/img/clear.png": "/assets/admin/img/clear.png?id=63b3af84650a0145d61a",
|
||||||
"/assets/admin/img/loading.gif": "/assets/admin/img/loading.gif?id=1e2db432947c2dca1b9f",
|
"/assets/admin/img/loading.gif": "/assets/admin/img/loading.gif?id=1e2db432947c2dca1b9f",
|
||||||
"/assets/global/js/jquery.js": "/assets/global/js/jquery.js?id=2849239b95f5a9a2aea3",
|
"/assets/global/js/jquery.js": "/assets/global/js/jquery.js?id=2849239b95f5a9a2aea3",
|
||||||
|
"/assets/global/css/images/layers-2x.png": "/assets/global/css/images/layers-2x.png?id=f905cd0e87fcdde8969b",
|
||||||
|
"/assets/global/css/images/layers.png": "/assets/global/css/images/layers.png?id=3d61d49c98ea3572cae4",
|
||||||
|
"/assets/global/css/images/marker-icon-2x.png": "/assets/global/css/images/marker-icon-2x.png?id=da330e712dc6fc8c7d58",
|
||||||
|
"/assets/global/css/images/marker-icon.png": "/assets/global/css/images/marker-icon.png?id=1045a925825f69b0a874",
|
||||||
|
"/assets/global/css/images/marker-shadow.png": "/assets/global/css/images/marker-shadow.png?id=43ccefc930d47f2e3a17",
|
||||||
"/assets/admin/css/blue.png": "/assets/admin/css/blue.png?id=39437a6200d8066a49d4",
|
"/assets/admin/css/blue.png": "/assets/admin/css/blue.png?id=39437a6200d8066a49d4",
|
||||||
"/assets/admin/css/blue@2x.png": "/assets/admin/css/blue@2x.png?id=127d7cfbb176dc559854",
|
"/assets/admin/css/blue@2x.png": "/assets/admin/css/blue@2x.png?id=127d7cfbb176dc559854",
|
||||||
"/assets/frontend/js/vendor.js": "/assets/frontend/js/vendor.js?id=3ab539b466b46ef2ed84",
|
"/assets/frontend/js/vendor.js": "/assets/frontend/js/vendor.js?id=3ab539b466b46ef2ed84",
|
||||||
"/assets/admin/css/vendor.css": "/assets/admin/css/vendor.css?id=4e79a5c8b0241493191b",
|
"/assets/admin/css/vendor.css": "/assets/admin/css/vendor.css?id=568fd06f4beaec54aa13",
|
||||||
"/assets/admin/js/vendor.js": "/assets/admin/js/vendor.js?id=edb4f99fb0b0998555c1",
|
"/assets/admin/js/vendor.js": "/assets/admin/js/vendor.js?id=edb4f99fb0b0998555c1",
|
||||||
"/assets/installer/css/vendor.css": "/assets/installer/css/vendor.css?id=a60c0e373bba3e7cd76b",
|
"/assets/vendor/ckeditor4/CHANGES.md": "/assets/vendor/ckeditor4/CHANGES.md?id=f6aecaa34a4f047b698b",
|
||||||
|
"/assets/vendor/ckeditor4/LICENSE.md": "/assets/vendor/ckeditor4/LICENSE.md?id=bdd7b1a5211ef8687a2b",
|
||||||
|
"/assets/vendor/ckeditor4/README.md": "/assets/vendor/ckeditor4/README.md?id=54b2071da0fd5125556d",
|
||||||
|
"/assets/vendor/ckeditor4/bower.json": "/assets/vendor/ckeditor4/bower.json?id=a6d6f831706863d6df7a",
|
||||||
|
"/assets/vendor/ckeditor4/ckeditor.js": "/assets/vendor/ckeditor4/ckeditor.js?id=aa81f7b2b2ddb8c4e0dd",
|
||||||
|
"/assets/vendor/ckeditor4/composer.json": "/assets/vendor/ckeditor4/composer.json?id=7d18ab5f522c8ecf3892",
|
||||||
|
"/assets/vendor/ckeditor4/config.js": "/assets/vendor/ckeditor4/config.js?id=dbc65722e8c3bae5b43b",
|
||||||
|
"/assets/vendor/ckeditor4/contents.css": "/assets/vendor/ckeditor4/contents.css?id=471be63a33e8ce099801",
|
||||||
|
"/assets/vendor/ckeditor4/package.json": "/assets/vendor/ckeditor4/package.json?id=4c783954edc3a50b72fc",
|
||||||
|
"/assets/vendor/ckeditor4/styles.js": "/assets/vendor/ckeditor4/styles.js?id=f5d57c2be704fbecec57",
|
||||||
|
"/assets/installer/css/vendor.css": "/assets/installer/css/vendor.css?id=29cfe641b34ad0c7ed19",
|
||||||
"/assets/installer/js/vendor.js": "/assets/installer/js/vendor.js?id=4398fa9f7340f95a1107",
|
"/assets/installer/js/vendor.js": "/assets/installer/js/vendor.js?id=4398fa9f7340f95a1107",
|
||||||
"/assets/global/js/vendor.js": "/assets/global/js/vendor.js?id=bb691042c0629f4af9f5",
|
"/assets/global/js/vendor.js": "/assets/global/js/vendor.js?id=bb691042c0629f4af9f5",
|
||||||
"/assets/global/css/vendor.css": "/assets/global/css/vendor.css?id=e01e86f8033ae9836957"
|
"/assets/global/css/vendor.css": "/assets/global/css/vendor.css?id=e01e86f8033ae9836957"
|
||||||
|
|||||||
Reference in New Issue
Block a user