@concretecms/bedrock 1.1.14 → 1.1.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -24,7 +24,7 @@ import _ from 'underscore'
|
|
|
24
24
|
bindDelete: function ContainerBlockDelete() {
|
|
25
25
|
var my = this
|
|
26
26
|
var deleter = my.getElem().find('>ul a[data-inline-command=delete-block]')
|
|
27
|
-
deleter.on('click.containerDelete', function(e) {
|
|
27
|
+
deleter.unbind('click.containerDelete').on('click.containerDelete', function(e) {
|
|
28
28
|
e.preventDefault()
|
|
29
29
|
my.delete()
|
|
30
30
|
})
|
package/assets/cms/js/toolbar.js
CHANGED
|
@@ -341,6 +341,7 @@
|
|
|
341
341
|
},
|
|
342
342
|
|
|
343
343
|
disableDirectExit: function() {
|
|
344
|
+
ConcreteEvent.publish('ToolbarDirectExitDisabled')
|
|
344
345
|
var $link = $('li.ccm-toolbar-page-edit a')
|
|
345
346
|
if ($link.attr('data-launch-panel') != 'check-in' && $link.attr('data-disable-panel') != 'check-in') {
|
|
346
347
|
$link.attr('data-launch-panel', 'check-in').on('click', function() {
|
|
@@ -19,17 +19,17 @@ div#ccm-toolbar {
|
|
|
19
19
|
display: inline-block;
|
|
20
20
|
}
|
|
21
21
|
|
|
22
|
-
li > a {
|
|
22
|
+
.ccm-toolbar-item-list > li > a {
|
|
23
23
|
padding: 14px 16px;
|
|
24
24
|
width: auto !important;
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
li > a i,
|
|
28
|
-
li > a img {
|
|
27
|
+
.ccm-toolbar-item-list > li > a i,
|
|
28
|
+
.ccm-toolbar-item-list > li > a img {
|
|
29
29
|
position: static;
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
-
.spinner {
|
|
32
|
+
.ccm-toolbar-item-list > .spinner {
|
|
33
33
|
left: 11px;
|
|
34
34
|
}
|
|
35
35
|
}
|
|
@@ -265,37 +265,37 @@ a.ui-button:active,
|
|
|
265
265
|
|
|
266
266
|
.ui-icon,
|
|
267
267
|
.ui-widget-content .ui-icon {
|
|
268
|
-
background-image: url('
|
|
268
|
+
background-image: url('../../concrete/images/ui-icons_444444_256x240.png');
|
|
269
269
|
}
|
|
270
270
|
|
|
271
271
|
.ui-widget-header .ui-icon {
|
|
272
|
-
background-image: url('
|
|
272
|
+
background-image: url('../../concrete/images/ui-icons_444444_256x240.png');
|
|
273
273
|
}
|
|
274
274
|
|
|
275
275
|
.ui-state-hover .ui-icon,
|
|
276
276
|
.ui-state-focus .ui-icon,
|
|
277
277
|
.ui-button:hover .ui-icon,
|
|
278
278
|
.ui-button:focus .ui-icon {
|
|
279
|
-
background-image: url('
|
|
279
|
+
background-image: url('../../concrete/images/ui-icons_555555_256x240.png');
|
|
280
280
|
}
|
|
281
281
|
|
|
282
282
|
.ui-state-active .ui-icon,
|
|
283
283
|
.ui-button:active .ui-icon {
|
|
284
|
-
background-image: url('
|
|
284
|
+
background-image: url('../../concrete/images/ui-icons_ffffff_256x240.png');
|
|
285
285
|
}
|
|
286
286
|
|
|
287
287
|
.ui-state-highlight .ui-icon,
|
|
288
288
|
.ui-button .ui-state-highlight.ui-icon {
|
|
289
|
-
background-image: url('
|
|
289
|
+
background-image: url('../../concrete/images/ui-icons_777620_256x240.png');
|
|
290
290
|
}
|
|
291
291
|
|
|
292
292
|
.ui-state-error .ui-icon,
|
|
293
293
|
.ui-state-error-text .ui-icon {
|
|
294
|
-
background-image: url('
|
|
294
|
+
background-image: url('../../concrete/images/ui-icons_cc0000_256x240.png');
|
|
295
295
|
}
|
|
296
296
|
|
|
297
297
|
.ui-button .ui-icon {
|
|
298
|
-
background-image: url('
|
|
298
|
+
background-image: url('../../concrete/images/ui-icons_777777_256x240.png');
|
|
299
299
|
}
|
|
300
300
|
|
|
301
301
|
/* positioning */
|
package/package.json
CHANGED