=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-03-11 10:59:10 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-03-11 16:35:26 +0000 @@ -7121,7 +7121,9 @@ defaultButton, centerRegion, getLayoutWindow, - viewport; + viewport, + + scrollbarWidth = Ext.isWebKit ? 8 : (Ext.isLinux && Ext.isGecko ? 13 : 17); ns.app.stores = ns.app.stores || {}; @@ -7257,17 +7259,7 @@ preventHeader: true, collapsible: true, collapseMode: 'mini', - width: function() { - if (Ext.isWebKit) { - return ns.core.conf.layout.west_width + 8; - } - else { - if (Ext.isLinux && Ext.isGecko) { - return ns.core.conf.layout.west_width + 13; - } - return ns.core.conf.layout.west_width + 17; - } - }(), + width: ns.core.conf.layout.west_width + scrollbarWidth, items: [ typeToolbar, accordion @@ -7876,6 +7868,8 @@ } else { westRegion.hasScrollbar = true; + + caseButton.setWidth(caseButton.getWidth() + scrollbarWidth); } // expand init panels === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css 2015-03-04 16:03:20 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css 2015-03-11 16:35:26 +0000 @@ -771,12 +771,12 @@ .x-btn-default-toolbar-small-over { background-image: none; background-color: #f3f3f3; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f1f1f1), color-stop(100%, #f6f6f6)); - background-image: -webkit-linear-gradient(top, #f1f1f1,#f6f6f6); - background-image: -moz-linear-gradient(top, #f1f1f1,#f6f6f6); - background-image: -o-linear-gradient(top, #f1f1f1,#f6f6f6); - background-image: -ms-linear-gradient(top, #f1f1f1,#f6f6f6); - background-image: linear-gradient(top, #f1f1f1,#f6f6f6); + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f2f2f2), color-stop(100%, #f7f7f7)); + background-image: -webkit-linear-gradient(top, #f2f2f2,#f7f7f7); + background-image: -moz-linear-gradient(top, #f2f2f2,#f7f7f7); + background-image: -o-linear-gradient(top, #f2f2f2,#f7f7f7); + background-image: -ms-linear-gradient(top, #f2f2f2,#f7f7f7); + background-image: linear-gradient(top, #f2f2f2,#f7f7f7); } @@ -797,12 +797,12 @@ border-color: #aaa; background-image: none; background-color: #d6d6d6; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #cccccc), color-stop(100%, #e5e5e5)); - background-image: -webkit-linear-gradient(top, #cccccc,#e5e5e5); - background-image: -moz-linear-gradient(top, #cccccc,#e5e5e5); - background-image: -o-linear-gradient(top, #cccccc,#e5e5e5); - background-image: -ms-linear-gradient(top, #cccccc,#e5e5e5); - background-image: linear-gradient(top, #cccccc,#e5e5e5); + background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #d1d1d1), color-stop(100%, #e5e5e5)); + background-image: -webkit-linear-gradient(top, #d1d1d1,#e5e5e5); + background-image: -moz-linear-gradient(top, #d1d1d1,#e5e5e5); + background-image: -o-linear-gradient(top, #d1d1d1,#e5e5e5); + background-image: -ms-linear-gradient(top, #d1d1d1,#e5e5e5); + background-image: linear-gradient(top, #d1d1d1,#e5e5e5); } /*----------------------------------------------------------------------------