=== modified file 'dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js' --- dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-03-19 18:22:11 +0000 +++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-03-20 11:50:35 +0000 @@ -4135,7 +4135,7 @@ cls: 'ns-combo', multiSelect: true, style: 'margin-bottom:0', - width: accBaseWidth - toolWidth - 2, + width: accBaseWidth - toolWidth - 1, valueField: 'level', displayField: 'name', emptyText: NS.i18n.select_organisation_unit_levels, @@ -4151,7 +4151,7 @@ cls: 'ns-combo', multiSelect: true, style: 'margin-bottom:0', - width: accBaseWidth - toolWidth - 2, + width: accBaseWidth - toolWidth - 1, valueField: 'id', displayField: 'name', emptyText: NS.i18n.select_organisation_unit_groups, @@ -4161,7 +4161,7 @@ }); organisationUnitPanel = Ext.create('Ext.panel.Panel', { - width: accBaseWidth - toolWidth - 2, + width: accBaseWidth - toolWidth - 1, layout: 'column', bodyStyle: 'border:0 none', items: [ @@ -4269,7 +4269,7 @@ toolPanel = Ext.create('Ext.panel.Panel', { width: toolWidth, bodyStyle: 'border:0 none; text-align:right', - style: 'margin-right:2px', + style: 'margin-right:1px', items: tool }); @@ -4281,8 +4281,7 @@ items: [ { layout: 'column', - width: accBaseWidth, - bodyStyle: 'border:0 none', + bodyStyle: 'border:0 none;', style: 'padding-bottom:1px', items: [ toolPanel, === modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js' --- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-03-20 08:17:36 +0000 +++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-03-20 11:50:35 +0000 @@ -4314,7 +4314,7 @@ cls: 'ns-combo', multiSelect: true, style: 'margin-bottom:0', - width: ns.core.conf.layout.west_fieldset_width - ns.core.conf.layout.west_width_padding - 38, + width: ns.core.conf.layout.west_fieldset_width - ns.core.conf.layout.west_width_padding - 37, valueField: 'level', displayField: 'name', emptyText: NS.i18n.select_organisation_unit_levels, @@ -4327,7 +4327,7 @@ cls: 'ns-combo', multiSelect: true, style: 'margin-bottom:0', - width: ns.core.conf.layout.west_fieldset_width - ns.core.conf.layout.west_width_padding - 38, + width: ns.core.conf.layout.west_fieldset_width - ns.core.conf.layout.west_width_padding - 37, valueField: 'id', displayField: 'name', emptyText: NS.i18n.select_organisation_unit_groups, @@ -4432,7 +4432,7 @@ toolPanel = Ext.create('Ext.panel.Panel', { width: 36, bodyStyle: 'border:0 none; text-align:right', - style: 'margin-right:2px', + style: 'margin-right:1px', items: tool }); @@ -4527,7 +4527,7 @@ items: [ toolPanel, { - width: ns.core.conf.layout.west_fieldset_width - ns.core.conf.layout.west_width_padding - 38, + width: ns.core.conf.layout.west_fieldset_width - ns.core.conf.layout.west_width_padding - 37, layout: 'column', bodyStyle: 'border:0 none', items: [ === modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css' --- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css 2014-03-20 08:17:36 +0000 +++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css 2014-03-20 09:06:16 +0000 @@ -88,12 +88,12 @@ ::-webkit-scrollbar-track:vertical { background-color: #e1e1e1; - margin: 2px 0; - border-right: 2px solid white; + margin: 1px 0; + border-right: 1px solid white; } ::-webkit-scrollbar-thumb:vertical { background-color: #bbb; - border-right: 2px solid white; + border-right: 1px solid white; } /* User select */ @@ -991,7 +991,6 @@ /* accordion item body */ .ns-accordion .x-accordion-body { - padding: 2px 2px 0px; padding: 1px; border-top: 1px solid #c5c5c5 !important; } === modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js' --- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-03-19 18:33:19 +0000 +++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-03-20 11:50:35 +0000 @@ -2054,7 +2054,7 @@ editable: false, valueField: 'id', displayField: 'name', - width: (ns.core.conf.layout.west_fieldset_width / 3) - 1, + width: (ns.core.conf.layout.west_fieldset_width / 3), value: ns.core.conf.finals.dimension.data.dimensionName, filterNext: function() { category.filter(this.getValue()); @@ -2081,7 +2081,7 @@ lastQuery: '', valueField: 'id', displayField: 'name', - width: (ns.core.conf.layout.west_fieldset_width / 3) - 1, + width: (ns.core.conf.layout.west_fieldset_width / 3), value: ns.core.conf.finals.dimension.period.dimensionName, filter: function(value) { if (Ext.isString(value)) { @@ -2121,7 +2121,7 @@ lastQuery: '', valueField: 'id', displayField: 'name', - width: (ns.core.conf.layout.west_fieldset_width / 3) - 1, + width: (ns.core.conf.layout.west_fieldset_width / 3) + 1, value: ns.core.conf.finals.dimension.organisationUnit.dimensionName, filter: function(values) { var a = Ext.clone(this.getValue()), @@ -2150,12 +2150,13 @@ layout = Ext.create('Ext.toolbar.Toolbar', { id: 'chartlayout_tb', - style: 'padding:2px 0 0 2px; background:#f5f5f5; border:0 none; border-top:1px dashed #ccc; border-bottom:1px solid #ccc', - height: 46, + style: 'padding:2px 0 0 1px; background:#f5f5f5; border:0 none; border-top:1px dashed #ccc; border-bottom:1px solid #ccc', + height: 45, items: [ { - xtype: 'panel', + xtype: 'container', bodyStyle: 'border-style:none; background-color:transparent; padding:0', + style: 'margin:0', items: [ { xtype: 'label', @@ -2167,8 +2168,9 @@ ] }, { - xtype: 'panel', + xtype: 'container', bodyStyle: 'border-style:none; background-color:transparent; padding:0', + style: 'margin:0', items: [ { xtype: 'label', @@ -2180,7 +2182,7 @@ ] }, { - xtype: 'panel', + xtype: 'container', bodyStyle: 'border-style:none; background-color:transparent; padding:0', items: [ { @@ -2682,7 +2684,7 @@ indicatorGroup = Ext.create('Ext.form.field.ComboBox', { cls: 'ns-combo', - style: 'margin-bottom:2px; margin-top:0px', + style: 'margin-bottom:1px; margin-top:0px', width: ns.core.conf.layout.west_fieldset_width - ns.core.conf.layout.west_width_padding, valueField: 'id', displayField: 'name', @@ -3003,7 +3005,7 @@ dataElementGroup = Ext.create('Ext.form.field.ComboBox', { cls: 'ns-combo', - style: 'margin:0 2px 2px 0', + style: 'margin:0 1px 1px 0', width: ns.core.conf.layout.west_fieldset_width - ns.core.conf.layout.west_width_padding - 90, valueField: 'id', displayField: 'name', @@ -3033,13 +3035,13 @@ dataElementDetailLevel = Ext.create('Ext.form.field.ComboBox', { cls: 'ns-combo', - style: 'margin-bottom:2px', + style: 'margin-bottom:1px', baseBodyCls: 'small', queryMode: 'local', editable: false, valueField: 'id', displayField: 'text', - width: 90 - 2, + width: 90 - 1, value: dimConf.dataElement.objectName, store: { fields: ['id', 'text'], @@ -3728,8 +3730,8 @@ { xtype: 'combobox', cls: 'ns-combo', - style: 'margin-bottom:2px', - width: ns.core.conf.layout.west_fieldset_width - ns.core.conf.layout.west_width_padding - 62 - 62 - 4, + style: 'margin-bottom:1px', + width: ns.core.conf.layout.west_fieldset_width - ns.core.conf.layout.west_width_padding - 62 - 62 - 2, valueField: 'id', displayField: 'name', emptyText: NS.i18n.select_period_type, @@ -3757,7 +3759,7 @@ { xtype: 'button', text: NS.i18n.prev_year, - style: 'margin-left:2px; border-radius:2px', + style: 'margin-left:1px; border-radius:2px', height: 24, handler: function() { var cb = this.up('panel').down('combobox'); @@ -3770,7 +3772,7 @@ { xtype: 'button', text: NS.i18n.next_year, - style: 'margin-left:2px; border-radius:2px', + style: 'margin-left:1px; border-radius:2px', height: 24, handler: function() { var cb = this.up('panel').down('combobox'); @@ -3785,7 +3787,7 @@ { xtype: 'panel', layout: 'column', - bodyStyle: 'border-style:none; padding-bottom:2px', + bodyStyle: 'border-style:none; padding-bottom:1px', items: [ fixedPeriodAvailable, fixedPeriodSelected @@ -4029,7 +4031,7 @@ cls: 'ns-combo', multiSelect: true, style: 'margin-bottom:0', - width: ns.core.conf.layout.west_fieldset_width - ns.core.conf.layout.west_width_padding - 38, + width: ns.core.conf.layout.west_fieldset_width - ns.core.conf.layout.west_width_padding - 37, valueField: 'level', displayField: 'name', emptyText: NS.i18n.select_organisation_unit_levels, @@ -4042,7 +4044,7 @@ cls: 'ns-combo', multiSelect: true, style: 'margin-bottom:0', - width: ns.core.conf.layout.west_fieldset_width - ns.core.conf.layout.west_width_padding - 38, + width: ns.core.conf.layout.west_fieldset_width - ns.core.conf.layout.west_width_padding - 37, valueField: 'id', displayField: 'name', emptyText: NS.i18n.select_organisation_unit_groups, @@ -4147,14 +4149,14 @@ toolPanel = Ext.create('Ext.panel.Panel', { width: 36, bodyStyle: 'border:0 none; text-align:right', - style: 'margin-right:2px', + style: 'margin-right:1px', items: tool }); organisationUnit = { xtype: 'panel', title: '
' + NS.i18n.organisation_units + '
', - bodyStyle: 'padding:2px', + bodyStyle: 'padding:1px', hideCollapseTool: true, collapsed: false, getDimension: function() { @@ -4238,11 +4240,11 @@ { layout: 'column', bodyStyle: 'border:0 none', - style: 'padding-bottom:2px', + style: 'padding-bottom:1px', items: [ toolPanel, { - width: ns.core.conf.layout.west_fieldset_width - ns.core.conf.layout.west_width_padding - 38, + width: ns.core.conf.layout.west_fieldset_width - ns.core.conf.layout.west_width_padding - 37, layout: 'column', bodyStyle: 'border:0 none', items: [ @@ -4547,7 +4549,7 @@ }); accordion = Ext.create('Ext.panel.Panel', { - bodyStyle: 'border-style:none; padding:2px; padding-bottom:0; overflow-y:scroll;', + bodyStyle: 'border-style:none; padding:1px; padding-bottom:0; overflow-y:scroll;', items: accordionBody, panels: accordionPanels, setThisHeight: function(mx) { === modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js' --- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js 2014-03-14 10:24:17 +0000 +++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js 2014-03-20 09:06:16 +0000 @@ -162,14 +162,14 @@ conf.layout = { west_width: 424, - west_fieldset_width: 416, - west_width_padding: 4, + west_fieldset_width: 418, + west_width_padding: 2, west_fill: 2, - west_fill_accordion_indicator: 59, + west_fill_accordion_indicator: 56, west_fill_accordion_dataelement: 59, - west_fill_accordion_dataset: 33, - west_fill_accordion_period: 296, - west_fill_accordion_organisationunit: 62, + west_fill_accordion_dataset: 31, + west_fill_accordion_period: 293, + west_fill_accordion_organisationunit: 58, west_maxheight_accordion_indicator: 350, west_maxheight_accordion_dataelement: 350, west_maxheight_accordion_dataset: 350, === modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/styles/style.css' --- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/styles/style.css 2014-02-04 14:39:04 +0000 +++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/styles/style.css 2014-03-20 09:06:16 +0000 @@ -84,12 +84,12 @@ ::-webkit-scrollbar-track:vertical { background-color: #e1e1e1; - margin: 2px 0; - border-right: 2px solid white; + margin: 1px 0; + border-right: 1px solid white; } ::-webkit-scrollbar-thumb:vertical { background-color: #bbb; - border-right: 2px solid white; + border-right: 1px solid white; } /* User select */ @@ -823,7 +823,7 @@ /* accordion item body */ .ns-accordion .x-accordion-body { - padding: 2px 2px 0px; + padding: 1px; border-top: 1px solid #c5c5c5 !important; }