ubuntu-font-family-website

Merge lp:~deadlight/ubuntu-font-family-website/link-update into lp:ubuntu-font-family-website

  1. link-update
  2. Merge into deployed
Proposed by Karl Williams
Status: Merged
Approved by: Karl Williams
Approved revision: 74
Merged at revision: 74
Proposed branch: lp:~deadlight/ubuntu-font-family-website/link-update
Merge into: lp:ubuntu-font-family-website
Diff against target: 296 lines (+33/-33)
6 files modified
about/index.html (+7/-7)
gallery/index.html (+2/-2)
index.html (+14/-14)
licence/index.html (+1/-1)
resources/index.html (+3/-3)
rupee/index.html (+6/-6)
To merge this branch: bzr merge lp:~deadlight/ubuntu-font-family-website/link-update
Reviewer Review Type Date Requested Status
Karl Williams (community) Approve
Anthony Dillon Approve
Graham Bancroft Pending
Review via email: mp+306423@code.launchpad.net

Description of the change

Done:
 - Updated the footer copyright information to the current year.
 - Updated the google fonts links

QA:
 - Check that all of the changes are present in the markup.

To post a comment you must log in.
Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

LGTM, thanks +1.

review: Approve
Revision history for this message
Paul Sladen (sladen) wrote :

It might be worth tweaking the hyphen to an endash, and keeping only one year inside the metadata markup; so from:

  <span itemprop="copyrightYear">2011-2016</span>

to:

  2011‒<span itemprop="copyrightYear">2016</span>

Revision history for this message
Karl Williams (deadlight) wrote :

Good point on the copyright year, Paul.

And, yes, I'll use an n-dash.

lp:~deadlight/ubuntu-font-family-website/link-update updated
74. By Karl Williams <email address hidden>

replaced - with ndashes and ensured that only one copyright year was used in metadata

Revision history for this message
Karl Williams (deadlight) wrote :

I've pushed all of these changes to the proposal. Can I merge and arrange a release?

Revision history for this message
Karl Williams (deadlight) wrote :

Given that the code has been approved and this has been sitting un-merged for a couple of months, I'm going to merge this MP.

Revision history for this message
Karl Williams (deadlight) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'about/index.html'
2--- about/index.html 2015-08-21 15:49:02 +0000
3+++ about/index.html 2016-09-22 10:42:08 +0000
4@@ -42,7 +42,7 @@
5 <h1>About</h1>
6 </div>
7 </div>
8-
9+
10 <div class="grid-8">
11 <div class="content-intro">
12 <p>The Ubuntu Font Family are a set of matching new libre/open fonts. The development is being funded by <a href="http://www.canonical.com">Canonical</a> on behalf the wider Free Software community and the Ubuntu project. The technical font design work and implementation is being undertaken by <a href="http://www.daltonmaag.com">Dalton Maag</a>.</p>
13@@ -50,22 +50,22 @@
14 <p>The scope of the Ubuntu Font Family includes all the languages used by the various Ubuntu users around the world in tune with Ubuntu's philosophy which states that every user should be able to use their software in the language of their choice. So the Ubuntu Font Family project will be extended to cover many more written languages.</p>
15 </div>
16 </div>
17-
18+
19 <div class="grid-4">
20 <div class="content-sample">
21 <div id="sample"></div>
22 <!--<a href="#">Download full character set (PDF) &rsaquo;</a>-->
23 </div>
24 </div>
25-
26+
27 <div class="grid-12">
28 <div class="content-main">
29 <h2>Facts and figures</h2>
30 <p>The Ubuntu Font Family is a sans-serif typeface family with an intended coverage of <span itemscope itemtype="http://schema.org/Quantity">thirteen fonts</span>.</p>
31-
32+
33 <h3>Coverage</h3>
34 <p><span itemscope itemtype="http://schema.org/Quantity">1,200 glyphs</span>, <span itemscope itemtype="http://schema.org/Quantity">200-250 languages</span> (native languages of <span itemscope itemtype="http://schema.org/Quantity">3 billion people</span>!).</p>
35-
36+
37 <h3>Technology</h3>
38 <ul class="list-bullets">
39 <li>OpenType-based TTF (TrueType)</li>
40@@ -84,14 +84,14 @@
41 </ul>
42 </div>
43 </div>
44-
45+
46 </div><!-- /#content -->
47
48 </div><!-- /#header-and-content -->
49
50 <div id="footer" class="container-12">
51 <div class="grid-12">
52- <p>&copy; 2011 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
53+ <p>&copy; 2011&endash;2016 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
54 <a class="logo-ubuntu" href="../"><img src="../assets/img/logo-ubuntu-footer.png" width="118" height="27" alt="Ubuntu logo" /></a>
55 </div>
56 </div><!-- /#footer -->
57
58=== modified file 'gallery/index.html'
59--- gallery/index.html 2015-08-21 15:49:02 +0000
60+++ gallery/index.html 2016-09-22 10:42:08 +0000
61@@ -37,7 +37,7 @@
62 <a class="link-action" href="../download/ubuntu-font-family-0.83.zip">Download for free &rsaquo;</a>
63 <h1>Gallery</h1>
64 </div>
65-
66+
67 <div id="gallery">
68 <ul class="clearfix">
69 <li>
70@@ -86,7 +86,7 @@
71
72 <div id="footer" class="container-12">
73 <div class="grid-12">
74- <p>&copy; 2011 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
75+ <p>&copy; 2011&ndash;2016 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
76 <a class="logo-ubuntu" href="../"><img src="../assets/img/logo-ubuntu-footer.png" width="118" height="27" alt="Ubuntu logo" /></a>
77 </div>
78 </div><!-- /#footer -->
79
80=== modified file 'index.html'
81--- index.html 2015-08-21 15:49:02 +0000
82+++ index.html 2016-09-22 10:42:08 +0000
83@@ -37,7 +37,7 @@
84 <div class="grid-12" itemscope itemtype="http://schema.org/WPHeader">
85 <div id="tester">
86 <h1><span>This is the Ubuntu Font Family.</span> <span itemtype="description">It is a unique, custom designed font that has a very distinctive look and feel.</span></h1>
87-
88+
89 <div id="tester-controls">
90 <input id="tester-input" name="tester-input" type="text" value="Write your own text!" />
91
92@@ -61,7 +61,7 @@
93 <option value="normal" selected="selected">Normal</option>
94 <option value="italic">Italic</option>
95 </select>
96-
97+
98 <label for="tester-size">Size:</label>
99 <select id="tester-size">
100 <option value="48" selected="selected">48</option>
101@@ -75,15 +75,15 @@
102 <option value="333" selected="selected">Ubuntu grey</option>
103 <option value="aea79f">Ubuntu One grey</option>
104 <option value="772953">Canonical aubergine</option>
105- <option value="dd4814">Ubuntu orange</option>
106+ <option value="dd4814">Ubuntu orange</option>
107 </select>
108 </div>
109 </div>
110 </div>
111-
112+
113 <div class="grid-4 border-right" itemprop="significantLinks">
114 <span itemscope itemtype="http://schema.org/Offer"><a class="link-action" href="../download/ubuntu-font-family-0.83.zip" type="application/zip">Download for <span itemprop="price">free</span> &rsaquo;</a><span itemprop="itemOffered"><span itemscope itemtype="http://schema.org/Product"><meta itemprop="name" content="Ubuntu Font Family"/><meta itemprop="brand" content="Ubuntu"/><meta itemprop="manufacturer" content="Canonical Ltd"/><meta itemprop="model" content="0.83"/></span></span></span><br class="clear" />
115- <p>Want to use the Ubuntu Font Family on the web? Visit <a href="http://www.google.com/webfonts/specimen/Ubuntu">Ubuntu on Google Web Fonts &rsaquo;</a></p>
116+ <p>Want to use the Ubuntu Font Family on the web? Visit <a href="https://fonts.google.com/?query=Ubuntu">Ubuntu on Google Web Fonts &rsaquo;</a></p>
117 </div>
118
119 <div class="grid-4">
120@@ -95,7 +95,7 @@
121
122 <div class="grid-4 border-left" itemscope itemtype="http://schema.org/WPSideBar">
123 <h3 itemprop="description">Fonts, weights and languages</h3>
124-
125+
126 <dl itemscope itemtype="http://schema.org/ItemList">
127 <dt itemprop="name">Ubuntu</dt>
128 <dd>
129@@ -136,7 +136,7 @@
130 </dd>
131 </dl>
132 </div>
133-
134+
135 <div class="grid-12" itemscope itemtype="http://schema.org/ItemList">
136 <meta itemprop="name" content="Previews"/>
137 <meta itemprop="itemListOrder" content="Ascending" />
138@@ -157,7 +157,7 @@
139 <p>%&amp;$@*{(/|\)}</p>
140 <a href="#">top</a>
141 </div>
142-
143+
144 <div id="charset-regular" class="charset charset-regular">
145 <h2 itemprop="itemListElement">Ubuntu Regular</h2>
146 <p>ABCDEFGHIJKLMNOPQRSTUVWXYZ</p>
147@@ -175,7 +175,7 @@
148 <p>%&amp;$@*{(/|\)}</p>
149 <a href="#">top</a>
150 </div>
151-
152+
153 <div id="charset-medium" class="charset charset-medium">
154 <h2 itemprop="itemListElement">Ubuntu Medium</h2>
155 <p>ABCDEFGHIJKLMNOPQRSTUVWXYZ</p>
156@@ -193,7 +193,7 @@
157 <p>%&amp;$@*{(/|\)}</p>
158 <a href="#">top</a>
159 </div>
160-
161+
162 <div id="charset-bold" class="charset charset-bold">
163 <h2 itemprop="itemListElement">Ubuntu Bold</h2>
164 <p>ABCDEFGHIJKLMNOPQRSTUVWXYZ</p>
165@@ -211,7 +211,7 @@
166 <p>%&amp;$@*{(/|\)}</p>
167 <a href="#">top</a>
168 </div>
169-
170+
171 <div id="charset-latin" class="charset charset-regular">
172 <h2 itemprop="itemListElement">Latin</h2>
173 <p>ABCDEFGHIJKLMNOPQRSTUVWXYZ</p>
174@@ -225,14 +225,14 @@
175 <p>αβγδεζηθικλμνξοπρστυφχψω</p>
176 <a href="#">top</a>
177 </div>
178-
179+
180 <div id="charset-cyrillic" class="charset charset-regular">
181 <h2 itemprop="itemListElement">Cyrillic</h2>
182 <p>АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧ</p>
183 <p>абвгдеёжзийклмнопрстуфхцч</p>
184 <a href="#">top</a>
185 </div>
186-
187+
188 <div id="charset-condensed" class="charset charset-condensed charset-regular">
189 <h2 itemprop="itemListElement">Ubuntu Condensed</h2>
190 <p>ABCDEFGHIJKLMNOPQRSTUVWXYZ</p>
191@@ -318,7 +318,7 @@
192 <li><a href="#">Lorem ipsum</a></li>
193 </ul><br class="clear" />-->
194
195- <p>&copy; <span itemprop="copyrightYear">2011</span> <span itemprop="copyrightHolder">Canonical Ltd</a>. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
196+ <p>&copy; 2011&ndash;<span itemprop="copyrightYear">2016</span> <span itemprop="copyrightHolder">Canonical Ltd</a>. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
197 <a class="logo-ubuntu" href="../"><img src="../assets/img/logo-ubuntu-footer.png" width="118" height="27" alt="Ubuntu logo" /></a>
198 </div>
199 </div><!-- /#footer -->
200
201=== modified file 'licence/index.html'
202--- licence/index.html 2015-08-21 15:49:02 +0000
203+++ licence/index.html 2016-09-22 10:42:08 +0000
204@@ -119,7 +119,7 @@
205
206 <div id="footer" class="container-12">
207 <div class="grid-12">
208- <p>&copy; 2011 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
209+ <p>&copy; 2011&ndash;2016 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
210 <a class="logo-ubuntu" href="../"><img src="../assets/img/logo-ubuntu-footer.png" width="118" height="27" alt="Ubuntu logo" /></a>
211 </div>
212 </div><!-- /#footer -->
213
214=== modified file 'resources/index.html'
215--- resources/index.html 2015-08-21 15:49:02 +0000
216+++ resources/index.html 2016-09-22 10:42:08 +0000
217@@ -37,12 +37,12 @@
218 <a class="link-action" href="../download/ubuntu-font-family-0.83.zip">Download for free &rsaquo;</a>
219 <h1>Resources</h1>
220 </div>
221-
222+
223 <div id="resources">
224 <ul>
225 <li><a href="../download/ubuntu-font-family-0.83.zip">Download the Ubuntu Font Family &rsaquo;</a> (2.0MB)</li>
226 <li><a href="../download/ubuntu-font-family-sources_0.83.orig.tar.gz">Download the Ubuntu Font Family source code &rsaquo;</a> (For font designers with a copy of Font Lab Studio, 7.8MB)</li>
227- <li><a href="http://www.google.com/webfonts/specimen/Ubuntu">Google Web Fonts &rsaquo;</a></li>
228+ <li><a href="https://fonts.google.com/?query=Ubuntu">Google Web Fonts &rsaquo;</a></li>
229 <li><a href="http://launchpad.net/ubuntu-font-family">Launchpad &rsaquo;</a></li>
230 <li><a href="http://wiki.ubuntu.com/Ubuntu_Font_Family">Wiki documentation &rsaquo;</a></li>
231 </ul>
232@@ -55,7 +55,7 @@
233
234 <div id="footer" class="container-12">
235 <div class="grid-12">
236- <p>&copy; 2011 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
237+ <p>&copy; 2011&ndash;2016 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
238 <a class="logo-ubuntu" href="../"><img src="../assets/img/logo-ubuntu-footer.png" width="118" height="27" alt="Ubuntu logo" /></a>
239 </div>
240 </div><!-- /#footer -->
241
242=== modified file 'rupee/index.html'
243--- rupee/index.html 2015-08-21 15:49:02 +0000
244+++ rupee/index.html 2016-09-22 10:42:08 +0000
245@@ -36,14 +36,14 @@
246 <li><a href="../rupee" class="active">The Rupee sign</a></li>
247 </ul>
248 </div>
249-
250+
251 <div class="grid-12">
252 <div class="content-heading">
253 <span itemscope itemtype="http://schema.org/Offer"><a class="link-action" href="../download/ubuntu-font-family-0.83.zip" type="application/zip">Download for <span itemprop="price">free</span> &rsaquo;</a><span itemprop="itemOffered"><span itemscope itemtype="http://schema.org/Product"><meta itemprop="name" content="Ubuntu Font Family"/><meta itemprop="brand" content="Ubuntu"/><meta itemprop="manufacturer" content="Canonical Ltd"/><meta itemprop="model" content="0.83"/></span></span></span>
254 <h1>The Indian Rupee sign</h1>
255 </div>
256 </div>
257-
258+
259 <div class="grid-8">
260 <div class="content-intro">
261 <p>The <span itemprop="headline">Indian Rupee Sign (&#x20b9;)</span> has been supported in the Ubuntu Font Family since version 0.69. This was included in the Ubuntu 10.10 operating system release. Ubuntu 10.10 is the first operating system to ship with out-of-the-box support for displaying the <a href="http://en.wikipedia.org/wiki/Indian_rupee_sign">Indian Rupee Sign</a>, and this happened on 10 October 2010 (2010-10-10).</p>
262@@ -58,7 +58,7 @@
263 </ul>
264 </div>
265 </div>
266-
267+
268 <div class="grid-4">
269 <div class="content-sample">
270 <div id="sample-inactive">
271@@ -67,7 +67,7 @@
272 <!--<a href="#">Download full character set (PDF) &rsaquo;</a>-->
273 </div>
274 </div>
275-
276+
277 <div class="grid-12">
278 <div class="content-main">
279 <h2>The designer</h2>
280@@ -75,14 +75,14 @@
281 <p itemprop="contributor">The glyph for the <span itemscope itemtype="http://schema.org/Person"><span itemprop="knows">Ubuntu Font Family<span> was contributed by <a href="https://launchpad.net/~rodrigorivascosta" itemprop="url"><span itemprop="givenName">Rodrigo</span> <span itemprop="familyName">Rivas</span></a> on <time datetime="2010-09-27">27 September 2010 (2010-09-27)</time></span>. Version 0.69 of the Ubuntu Font Family was uploaded on <time datetime="2010-10-05">5 October 2010 (2010-10-05)</time>. This hopefully demonstrates the advantage and speed possible when using open development.</p>
282 </div>
283 </div>
284-
285+
286 </div><!-- /#content -->
287
288 </div><!-- /#header-and-content -->
289
290 <div id="footer" class="container-12" itemscope itemtype="http://schema.org/WPFooter">
291 <div class="grid-12">
292- <p>&copy; <span itemprop="copyrightYear">2011</span> <span itemprop="copyrightHolder">Canonical Ltd</a>. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
293+ <p>&copy; <span itemprop="copyrightYear">2011&ndash;2016</span> <span itemprop="copyrightHolder">Canonical Ltd</a>. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
294 <a class="logo-ubuntu" href="../"><img src="../assets/img/logo-ubuntu-footer.png" width="118" height="27" alt="Ubuntu logo" /></a>
295 </div>
296 </div><!-- /#footer -->

Subscribers

People subscribed via source and target branches

to all changes: