← Back to team overview

registry team mailing list archive

[Merge] lp:~andrea.corbellini/launchpad-help-moin-theme/ubuntu-font into lp:~launchpad/launchpad-help-moin-theme/moin_launchpad

 

Andrea Corbellini has proposed merging lp:~andrea.corbellini/launchpad-help-moin-theme/ubuntu-font into lp:~launchpad/launchpad-help-moin-theme/moin_launchpad.

Requested reviews:
  Canonical Launchpad Engineering (launchpad)
Related bugs:
  #620537 Use UbuntuBeta as font if it's available
  https://bugs.launchpad.net/bugs/620537


Please, see bug #620537.
-- 
https://code.launchpad.net/~andrea.corbellini/launchpad-help-moin-theme/ubuntu-font/+merge/33294
Your team Registry Administrators is subscribed to branch lp:~launchpad/launchpad-help-moin-theme/moin_launchpad.
=== modified file 'css/common.css'
--- css/common.css	2008-08-21 15:13:51 +0000
+++ css/common.css	2010-08-21 16:01:41 +0000
@@ -3,7 +3,7 @@
   margin:0px;
   font-weight: normal;
   font-size: 10pt;
-  font-family: Verdana, sans-serif;
+  font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
   color:#000;
   background:#fff;
 }
@@ -80,7 +80,7 @@
 }
 /*Header*/
 #header h1 {
-  font: 3em Trebuchet Ms, sans-serif;
+  font-size: 3em;
   margin: 0;
   padding: 10px 0px 0px 0px;
 }
@@ -100,7 +100,8 @@
 #finder input[type=text] {
     float: right;
     margin: 7px 5px;
-    font:normal 11px/normal Trebuchet Ms;
+    font-weight: normal;
+    font-size: 11px;
     color: #666;
     width: 170px;
     background: #fff url(../img/lupa.png) right center no-repeat;
@@ -127,6 +128,9 @@
     min-width: 70em;
 	background:#2a2a2a url(../img/bg_header.gif) top repeat-x;
 }
+#header h1 {
+	font-family: 'Trebuchet Ms', sans-serif;
+}
 #header h1 strong{
 	color:#f8c300;
 }
@@ -163,7 +167,8 @@
 }
 /*Footer*/
 #footer p.menu {
-    font:bold 12px/normal Trebuchet Ms;
+    font-weight: bold;
+    font-size: 12px;
     color:#f8da53;
 }
 #footer p.menu a, #footer p.menu a:link, #footer p.menu a:visited, #footer p.menu a:hover {
@@ -249,7 +254,8 @@
     font-size:12px;
 }
 #content table p.table-of-contents-heading {
-    font:bold 14px/normal Trebuchet Ms;
+    font-weight: bold;
+    font-size: 14px;
     color:#666;
     margin:0;
     padding:0; 


Follow ups