mirror of
https://github.com/silverstripe/silverstripe-blog
synced 2024-10-22 11:05:58 +02:00
FIX Javascript and SCSS linting and removed unused images
This commit is contained in:
Raissa North
parent
12e8025e6f
commit
8b005b3251
39
client/dist/js/main.bundle.js
vendored
39
client/dist/js/main.bundle.js
vendored
@ -74,11 +74,15 @@ module.exports = jQuery;
|
||||
|
||||
/***/ }),
|
||||
/* 1 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
||||
|
||||
/* WEBPACK VAR INJECTION */(function(jQuery) {(function ($) {
|
||||
"use strict";
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_jquery__ = __webpack_require__(0);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_jquery___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_jquery__);
|
||||
|
||||
$.entwine('ss', function ($) {
|
||||
|
||||
|
||||
__WEBPACK_IMPORTED_MODULE_0_jquery___default.a.entwine('ss', function ($) {
|
||||
$('.cms-content-fields > #Form_EditForm_error').entwine({
|
||||
'onadd': function onadd() {
|
||||
var $target = $('.blog-admin-outer');
|
||||
@ -180,28 +184,29 @@ module.exports = jQuery;
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
})(jQuery);
|
||||
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
|
||||
});
|
||||
|
||||
/***/ }),
|
||||
/* 2 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
||||
|
||||
/* WEBPACK VAR INJECTION */(function(jQuery) {(function ($) {
|
||||
$.entwine('ss', function ($) {
|
||||
"use strict";
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_jquery__ = __webpack_require__(0);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_jquery___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_jquery__);
|
||||
|
||||
|
||||
__WEBPACK_IMPORTED_MODULE_0_jquery___default.a.entwine('ss', function ($) {
|
||||
$('.add-existing-autocompleter input.text').entwine({
|
||||
'onkeydown': function onkeydown(e) {
|
||||
if (e.which == 13) {
|
||||
$parent = $(this).parents('.add-existing-autocompleter');
|
||||
if (e.which === 13) {
|
||||
var $parent = $(this).parents('.add-existing-autocompleter');
|
||||
$parent.find('button[type="submit"]').click();
|
||||
e.preventDefault();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
})(jQuery);
|
||||
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
|
||||
});
|
||||
|
||||
/***/ }),
|
||||
/* 3 */
|
||||
@ -209,10 +214,8 @@ module.exports = jQuery;
|
||||
|
||||
"use strict";
|
||||
Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_bundles_cms_js__ = __webpack_require__(1);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_bundles_cms_js___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_bundles_cms_js__);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_bundles_gridfieldaddbydbfield_js__ = __webpack_require__(2);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_bundles_gridfieldaddbydbfield_js___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_bundles_gridfieldaddbydbfield_js__);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_bundles_cms__ = __webpack_require__(1);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_bundles_gridfieldaddbydbfield__ = __webpack_require__(2);
|
||||
|
||||
|
||||
|
||||
|
||||
2
client/dist/styles/main.css
vendored
2
client/dist/styles/main.css
vendored
@ -1,2 +1,2 @@
|
||||
.no-sidebar .content-container.size3of4{width:75%}.blog-entry .post-image img{width:98.75%}.blog-sidebar .WidgetHolder ul{margin-left:0}.blog-sidebar .WidgetHolder ul li,ul.blogTagCloud{list-style-type:none}ul.blogTagCloud{clear:both}ul.blogTagCloud li{float:left;display:inline;padding-right:8px}ul.blogTagCloud li a span{float:left;line-height:30px;text-align:center;padding:0}ul.blogTagCloud .tagCount10{font-size:26pt}ul.blogTagCloud .tagCount9{font-size:24pt}ul.blogTagCloud .tagCount8{font-size:22pt}ul.blogTagCloud .tagCount7{font-size:20pt}ul.blogTagCloud .tagCount6{font-size:18pt}ul.blogTagCloud .tagCount5{font-size:16pt}ul.blogTagCloud .tagCount4{font-size:14pt}ul.blogTagCloud .tagCount3{font-size:12pt}ul.blogTagCloud .tagCount2{font-size:10pt}ul.blogTagCloud .tagCount1{font-size:8pt}#FeaturedImage .middleColumn{clear:none;float:left}.has-panel .cms-content-tools.blog-admin-sidebar{width:280px;border-right:none;border-left:1px solid #c0c0c2;position:absolute!important;right:0;top:0;height:100%}.has-panel .cms-content-tools.blog-admin-sidebar .cms-panel-toggle a{text-align:left;margin:0}.has-panel .cms-content-tools.blog-admin-sidebar .cms-panel-toggle.south{border-top:1px solid #aaa}.has-panel .cms-content-tools.blog-admin-sidebar~.blog-admin-outer{width:100%;padding-right:280px;position:absolute;height:100%;overflow-y:hidden;overflow-x:hidden;-webkit-box-sizing:border-box;box-sizing:border-box}.has-panel .cms-content-tools.blog-admin-sidebar~.blog-admin-outer>.ss-tabset{position:relative;overflow:auto;height:100%;width:100%}.has-panel .cms-content-tools.blog-admin-sidebar~.blog-admin-outer>.ss-tabset #Title label{float:none}.has-panel .cms-content-tools.blog-admin-sidebar~.blog-admin-outer>.ss-tabset #Title .middleColumn,.has-panel .cms-content-tools.blog-admin-sidebar~.blog-admin-outer>.ss-tabset #Title input{width:100%;max-width:100%;margin-left:0}.has-panel .cms-content-tools.blog-admin-sidebar .cms-content-view>.field+.field{margin-top:10px}.has-panel .cms-content-tools.blog-admin-sidebar .cms-content-view>.field.urlsegment .preview{padding-top:0;line-height:25px}.has-panel .cms-content-tools.blog-admin-sidebar .cms-content-view>.field.urlsegment .edit{float:right}.has-panel .cms-content-tools.blog-admin-sidebar .cms-content-view>.field.datetime>.middleColumn>.date{width:60%}.has-panel .cms-content-tools.blog-admin-sidebar .cms-content-view>.field.datetime>.middleColumn>.time{width:36%;float:right}.has-panel .cms-content-tools.blog-admin-sidebar .cms-content-view>.field.datetime>.middleColumn .middleColumn,.has-panel .cms-content-tools.blog-admin-sidebar .cms-content-view>.field.datetime>.middleColumn input{width:100%}.has-panel .cms-content-tools.blog-admin-sidebar.collapsed~.blog-admin-outer{padding-right:41px}.has-panel .cms-content-tools.blog-admin-sidebar.collapsed~.blog-admin-outer #Root_Main{margin-right:15px}.has-panel .cms-content-tools.blog-admin-sidebar.cms-content-tools .cms-panel-content{width:auto}.toggle-description{text-indent:-1000000px;display:inline-block;width:20px;height:20px;margin-left:4px;cursor:pointer}.middleColumn.toggle-description-correct-middle{margin-left:0;float:left;width:416px}.tab-content .field p.toggle-description-correct-right{display:inline-block;margin-left:0;padding-left:0;clear:none;float:left}.description.toggle-description-correct-description{width:416px;padding:12px 0}.custom-summary .ui-accordion-content .field{margin:0}.custom-summary .ui-accordion-content,.custom-summary .ui-accordion-content .field{padding:0}.custom-summary .ui-icon-triangle-1-e{background-position:-16px -128px}.cms table.ss-gridfield-table tr td.MergeAction{width:225px}.cms table.ss-gridfield-table tr td.MergeAction a{display:block;height:100%;width:100%}.cms table.ss-gridfield-table tr td.MergeAction select{width:150px}.cms-content-actions,.cms-preview-controls{z-index:999}.blog-cms-categorisation .MergeActionReveal{margin-left:10px}.blog-cms-categorisation .toolbar--content{margin-top:0}.blog-cms-categorisation .MergeActionReveal:after{content:"";display:inline-block;height:16px;width:16px;margin-left:4px}.blog-cms-categorisation button.action{margin-left:5px}
|
||||
.no-sidebar .content-container.size3of4{width:75%}.blog-entry .post-image img{width:98.75%}.blog-sidebar .WidgetHolder ul{margin-left:0}.blog-sidebar .WidgetHolder ul li,ul.blogTagCloud{list-style-type:none}ul.blogTagCloud{clear:both}ul.blogTagCloud li{float:left;display:inline;padding-right:8px}ul.blogTagCloud li a span{float:left;line-height:30px;text-align:center;padding:0}ul.blogTagCloud .tagCount10{font-size:26pt}ul.blogTagCloud .tagCount9{font-size:24pt}ul.blogTagCloud .tagCount8{font-size:22pt}ul.blogTagCloud .tagCount7{font-size:20pt}ul.blogTagCloud .tagCount6{font-size:18pt}ul.blogTagCloud .tagCount5{font-size:16pt}ul.blogTagCloud .tagCount4{font-size:14pt}ul.blogTagCloud .tagCount3{font-size:12pt}ul.blogTagCloud .tagCount2{font-size:10pt}ul.blogTagCloud .tagCount1{font-size:8pt}#FeaturedImage .middleColumn{clear:none;float:left}.has-panel .cms-content-tools.blog-admin-sidebar{width:280px;border-right:0;border-left:1px solid #c0c0c2;position:absolute!important;right:0;top:0;height:100%}.has-panel .cms-content-tools.blog-admin-sidebar .cms-panel-toggle a{text-align:left;margin:0}.has-panel .cms-content-tools.blog-admin-sidebar .cms-panel-toggle.south{border-top:1px solid #aaa}.has-panel .cms-content-tools.blog-admin-sidebar~.blog-admin-outer{width:100%;padding-right:280px;position:absolute;height:100%;overflow-y:hidden;overflow-x:hidden;-webkit-box-sizing:border-box;box-sizing:border-box}.has-panel .cms-content-tools.blog-admin-sidebar~.blog-admin-outer>.ss-tabset{position:relative;overflow:auto;height:100%;width:100%}.has-panel .cms-content-tools.blog-admin-sidebar~.blog-admin-outer>.ss-tabset #Title label{float:none}.has-panel .cms-content-tools.blog-admin-sidebar~.blog-admin-outer>.ss-tabset #Title .middleColumn,.has-panel .cms-content-tools.blog-admin-sidebar~.blog-admin-outer>.ss-tabset #Title input{width:100%;max-width:100%;margin-left:0}.has-panel .cms-content-tools.blog-admin-sidebar .cms-content-view>.field+.field{margin-top:10px}.has-panel .cms-content-tools.blog-admin-sidebar .cms-content-view>.field.urlsegment .preview{padding-top:0;line-height:25px}.has-panel .cms-content-tools.blog-admin-sidebar .cms-content-view>.field.urlsegment .edit{float:right}.has-panel .cms-content-tools.blog-admin-sidebar .cms-content-view>.field.datetime>.middleColumn>.date{width:60%}.has-panel .cms-content-tools.blog-admin-sidebar .cms-content-view>.field.datetime>.middleColumn>.time{width:36%;float:right}.has-panel .cms-content-tools.blog-admin-sidebar .cms-content-view>.field.datetime>.middleColumn .middleColumn,.has-panel .cms-content-tools.blog-admin-sidebar .cms-content-view>.field.datetime>.middleColumn input{width:100%}.has-panel .cms-content-tools.blog-admin-sidebar.collapsed~.blog-admin-outer{padding-right:41px}.has-panel .cms-content-tools.blog-admin-sidebar.collapsed~.blog-admin-outer #Root_Main{margin-right:15px}.has-panel .cms-content-tools.blog-admin-sidebar.cms-content-tools .cms-panel-content{width:auto}.toggle-description{display:inline-block;font-size:1.2rem;width:20px;height:20px;margin-top:1px;cursor:pointer}.middleColumn.toggle-description-correct-middle{margin-left:0;float:left;width:416px}.tab-content .field p.toggle-description-correct-right{display:inline-block;margin-left:0;padding-left:0;clear:none;float:left}.description.toggle-description-correct-description{width:416px;padding:12px 0}.custom-summary .ui-accordion-content,.custom-summary .ui-accordion-content .field{padding:0}.custom-summary .ui-icon-triangle-1-e{background-position:-16px -128px}.cms table.ss-gridfield-table tr td.MergeAction{width:225px}.cms table.ss-gridfield-table tr td.MergeAction a{display:block;height:100%;width:100%}.cms table.ss-gridfield-table tr td.MergeAction select{width:150px}.cms-content-actions,.cms-preview-controls{z-index:999}.blog-cms-categorisation .toolbar--content{margin-top:0}.blog-cms-categorisation .MergeActionReveal:after{content:"@";font-family:silverstripe;display:inline-block;position:relative;margin-left:10px;top:3px}.blog-cms-categorisation .blog-merge-action{margin-top:5px}
|
||||
/*# sourceMappingURL=main.css.map*/
|
||||
|
Before Width: | Height: | Size: 550 B After Width: | Height: | Size: 550 B |
@ -1,7 +1,7 @@
|
||||
(function ($) {
|
||||
|
||||
$.entwine('ss', function ($) {
|
||||
/* global window */
|
||||
import jQuery from 'jquery';
|
||||
|
||||
jQuery.entwine('ss', ($) => {
|
||||
/**
|
||||
* The page success/error message sits outside of the html block
|
||||
* containing the sidebar and cms fields. This means it overflows
|
||||
@ -139,6 +139,4 @@
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
});
|
||||
})(jQuery);
|
||||
});
|
||||
|
||||
@ -1,16 +1,17 @@
|
||||
(function ($) {
|
||||
$.entwine('ss', function ($) {
|
||||
import jQuery from 'jquery';
|
||||
|
||||
jQuery.entwine('ss', ($) => {
|
||||
/**
|
||||
* Prevent the CMS hijacking the return key
|
||||
*/
|
||||
$('.add-existing-autocompleter input.text').entwine({
|
||||
'onkeydown': function (e) {
|
||||
if (e.which == 13) {
|
||||
$parent = $(this).parents('.add-existing-autocompleter');
|
||||
if (e.which === 13) {
|
||||
const $parent = $(this).parents('.add-existing-autocompleter');
|
||||
$parent.find('button[type="submit"]').click();
|
||||
e.preventDefault();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
})(jQuery);
|
||||
});
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
import 'bundles/cms.js';
|
||||
import 'bundles/gridfieldaddbydbfield.js';
|
||||
import 'bundles/cms';
|
||||
import 'bundles/gridfieldaddbydbfield';
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
}
|
||||
|
||||
// tag cloud related
|
||||
$baseTagFontSize:4pt;
|
||||
$base_tag_font_size: 4pt;
|
||||
|
||||
ul.blogTagCloud {
|
||||
list-style-type: none;
|
||||
@ -28,48 +28,49 @@ ul.blogTagCloud {
|
||||
|
||||
a span {
|
||||
float: left;
|
||||
line-height: 30px; text-align: center;
|
||||
padding: 0px;
|
||||
line-height: 30px;
|
||||
text-align: center;
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.tagCount10 {
|
||||
font-size: $baseTagFontSize+22pt;
|
||||
font-size: $base_tag_font_size + 22pt;
|
||||
}
|
||||
|
||||
.tagCount9 {
|
||||
font-size: $baseTagFontSize+20pt;
|
||||
font-size: $base_tag_font_size + 20pt;
|
||||
}
|
||||
|
||||
.tagCount8 {
|
||||
font-size: $baseTagFontSize+18pt;
|
||||
font-size: $base_tag_font_size + 18pt;
|
||||
}
|
||||
|
||||
.tagCount7 {
|
||||
font-size: $baseTagFontSize+16pt;
|
||||
font-size: $base_tag_font_size + 16pt;
|
||||
}
|
||||
|
||||
.tagCount6 {
|
||||
font-size: $baseTagFontSize+14pt;
|
||||
font-size: $base_tag_font_size + 14pt;
|
||||
}
|
||||
|
||||
.tagCount5 {
|
||||
font-size: $baseTagFontSize+12pt;
|
||||
font-size: $base_tag_font_size + 12pt;
|
||||
}
|
||||
|
||||
.tagCount4 {
|
||||
font-size: $baseTagFontSize+10pt;
|
||||
font-size: $base_tag_font_size + 10pt;
|
||||
}
|
||||
|
||||
.tagCount3 {
|
||||
font-size: $baseTagFontSize+8pt;
|
||||
font-size: $base_tag_font_size + 8pt;
|
||||
}
|
||||
|
||||
.tagCount2 {
|
||||
font-size: $baseTagFontSize+6pt;
|
||||
font-size: $base_tag_font_size + 6pt;
|
||||
}
|
||||
|
||||
.tagCount1 {
|
||||
font-size: $baseTagFontSize+4pt;
|
||||
font-size: $base_tag_font_size + 4pt;
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,10 +9,10 @@
|
||||
|
||||
.has-panel .cms-content-tools.blog-admin-sidebar {
|
||||
width: 280px;
|
||||
border-right: none;
|
||||
border-right: 0;
|
||||
border-left: 1px solid #C0C0C2;
|
||||
position: absolute !important; /* overrides cms !imporant style */
|
||||
right: 0px;
|
||||
right: 0;
|
||||
top: 0;
|
||||
height: 100%;
|
||||
|
||||
@ -44,7 +44,9 @@
|
||||
label {
|
||||
float: none;
|
||||
}
|
||||
.middleColumn, input {
|
||||
|
||||
.middleColumn,
|
||||
input {
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
margin-left: 0;
|
||||
@ -81,7 +83,8 @@
|
||||
float: right;
|
||||
}
|
||||
|
||||
.middleColumn, input {
|
||||
.middleColumn,
|
||||
input {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
@ -97,7 +100,6 @@
|
||||
margin-right: 15px;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
&.cms-content-tools {
|
||||
@ -108,13 +110,12 @@
|
||||
}
|
||||
|
||||
.toggle-description {
|
||||
text-indent: -1000000px;
|
||||
display: inline-block;
|
||||
//background: url("../images/information.png") no-repeat center center;
|
||||
font-size: 1.2rem;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
margin-left: 4px;
|
||||
cursor:pointer;
|
||||
margin-top: 1px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.middleColumn.toggle-description-correct-middle {
|
||||
@ -137,15 +138,12 @@
|
||||
}
|
||||
|
||||
.custom-summary {
|
||||
.ui-accordion-content .field {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.ui-accordion-content,
|
||||
.ui-accordion-content .field {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
// Change the caret to a plus icon
|
||||
.ui-icon-triangle-1-e {
|
||||
background-position: -16px -128px;
|
||||
}
|
||||
@ -173,24 +171,20 @@
|
||||
}
|
||||
|
||||
.blog-cms-categorisation {
|
||||
.MergeActionReveal {
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.toolbar--content {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.MergeActionReveal:after {
|
||||
content: '';
|
||||
//background: url('../images/move-icon.png');
|
||||
content: "@";
|
||||
font-family: silverstripe;
|
||||
display: inline-block;
|
||||
height: 16px;
|
||||
width: 16px;
|
||||
margin-left: 4px;
|
||||
position: relative;
|
||||
margin-left: 10px;
|
||||
top: 3px;
|
||||
}
|
||||
|
||||
button.action {
|
||||
margin-left: 5px;
|
||||
.blog-merge-action {
|
||||
margin-top: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 680 B |
Binary file not shown.
|
Before Width: | Height: | Size: 778 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB |
Loading…
Reference in New Issue
Block a user