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
1=== modified file 'css/default.css'
2--- css/default.css 2010-09-25 12:04:25 +0000
3+++ css/default.css 2011-06-05 11:14:22 +0000
4@@ -44,7 +44,7 @@
5 /*- Typography
6 -------------------------------------------------------------------------------------------------------- */
7
8-body { font-family: Ubuntu, UbuntuBeta, 'Ubuntu Beta','Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif; font-size:100%; line-height:1.5em;}
9+body { font-family: Ubuntu,'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif; font-size:100%; line-height:1.5em;}
10 h1 { font-size:2.25em; /* 16x2.25 =36 */ }
11 h2 { font-size:1.5em; /* 16x1.5 =24 */ }
12 h3 { font-size:1.125em; /* 16x1.125=18 */ }
13
14=== modified file 'forum.html'
15--- forum.html 2010-08-14 17:46:59 +0000
16+++ forum.html 2011-06-05 11:14:22 +0000
17@@ -7,7 +7,7 @@
18
19 <link rel="shortcut icon" href="images/favicon.ico" type="image/ico" />
20 <link rel="icon" href="images/favicon.ico" type="image/ico" />
21-
22+ <link href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css'>
23 <!-- stylesheets -->
24 <!--[if !IE ]><!-->
25 <link rel="stylesheet" type="text/css" href="css/default.css" />
26
27=== modified file 'index.html'
28--- index.html 2010-08-14 17:46:59 +0000
29+++ index.html 2011-06-05 11:14:22 +0000
30@@ -7,7 +7,7 @@
31
32 <link rel="shortcut icon" href="images/favicon.ico" type="image/ico" />
33 <link rel="icon" href="images/favicon.ico" type="image/ico" />
34-
35+ <link href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css'>
36 <!-- stylesheets -->
37 <!--[if !IE ]><!-->
38 <link rel="stylesheet" type="text/css" href="css/default.css" />
39
40=== modified file 'presentation.html'
41--- presentation.html 2010-08-14 17:46:59 +0000
42+++ presentation.html 2011-06-05 11:14:22 +0000
43@@ -7,7 +7,7 @@
44
45 <link rel="shortcut icon" href="images/favicon.ico" type="image/ico" />
46 <link rel="icon" href="images/favicon.ico" type="image/ico" />
47-
48+ <link href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css'>
49 <!-- stylesheets -->
50 <!--[if !IE ]><!-->
51 <link rel="stylesheet" type="text/css" href="css/default.css" />
52
53=== modified file 'wireframe.html'
54--- wireframe.html 2010-06-14 15:26:09 +0000
55+++ wireframe.html 2011-06-05 11:14:22 +0000
56@@ -9,7 +9,7 @@
57
58 <link rel="shortcut icon" href="images/favicon.ico" type="image/ico" />
59 <link rel="icon" href="images/favicon.ico" type="image/ico" />
60-
61+ <link href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css'>
62 <!-- stylesheets -->
63 <!--[if !IE ]><!-->
64 <link rel="stylesheet" type="text/css" href="css/wireframe-default.css" />
65
66=== modified file 'wordpress.html'
67--- wordpress.html 2010-08-14 17:46:59 +0000
68+++ wordpress.html 2011-06-05 11:14:22 +0000
69@@ -7,7 +7,7 @@
70
71 <link rel="shortcut icon" href="images/favicon.ico" type="image/ico" />
72 <link rel="icon" href="images/favicon.ico" type="image/ico" />
73-
74+ <link href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css'>
75 <!-- stylesheets -->
76 <!--[if !IE ]><!-->
77 <link rel="stylesheet" type="text/css" href="css/default.css" />
78
79=== modified file 'wordpress2.html'
80--- wordpress2.html 2010-08-14 17:46:59 +0000
81+++ wordpress2.html 2011-06-05 11:14:22 +0000
82@@ -7,7 +7,7 @@
83
84 <link rel="shortcut icon" href="images/favicon.ico" type="image/ico" />
85 <link rel="icon" href="images/favicon.ico" type="image/ico" />
86-
87+ <link href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css'>
88 <!-- stylesheets -->
89 <!--[if !IE ]><!-->
90 <link rel="stylesheet" type="text/css" href="css/default.css" />

Subscribers

People subscribed via source and target branches