------------------------------------------------------------
revno: 8526
committer: Lars Helge Øverland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Mon 2012-10-15 10:33:30 +0200
message:
Styling of input/select elements
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css
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/javascripts/jQuery/jquery.dhisAjaxSelect.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.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-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2012-10-14 19:15:59 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2012-10-15 08:33:30 +0000
@@ -47,6 +47,12 @@
color:#3162C5;
}
+input[type=text],textarea
+{
+ border: 1px solid #aaa;
+ padding: 4px 1px;
+}
+
/*----------------------------------------------------------------------------*/
/* Header */
/*----------------------------------------------------------------------------*/
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css 2012-10-12 16:21:05 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css 2012-10-15 08:33:30 +0000
@@ -47,6 +47,12 @@
color:#3b73b8;
}
+input[type=text],textarea
+{
+ border: 1px solid #aaa;
+ padding: 4px 1px;
+}
+
/*----------------------------------------------------------------------------*/
/* Header */
/*----------------------------------------------------------------------------*/
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2012-10-14 19:15:59 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2012-10-15 08:33:30 +0000
@@ -47,6 +47,12 @@
color: #3162C5;
}
+input[type=text],textarea
+{
+ border: 1px solid #aaa;
+ padding: 4px 1px;
+}
+
/*----------------------------------------------------------------------------*/
/* Header */
/*----------------------------------------------------------------------------*/
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css 2012-10-12 16:21:05 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css 2012-10-15 08:33:30 +0000
@@ -47,6 +47,12 @@
color:#3b73b8;
}
+input[type=text],textarea
+{
+ border: 1px solid #aaa;
+ padding: 4px 1px;
+}
+
/*----------------------------------------------------------------------------*/
/* Header */
/*----------------------------------------------------------------------------*/
=== 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-10-12 17:04:19 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css 2012-10-15 08:33:30 +0000
@@ -588,7 +588,7 @@
.dashboardMenuFlag
{
- margin-top: 18px;
+ margin-top: 16px;
margin-left: 16px;
border: 1px solid #D0D0D0;
border-radius: 2px; cursor: pointer;
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.dhisAjaxSelect.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.dhisAjaxSelect.js 2012-06-10 16:27:17 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.dhisAjaxSelect.js 2012-10-15 08:33:30 +0000
@@ -163,7 +163,7 @@
button : "<button id='${id}' type='button' style='width: 70px; margin: 4px;'>${text}</button>",
option : "<option>${text}</option>",
option_selected : "<option selected='selected'>${text}</option>",
- filter_input : "<input id='${id}' placeholder='Filter' type='text' style='width: 100%; height: 18px; border: 1px inset gray;' />",
+ filter_input : "<input id='${id}' placeholder='Filter' type='text' style='width: 96%; height: 18px; border: 1px inset gray;' />",
filter_select : "<select id='${id}' style='width: 100%; margin-bottom: 4px; margin-top: 0;'></select>"
};
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2012-10-14 18:31:58 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2012-10-15 08:33:30 +0000
@@ -137,6 +137,7 @@
#searchField
{
width: 320px;
+ padding: 0;
border: 0;
outline: none;
width: 100%;
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm 2012-09-25 12:28:59 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm 2012-10-15 08:33:30 +0000
@@ -54,11 +54,11 @@
<input type="button" value="$i18n.getString( 'run_validation' )" onclick="validate( false )" id="validationButton" style="width:120px;" disabled="disabled"/>
</div>
-<div id="selectionBox" class="inputCriteria" style="width:534px;height:93px;">
+<div id="selectionBox" class="inputCriteria" style="width:534px;height:95px;">
<table>
<tr>
<td><label for="selectedOrganisationUnit">$i18n.getString( "organisation_unit" )</label></td>
- <td><input type="text" id="selectedOrganisationUnit" readonly="readonly" value="[ $i18n.getString( 'select_from_tree' ) ]" style="width: 394px; padding-left: 3px;"></td>
+ <td><input type="text" id="selectedOrganisationUnit" readonly="readonly" value="[ $i18n.getString( 'select_from_tree' ) ]" style="width: 394px; padding: 3px;"></td>
</tr>
<tr>
<td><label for="selectedDataSetId">$i18n.getString( "data_set" )</label></td>
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css 2012-03-12 20:30:50 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css 2012-10-15 08:33:30 +0000
@@ -31,3 +31,17 @@
{
display: none;
}
+
+input[type=text],textarea
+{
+ padding-left: 0;
+ padding-right: 0;
+ margin-top: 1px;
+ margin-bottom: 1px;
+}
+
+.formSection td
+{
+ padding-right: 2px;
+ padding-left: 2px;
+}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
