← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3881: Added a css class 'bold' since using <b> or font-weight: bold does not work well with font packs

 

------------------------------------------------------------
revno: 3881
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-06-12 12:33:24 +0200
message:
  Added a css class 'bold' since using <b> or font-weight: bold does not work well with font packs
modified:
  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/oust/selectionTreeMultipleSelect.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm
  dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/intro.vm
  dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/style/intro.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/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	2011-06-11 18:31:37 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2011-06-12 10:33:24 +0000
@@ -436,6 +436,11 @@
   background-color: #dfe9f4;
 }
 
+.bold
+{
+  font-family: LiberationSansBold, arial;
+}
+
 /*----------------------------------------------------------------------------*/
 /* Intro                                                                      */
 /*----------------------------------------------------------------------------*/

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm	2011-04-04 16:47:24 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm	2011-06-12 10:33:24 +0000
@@ -40,7 +40,7 @@
 	<tbody>
 		<tr>
 			<td>
-				<div style="width:100%;background-image:url( ../images/loading.png );background-repeat:no-repeat">	
+				<div style="width:100%;background-image:url(../images/ajax-loader-circle.gif);background-repeat:no-repeat">	
 					<div id="selectionTreeContainer" style="display:none;">
 						<input type="button" value="$i18n.getString( 'select_at_level' )" onclick="selectOrganisationUnitAtLevel()" style="width:10em"/>
 						<select id="levelList" name="levelList" style="width:10em"/>

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm	2011-04-11 15:07:08 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm	2011-06-12 10:33:24 +0000
@@ -1,7 +1,7 @@
 
 <h3>$encoder.htmlEncode( $message.message.subject )</h3>
 
-<div class="messageDiv"><span style="font-weight:bold;">$encoder.htmlEncode( $message.message.sender.name )</span>&nbsp;
+<div class="messageDiv"><span class="bold">$encoder.htmlEncode( $message.message.sender.name )</span>&nbsp;
 <span style="color:#606060">$format.formatDate( $message.messageDate )</span></div>
 
 <div style="margin-bottom:20px; width:50%;">$encoder.htmlEncode( $message.message.text )</div>

=== modified file 'dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/intro.vm'
--- dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/intro.vm	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/intro.vm	2011-06-12 10:33:24 +0000
@@ -1,5 +1,5 @@
 
-<div id="intro">
+<div id="intro" class="bold">
     
     <br><br>
     

=== modified file 'dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/style/intro.css'
--- dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/style/intro.css	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/style/intro.css	2011-06-12 10:33:24 +0000
@@ -5,7 +5,6 @@
   background-repeat: repeat-x;
   color: #374565;
   font-size: 11pt;
-  font-weight: bold;
   border: 1px solid #5c6988;
   width: 540px;
   height: 280px;