dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7141
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-06-01 19:36:38 +0200
message:
  Minor improvement to login page
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml


--
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/login.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2012-02-17 14:47:55 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2012-06-01 17:36:38 +0000
@@ -1,7 +1,7 @@
 
 *
 {
-  font-family: tahoma, sans-serif;
+  font-family: LiberationSansRegular, sans-serif;
   line-height: 125%;
 }
 
@@ -9,7 +9,7 @@
 {
   background-color: #1d5288;  
   color: white;
-  font-size: 16px;
+  font-size: 15px;
 }
 
 .loginField
@@ -22,11 +22,6 @@
   padding-right: 5px;
 }
 
-.headerText
-{
-  font-size: 20px;
-}
-
 .loginMessage
 {
     background-color: #3b6da1;
@@ -39,6 +34,7 @@
 }
 
 .button {
+  font-family: LiberationSansBold, arial;
   background: -webkit-linear-gradient(top, #f1f1f1, #d1d1d1);
   background: -moz-linear-gradient(top, #f1f1f1, #d1d1d1);
   background: -ms-linear-gradient(top, #f1f1f1, #d1d1d1);
@@ -47,7 +43,6 @@
   border: 1px solid #444;
   border-radius: 3px;
   color: #222;
-  font-weight: bold;
 }
 
 .button:hover {
@@ -57,3 +52,25 @@
   background: -o-linear-gradient(top, #fafafa, #dadada);
   border: 1px solid #333333;
 }
+
+@font-face {
+    font-family: 'LiberationSansRegular';
+    src: url('../fonts/LiberationSans-Regular-webfont.eot');
+    src: url('../fonts/LiberationSans-Regular-webfont.eot?#iefix') format('eot'),
+         url('../fonts/LiberationSans-Regular-webfont.woff') format('woff'),
+         url('../fonts/LiberationSans-Regular-webfont.ttf') format('truetype'),
+         url('../fonts/LiberationSans-Regular-webfont.svg#webfontc8rbNdBe') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'LiberationSansBold';
+    src: url('../fonts/LiberationSans-Bold-webfont.eot');
+    src: url('../fonts/LiberationSans-Bold-webfont.eot?#iefix') format('eot'),
+         url('../fonts/LiberationSans-Bold-webfont.woff') format('woff'),
+         url('../fonts/LiberationSans-Bold-webfont.ttf') format('truetype'),
+         url('../fonts/LiberationSans-Bold-webfont.svg#webfontHyWb8e07') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml	2012-05-06 19:49:24 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml	2012-06-01 17:36:38 +0000
@@ -25,6 +25,7 @@
 
   <sec:http pattern="/dhis-web-commons/javascripts/**" security="none" />
   <sec:http pattern="/dhis-web-commons/css/**" security="none" />
+  <sec:http pattern="/dhis-web-commons/fonts/**" security="none" />
   <sec:http pattern="/favicon.ico" security="none" />
 
   <sec:http access-decision-manager-ref="accessDecisionManager" use-expressions="true" realm="DHIS2">