@concretecms/bedrock 1.4.14 → 1.4.15
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.
- package/assets/calendar/js/backend/duration.js +4 -2
- package/assets/cms/js/edit-mode/area.js +2 -2
- package/assets/cms/scss/_page-areas.scss +1 -1
- package/assets/cms/scss/_type.scss +1 -1
- package/assets/cms/scss/bootstrap/_reboot.scss +1 -1
- package/assets/cms/scss/jquery-ui/_overrides.scss +3 -3
- package/package.json +1 -1
|
@@ -131,10 +131,12 @@
|
|
|
131
131
|
|
|
132
132
|
setupTimes: function () {
|
|
133
133
|
var my = this
|
|
134
|
+
var config = {}
|
|
135
|
+
config.maxOptions = null
|
|
134
136
|
var $startTime = my.$element.find('select[data-select=start-time]')
|
|
135
137
|
var $endTime = my.$element.find('select[data-select=end-time]')
|
|
136
|
-
var startTimeSelect = new TomSelect($startTime.get(0))
|
|
137
|
-
var endTimeSelect = new TomSelect($endTime.get(0))
|
|
138
|
+
var startTimeSelect = new TomSelect($startTime.get(0), config)
|
|
139
|
+
var endTimeSelect = new TomSelect($endTime.get(0), config)
|
|
138
140
|
|
|
139
141
|
$startTime.data('TomSelect', startTimeSelect)
|
|
140
142
|
$startTime.on('change', function () {
|
|
@@ -341,11 +341,11 @@
|
|
|
341
341
|
if (my.getDragAreas().length) {
|
|
342
342
|
throw new Error('No block supplied')
|
|
343
343
|
}
|
|
344
|
-
elem = $('<div class="ccm-area-drag-area"/>')
|
|
344
|
+
elem = $('<div class="ccm-area-drag-area ccm-ui"/>')
|
|
345
345
|
drag_area = new Concrete.DragArea(elem, my, block)
|
|
346
346
|
my.getBlockContainer().prepend(elem)
|
|
347
347
|
} else {
|
|
348
|
-
elem = $('<div class="ccm-area-drag-area"/>')
|
|
348
|
+
elem = $('<div class="ccm-area-drag-area ccm-ui"/>')
|
|
349
349
|
drag_area = new Concrete.DragArea(elem, my, block)
|
|
350
350
|
block.getContainer().after(elem)
|
|
351
351
|
}
|
|
@@ -689,7 +689,7 @@ div#ccm-menu-highlighter.ccm-block-highlight {
|
|
|
689
689
|
*/
|
|
690
690
|
div.ccm-area-drag-area {
|
|
691
691
|
height: 0;
|
|
692
|
-
line-height: 0;
|
|
692
|
+
line-height: 0 !important; // This needs !important so it overrides the line height set on .ccm-ui
|
|
693
693
|
transition: none;
|
|
694
694
|
|
|
695
695
|
span {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// Note - ideally these font families should be handled by Bootstrap but when using with
|
|
2
2
|
// A bootstrap theme the font family from the theme can sometimes take precedence. So let's
|
|
3
3
|
// redeclare it here as well.
|
|
4
|
-
body
|
|
4
|
+
body .ccm-ui {
|
|
5
5
|
h1,
|
|
6
6
|
.h1 {
|
|
7
7
|
font-family: $headings-font-family;
|
|
@@ -107,15 +107,15 @@ html.ccm-toolbar-visible {
|
|
|
107
107
|
}
|
|
108
108
|
|
|
109
109
|
.ui-widget {
|
|
110
|
-
font-family: inherit
|
|
110
|
+
font-family: var(--bs-body-font-family); // Should inherit this variable from a wrapping .ccm-ui class.
|
|
111
111
|
}
|
|
112
112
|
|
|
113
113
|
.ui-widget-header {
|
|
114
|
-
color: inherit
|
|
114
|
+
color: var(--bs-body-color); // Should inherit this variable from a wrapping .ccm-ui class.
|
|
115
115
|
}
|
|
116
116
|
|
|
117
117
|
.ui-widget-content {
|
|
118
|
-
color:
|
|
118
|
+
color: var(--bs-body-color); // Should inherit this variable from a wrapping .ccm-ui class.
|
|
119
119
|
}
|
|
120
120
|
|
|
121
121
|
.ui-widget-overlay {
|
package/package.json
CHANGED