=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css 2012-06-05 21:31:46 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css 2012-06-09 22:21:27 +0000 @@ -577,6 +577,12 @@ /* jQuery overrides */ /*----------------------------------------------------------------------------*/ +.ui-widget, .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button +{ + font-family: LiberationSansRegular, arial, sans-serif; + font-size: 9pt; +} + .ui-datepicker th { font-family: LiberationSansBold, arial, sans-serif; @@ -585,12 +591,6 @@ font-size: 9pt; } -.ui-widget -{ - font-family: LiberationSansRegular, arial, sans-serif; - font-size: 9pt; -} - .ui-widget-header { font-family: LiberationSansBold, arial, sans-serif; === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties 2012-02-23 11:12:25 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties 2012-06-09 22:21:27 +0000 @@ -193,3 +193,4 @@ select_group=Select group option_set=Option set please_select=Please select +formula=Formula \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm 2012-06-09 21:11:01 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm 2012-06-09 22:21:27 +0000 @@ -10,9 +10,9 @@ modal: true, autoOpen: false, minWidth: 820, - minHeight: 540, + minHeight: 550, width: 820, - height: 540 + height: 550 }); getConstantsPage(); === modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/expressionBuilderForm.vm' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/expressionBuilderForm.vm 2012-06-09 21:11:01 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/expressionBuilderForm.vm 2012-06-09 22:21:27 +0000 @@ -7,9 +7,9 @@ modal: true, autoOpen:false, minWidth: 820, - minHeight: 540, + minHeight: 550, width:820, - height:540, + height:550, title: "$i18n.getString( 'expression' )" });