dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 7487 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-07-02 14:35:08 +0200
message:
  (DV) CSS fixes.
modified:
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css


--
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/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2012-07-02 11:46:10 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2012-07-02 12:33:59 +0000
@@ -2499,6 +2499,8 @@
                                     {
                                         xtype: 'combobox',
                                         cls: 'dv-combo',
+                                        baseBodyCls: 'small',
+                                        style: 'color:red',
                                         name: DV.conf.finals.chart.series,
                                         emptyText: DV.i18n.series,
                                         queryMode: 'local',
@@ -2532,6 +2534,7 @@
                                     {
                                         xtype: 'combobox',
                                         cls: 'dv-combo',
+                                        baseBodyCls: 'small',
                                         name: DV.conf.finals.chart.category,
                                         emptyText: DV.i18n.category,
                                         queryMode: 'local',
@@ -2566,6 +2569,7 @@
                                     {
                                         xtype: 'combobox',
                                         cls: 'dv-combo',
+                                        baseBodyCls: 'small',
                                         name: DV.conf.finals.chart.filter,
                                         emptyText: DV.i18n.filter,
                                         queryMode: 'local',

=== 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-06-29 22:47:31 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2012-07-02 12:33:59 +0000
@@ -38,7 +38,10 @@
 
 /* Combobox text position */
 .dv-combo .x-form-text {
-    padding-left: 4px;
+    padding-left: 5px;
+}
+.dv-combo .small .x-form-field {
+	padding-top: 4px;
 }
 
 /* Combobox field label font */
@@ -700,7 +703,7 @@
 
 .dv-accordion .dv-combo .x-form-text, .dv-accordion .dv-combo .x-form-trigger { /* accordion combo box */
 	height: 24px;
-	padding-top: 2px;
+	padding-top: 1px;
 }
 .dv-accordion .dv-combo .x-form-item-label { /* accordion combo box label */
 	padding: 4px 0 0;