diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css index 312dd5a6f..f995f7ae2 100644 --- a/modules/backend/assets/css/october.css +++ b/modules/backend/assets/css/october.css @@ -300,7 +300,7 @@ html.mobile .control-scrollbar {overflow:auto;-webkit-overflow-scrolling:touch} .control-treeview ol >li >div >span.drag-handle {font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0;-webkit-transition:opacity 0.4s;transition:opacity 0.4s;position:absolute;right:9px;bottom:0;width:18px;height:19px;cursor:move;color:#bdc3c7;opacity:0;filter:alpha(opacity=0)} .control-treeview ol >li >div >span.drag-handle:before {font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f0c9";font-size:18px} .control-treeview ol >li >div span.borders {font-size:0} -.control-treeview ol >li >div >ul.submenu {position:absolute;left:20px;bottom:-37px;padding:0;list-style:none;z-index:200;height:37px;display:none;margin-left:15px;background:transparent url(../images/treeview-submenu-tabs.png) repeat-x left -39px} +.control-treeview ol >li >div >ul.submenu {position:absolute;left:20px;bottom:-36.9px;padding:0;list-style:none;z-index:200;height:37px;display:none;margin-left:15px;background:transparent url(../images/treeview-submenu-tabs.png) repeat-x left -39px} .control-treeview ol >li >div >ul.submenu:before, .control-treeview ol >li >div >ul.submenu:after {background:transparent url(../images/treeview-submenu-tabs.png) no-repeat left top;content:' ';display:block;width:20px;height:37px;position:absolute;top:0} .control-treeview ol >li >div >ul.submenu:before {left:-20px} @@ -610,7 +610,7 @@ body {font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sa .layout >.layout-row >.layout-cell.min-height {height:0} .layout >.layout-row >.layout-cell.center {text-align:center} .layout >.layout-row >.layout-cell.middle {vertical-align:middle} -.layout >.layout-row.min-size {height:1px} +.layout >.layout-row.min-size {height:0.1px} .layout >.layout-cell {display:table-cell;vertical-align:top;height:100%} .layout >.layout-cell.layout-container, .layout >.layout-cell .layout-container, diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js index 51f488a50..3820594b4 100644 --- a/modules/backend/assets/js/october-min.js +++ b/modules/backend/assets/js/october-min.js @@ -690,7 +690,7 @@ if(!data)$this.data('oc.verticalMenu',(data=new VerticalMenu(this,toggleSelector if(typeof option=='string')data[option].call($this)})} $.fn.verticalMenu.Constructor=VerticalMenu $.fn.verticalMenu.noConflict=function(){$.fn.verticalMenu=old -return this}}(window.jQuery);(function($){$(window).on('load',function(){$('nav.navbar').each(function(){var +return this}}(window.jQuery);(function($){$(document).ready(function(){$('nav.navbar').each(function(){var navbar=$(this),nav=$('ul.nav',navbar),collapseMode=navbar.hasClass('navbar-mode-collapse'),isMobile=$('html').hasClass('mobile') nav.verticalMenu($('a.menu-toggle',navbar),{breakpoint:collapseMode?Infinity:769}) $('li.with-tooltip:not(.active) > a',navbar).tooltip({container:'body',placement:'bottom',template:''}).on('show.bs.tooltip',function(e){if(isMobile)e.preventDefault()}) @@ -1013,7 +1013,7 @@ if(typeof option=='string')data[option].call(data)})} $.fn.sidePanelTab.Constructor=SidePanelTab $.fn.sidePanelTab.noConflict=function(){$.fn.sidePanelTab=old return this} -$(window).on('load',function(){$('[data-control=layout-sidepanel]').sidePanelTab()}) +$(document).ready(function(){$('[data-control=layout-sidepanel]').sidePanelTab()}) $(document).ready(function(){if(Modernizr.touchevents||(typeof(localStorage)!=='undefined')){if(localStorage.ocSidePanelFixed==0){$(document.body).addClass('side-panel-not-fixed') $(window).trigger('resize')} else if(localStorage.ocSidePanelFixed==1){$(document.body).removeClass('side-panel-not-fixed') diff --git a/modules/backend/assets/js/october.js b/modules/backend/assets/js/october.js index d85db8bca..17fd9d38d 100644 --- a/modules/backend/assets/js/october.js +++ b/modules/backend/assets/js/october.js @@ -33,4 +33,4 @@ =require october.datetime.js =require backend.js -*/ \ No newline at end of file +*/ diff --git a/modules/backend/assets/js/october.navbar.js b/modules/backend/assets/js/october.navbar.js index f23bdce14..b2d537cf0 100644 --- a/modules/backend/assets/js/october.navbar.js +++ b/modules/backend/assets/js/october.navbar.js @@ -1,8 +1,8 @@ /* * Top navigation bar. Features of the bar: - * - Hide content if the display width is less than 768px. In this case the menu icon is displayed. + * - Hide content if the display width is less than 768px. In this case the menu icon is displayed. * When the icon is clicked, the menu content is displayed on the left side of the page. - * - If the content doesn't fit the navbar, it can be dragged left and right. + * - If the content doesn't fit the navbar, it can be dragged left and right. * * Dependences: * - DragScroll (october.dragscroll.js) @@ -10,7 +10,7 @@ */ (function($){ - $(window).on('load', function() { + $(document).ready(function(){ $('nav.navbar').each(function(){ var navbar = $(this), @@ -39,4 +39,4 @@ }) }) }) -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/modules/backend/assets/js/october.sidepaneltab.js b/modules/backend/assets/js/october.sidepaneltab.js index ba96d908b..9acca0011 100644 --- a/modules/backend/assets/js/october.sidepaneltab.js +++ b/modules/backend/assets/js/october.sidepaneltab.js @@ -230,7 +230,7 @@ // DATA-API // ============ - $(window).on('load', function() { + $(document).ready(function(){ $('[data-control=layout-sidepanel]').sidePanelTab() }) diff --git a/modules/backend/assets/less/controls/treeview.less b/modules/backend/assets/less/controls/treeview.less index 864e1dfbf..3b2b24b8a 100644 --- a/modules/backend/assets/less/controls/treeview.less +++ b/modules/backend/assets/less/controls/treeview.less @@ -108,7 +108,7 @@ > ul.submenu { position: absolute; left: 20px; - bottom: -37px; + bottom: -36.9px; padding: 0; list-style: none; z-index: 200; @@ -619,4 +619,4 @@ body.dragging .control-treeview { } } } -} \ No newline at end of file +} diff --git a/modules/backend/assets/less/layout/layout.less b/modules/backend/assets/less/layout/layout.less index 9535b315b..be3ff7fa8 100644 --- a/modules/backend/assets/less/layout/layout.less +++ b/modules/backend/assets/less/layout/layout.less @@ -137,7 +137,7 @@ body { } &.min-size { - height: 1px; + height: 0.1px; } } diff --git a/modules/system/assets/ui/js/drag.scroll.js b/modules/system/assets/ui/js/drag.scroll.js index fcd584d35..bcade23d6 100644 --- a/modules/system/assets/ui/js/drag.scroll.js +++ b/modules/system/assets/ui/js/drag.scroll.js @@ -15,7 +15,7 @@ * - vertical - determines if the scroll direction is vertical, true by default * - scrollClassContainer - if specified, specifies an element or element selector to apply the 'scroll-before' and 'scroll-after' CSS classes, * depending on whether the scrollable area is in its start or end - * - scrollMarkerContainer - if specified, specifies an element or element selector to inject scroll markers (span elements that con + * - scrollMarkerContainer - if specified, specifies an element or element selector to inject scroll markers (span elements that con * contain the ellipses icon, indicating whether scrolling is possible) * - useDrag - determines if dragging is allowed support, true by default * - useNative - if native CSS is enabled via "mobile" on the HTML tag, false by default