dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 7741 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-07-27 13:03:38 +0200
message:
  (DV) Windoze fixes.
modified:
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2012-07-27 09:36:51 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2012-07-27 11:02:30 +0000
@@ -2,7 +2,11 @@
     font: normal 10px arial,sans-serif,ubuntu,consolas;
 }
 
-.x-body, .x-btn-default-toolbar-small .x-btn-inner, .x-form-item, .x-panel-header-text-default {
+.x-body,
+.x-btn-default-toolbar-small .x-btn-inner,
+.x-form-item,
+.x-panel-header-text-default,
+.x-grid-cell-inner {
 	font-family: arial,sans-serif,ubuntu,consolas;
 }
 	
@@ -45,7 +49,7 @@
     padding-left: 5px;
 }
 .dv-combo .small .x-form-field {
-	padding-top: 4px;
+	padding-top: 2px;
 }
 
 /* Combobox field label font */

=== 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	2012-07-27 07:56:28 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2012-07-27 11:02:30 +0000
@@ -2514,50 +2514,43 @@
                                 icon: 'images/column.png',
                                 name: DV.conf.finals.chart.column,
                                 tooltip: DV.i18n.column_chart,
-								width: 40,
                                 pressed: true
                             },
                             {
 								xtype: 'button',
                                 icon: 'images/column-stacked.png',
                                 name: DV.conf.finals.chart.stackedcolumn,
-                                tooltip: DV.i18n.stacked_column_chart,
-								width: 40
+                                tooltip: DV.i18n.stacked_column_chart
                             },
                             {
 								xtype: 'button',
                                 icon: 'images/bar.png',
                                 name: DV.conf.finals.chart.bar,
-                                tooltip: DV.i18n.bar_chart,
-								width: 40
+                                tooltip: DV.i18n.bar_chart
                             },
                             {
 								xtype: 'button',
                                 icon: 'images/bar-stacked.png',
                                 name: DV.conf.finals.chart.stackedbar,
-                                tooltip: DV.i18n.stacked_bar_chart,
-								width: 40
+                                tooltip: DV.i18n.stacked_bar_chart
                             },
                             {
 								xtype: 'button',
                                 icon: 'images/line.png',
                                 name: DV.conf.finals.chart.line,
-                                tooltip: DV.i18n.line_chart,
-								width: 40
+                                tooltip: DV.i18n.line_chart
                             },
                             {
 								xtype: 'button',
                                 icon: 'images/area.png',
                                 name: DV.conf.finals.chart.area,
-                                tooltip: DV.i18n.area_chart,
-								width: 40
+                                tooltip: DV.i18n.area_chart
                             },
                             {
 								xtype: 'button',
                                 icon: 'images/pie.png',
                                 name: DV.conf.finals.chart.pie,
-                                tooltip: DV.i18n.pie_chart,
-								width: 40
+                                tooltip: DV.i18n.pie_chart
                             }
                         ]
                     },