Ubuntu Community Web Themes

Merge lp:~daker/ubuntu-community-webthemes/fix.789523 into lp:ubuntu-community-webthemes/light-base-theme

  1. fix.789523
  2. Merge into light-base-theme
Proposed by Adnane Belmadiaf
Status: Needs review
Proposed branch: lp:~daker/ubuntu-community-webthemes/fix.789523
Merge into: lp:ubuntu-community-webthemes/light-base-theme
Diff against target: 90 lines (+7/-7)
7 files modified
css/default.css (+1/-1)
forum.html (+1/-1)
index.html (+1/-1)
presentation.html (+1/-1)
wireframe.html (+1/-1)
wordpress.html (+1/-1)
wordpress2.html (+1/-1)
To merge this branch: bzr merge lp:~daker/ubuntu-community-webthemes/fix.789523
Reviewer Review Type Date Requested Status
Ubuntu Community Web Themes Developers Pending
Review via email: mp+63484@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

6. By Adnane Belmadiaf

* Retrieve the Ubuntu font from the Google font directory

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'css/default.css'
--- css/default.css 2010-09-25 12:04:25 +0000
+++ css/default.css 2011-06-05 11:14:22 +0000
@@ -44,7 +44,7 @@
44/*- Typography44/*- Typography
45-------------------------------------------------------------------------------------------------------- */45-------------------------------------------------------------------------------------------------------- */
4646
47body { font-family: Ubuntu, UbuntuBeta, 'Ubuntu Beta','Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif; font-size:100%; line-height:1.5em;}47body { font-family: Ubuntu,'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif; font-size:100%; line-height:1.5em;}
48h1 { font-size:2.25em; /* 16x2.25 =36 */ }48h1 { font-size:2.25em; /* 16x2.25 =36 */ }
49h2 { font-size:1.5em; /* 16x1.5 =24 */ }49h2 { font-size:1.5em; /* 16x1.5 =24 */ }
50h3 { font-size:1.125em; /* 16x1.125=18 */ }50h3 { font-size:1.125em; /* 16x1.125=18 */ }
5151
=== modified file 'forum.html'
--- forum.html 2010-08-14 17:46:59 +0000
+++ forum.html 2011-06-05 11:14:22 +0000
@@ -7,7 +7,7 @@
77
8 <link rel="shortcut icon" href="images/favicon.ico" type="image/ico" />8 <link rel="shortcut icon" href="images/favicon.ico" type="image/ico" />
9 <link rel="icon" href="images/favicon.ico" type="image/ico" />9 <link rel="icon" href="images/favicon.ico" type="image/ico" />
1010 <link href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css'>
11 <!-- stylesheets -->11 <!-- stylesheets -->
12 <!--[if !IE ]><!-->12 <!--[if !IE ]><!-->
13 <link rel="stylesheet" type="text/css" href="css/default.css" />13 <link rel="stylesheet" type="text/css" href="css/default.css" />
1414
=== modified file 'index.html'
--- index.html 2010-08-14 17:46:59 +0000
+++ index.html 2011-06-05 11:14:22 +0000
@@ -7,7 +7,7 @@
77
8 <link rel="shortcut icon" href="images/favicon.ico" type="image/ico" />8 <link rel="shortcut icon" href="images/favicon.ico" type="image/ico" />
9 <link rel="icon" href="images/favicon.ico" type="image/ico" />9 <link rel="icon" href="images/favicon.ico" type="image/ico" />
1010 <link href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css'>
11 <!-- stylesheets -->11 <!-- stylesheets -->
12 <!--[if !IE ]><!-->12 <!--[if !IE ]><!-->
13 <link rel="stylesheet" type="text/css" href="css/default.css" />13 <link rel="stylesheet" type="text/css" href="css/default.css" />
1414
=== modified file 'presentation.html'
--- presentation.html 2010-08-14 17:46:59 +0000
+++ presentation.html 2011-06-05 11:14:22 +0000
@@ -7,7 +7,7 @@
77
8 <link rel="shortcut icon" href="images/favicon.ico" type="image/ico" />8 <link rel="shortcut icon" href="images/favicon.ico" type="image/ico" />
9 <link rel="icon" href="images/favicon.ico" type="image/ico" />9 <link rel="icon" href="images/favicon.ico" type="image/ico" />
1010 <link href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css'>
11 <!-- stylesheets -->11 <!-- stylesheets -->
12 <!--[if !IE ]><!-->12 <!--[if !IE ]><!-->
13 <link rel="stylesheet" type="text/css" href="css/default.css" />13 <link rel="stylesheet" type="text/css" href="css/default.css" />
1414
=== modified file 'wireframe.html'
--- wireframe.html 2010-06-14 15:26:09 +0000
+++ wireframe.html 2011-06-05 11:14:22 +0000
@@ -9,7 +9,7 @@
99
10 <link rel="shortcut icon" href="images/favicon.ico" type="image/ico" />10 <link rel="shortcut icon" href="images/favicon.ico" type="image/ico" />
11 <link rel="icon" href="images/favicon.ico" type="image/ico" />11 <link rel="icon" href="images/favicon.ico" type="image/ico" />
1212 <link href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css'>
13 <!-- stylesheets -->13 <!-- stylesheets -->
14 <!--[if !IE ]><!-->14 <!--[if !IE ]><!-->
15 <link rel="stylesheet" type="text/css" href="css/wireframe-default.css" />15 <link rel="stylesheet" type="text/css" href="css/wireframe-default.css" />
1616
=== modified file 'wordpress.html'
--- wordpress.html 2010-08-14 17:46:59 +0000
+++ wordpress.html 2011-06-05 11:14:22 +0000
@@ -7,7 +7,7 @@
77
8 <link rel="shortcut icon" href="images/favicon.ico" type="image/ico" />8 <link rel="shortcut icon" href="images/favicon.ico" type="image/ico" />
9 <link rel="icon" href="images/favicon.ico" type="image/ico" />9 <link rel="icon" href="images/favicon.ico" type="image/ico" />
1010 <link href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css'>
11 <!-- stylesheets -->11 <!-- stylesheets -->
12 <!--[if !IE ]><!-->12 <!--[if !IE ]><!-->
13 <link rel="stylesheet" type="text/css" href="css/default.css" />13 <link rel="stylesheet" type="text/css" href="css/default.css" />
1414
=== modified file 'wordpress2.html'
--- wordpress2.html 2010-08-14 17:46:59 +0000
+++ wordpress2.html 2011-06-05 11:14:22 +0000
@@ -7,7 +7,7 @@
77
8 <link rel="shortcut icon" href="images/favicon.ico" type="image/ico" />8 <link rel="shortcut icon" href="images/favicon.ico" type="image/ico" />
9 <link rel="icon" href="images/favicon.ico" type="image/ico" />9 <link rel="icon" href="images/favicon.ico" type="image/ico" />
1010 <link href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css'>
11 <!-- stylesheets -->11 <!-- stylesheets -->
12 <!--[if !IE ]><!-->12 <!--[if !IE ]><!-->
13 <link rel="stylesheet" type="text/css" href="css/default.css" />13 <link rel="stylesheet" type="text/css" href="css/default.css" />

Subscribers

People subscribed via source and target branches