diff --git a/web/pgadmin/static/css/wcDocker/Themes/pgadmin.css b/web/pgadmin/static/css/wcDocker/Themes/pgadmin.css index 11d87ecdb..e46f5716f 100644 --- a/web/pgadmin/static/css/wcDocker/Themes/pgadmin.css +++ b/web/pgadmin/static/css/wcDocker/Themes/pgadmin.css @@ -67,24 +67,36 @@ } .wcFrameEdge { - border-width: 3px; - border-style: groove; - border-color: #dddddd; - background-color: #999999; + border: 1px solid #dddddd; + background-color: #dddddd; +} +.wcFrame > .wcFrameEdgeV ~ .wcFrameEdgeV { + box-shadow: 3px 6px 3px 1px #888888 !important; +} + +.wcFrame > .wcFrameEdge ~ .wcFrameEdgeV { + box-shadow: 1px 0px 0px 0px #888888; +} + +.wcFrame > .wcFrameEdgeH ~ .wcFrameEdgeH { + box-shadow: 2px 3px 3px 2px #888888 !important; +} + +.wcFrame > .wcFrameEdgeH { + box-shadow: 1px 0px 0px 0px #888888; } .wcFrameEdgeH { - height: 6px; + height: 4px; } .wcFrameEdgeV { - width: 6px; + width: 4px; } - .wcFrameCornerNW, .wcFrameCornerNE { - height: 6px; - width: 6px; + height: 4px; + width: 4px; } .wcSplitterBar { diff --git a/web/pgadmin/static/js/wcDocker/README b/web/pgadmin/static/js/wcDocker/README new file mode 100644 index 000000000..df04fbdec --- /dev/null +++ b/web/pgadmin/static/js/wcDocker/README @@ -0,0 +1,37 @@ +The wcDocker theme frame width has been changed from 6px to 4px. This change has +been brought about to keep the width of the frame consistent with the width of +the window divider. + +Below is the git diff of wcDocker.js + +diff --git a/web/pgadmin/static/js/wcDocker/wcDocker.js b/web/pgadmin/static/js/wcDocker/wcDocker.js +index 954d73e..bc64b3b 100755 +--- a/web/pgadmin/static/js/wcDocker/wcDocker.js ++++ b/web/pgadmin/static/js/wcDocker/wcDocker.js +@@ -3408,14 +3408,14 @@ define('wcDocker/frame',[ + this.$frame.append(this.$center); + + if (this._isFloating) { +- this.$top = $('
').css('top', '-6px').css('left', '0px').css('right', '0px'); +- this.$bottom = $('').css('bottom', '-6px').css('left', '0px').css('right', '0px'); +- this.$left = $('').css('left', '-6px').css('top', '0px').css('bottom', '0px'); +- this.$right = $('').css('right', '-6px').css('top', '0px').css('bottom', '0px'); +- this.$corner1 = $('').css('top', '-6px').css('left', '-6px'); +- this.$corner2 = $('').css('top', '-6px').css('right', '-6px'); +- this.$corner3 = $('').css('bottom', '-6px').css('right', '-6px'); +- this.$corner4 = $('').css('bottom', '-6px').css('left', '-6px'); ++ this.$top = $('').css('top', '-4px').css('left', '0px').css('right', '0px'); ++ this.$bottom = $('').css('bottom', '-4px').css('left', '0px').css('right', '0px'); ++ this.$left = $('').css('left', '-4px').css('top', '0px').css('bottom', '0px'); ++ this.$right = $('').css('right', '-4px').css('top', '0px').css('bottom', '0px'); ++ this.$corner1 = $('').css('top', '-4px').css('left', '-4px'); ++ this.$corner2 = $('').css('top', '-4px').css('right', '-4px'); ++ this.$corner3 = $('').css('bottom', '-4px').css('right', '-4px'); ++ this.$corner4 = $('').css('bottom', '-4px').css('left', '-4px'); + + this.$frame.append(this.$top); + this.$frame.append(this.$bottom); + +The same changes have been made to wcDocker-min.js and is not included as the +file is tidy formatted. + diff --git a/web/pgadmin/static/js/wcDocker/wcDocker.js b/web/pgadmin/static/js/wcDocker/wcDocker.js index 954d73e27..bc64b3b97 100755 --- a/web/pgadmin/static/js/wcDocker/wcDocker.js +++ b/web/pgadmin/static/js/wcDocker/wcDocker.js @@ -3408,14 +3408,14 @@ define('wcDocker/frame',[ this.$frame.append(this.$center); if (this._isFloating) { - this.$top = $('').css('top', '-6px').css('left', '0px').css('right', '0px'); - this.$bottom = $('').css('bottom', '-6px').css('left', '0px').css('right', '0px'); - this.$left = $('').css('left', '-6px').css('top', '0px').css('bottom', '0px'); - this.$right = $('').css('right', '-6px').css('top', '0px').css('bottom', '0px'); - this.$corner1 = $('').css('top', '-6px').css('left', '-6px'); - this.$corner2 = $('').css('top', '-6px').css('right', '-6px'); - this.$corner3 = $('').css('bottom', '-6px').css('right', '-6px'); - this.$corner4 = $('').css('bottom', '-6px').css('left', '-6px'); + this.$top = $('').css('top', '-4px').css('left', '0px').css('right', '0px'); + this.$bottom = $('').css('bottom', '-4px').css('left', '0px').css('right', '0px'); + this.$left = $('').css('left', '-4px').css('top', '0px').css('bottom', '0px'); + this.$right = $('').css('right', '-4px').css('top', '0px').css('bottom', '0px'); + this.$corner1 = $('').css('top', '-4px').css('left', '-4px'); + this.$corner2 = $('').css('top', '-4px').css('right', '-4px'); + this.$corner3 = $('').css('bottom', '-4px').css('right', '-4px'); + this.$corner4 = $('').css('bottom', '-4px').css('left', '-4px'); this.$frame.append(this.$top); this.$frame.append(this.$bottom); diff --git a/web/pgadmin/static/js/wcDocker/wcDocker.min.js b/web/pgadmin/static/js/wcDocker/wcDocker.min.js index ddb24f1b6..e2b2e7748 100755 --- a/web/pgadmin/static/js/wcDocker/wcDocker.min.js +++ b/web/pgadmin/static/js/wcDocker/wcDocker.min.js @@ -32,7 +32,7 @@ */ !function(){var t,e,a;!function(r){function o(t,e){return g.call(t,e)}function i(t,e){var a,r,o,i,n,s,l,c,h,u,d,f=e&&e.split("/"),p=m.map,b=p&&p["*"]||{};if(t&&"."===t.charAt(0))if(e){for(t=t.split("/"),n=t.length-1,m.nodeIdCompat&&x.test(t[n])&&(t[n]=t[n].replace(x,"")),t=f.slice(0,f.length-1).concat(t),h=0;h