Xubuntu Documentation

Merge lp:~knome/xubuntu-docs/startpage-common-libs into lp:xubuntu-docs/xenial

  1. startpage-common-libs
  2. Merge into xenial
Proposed by Pasi Lallinaho on 2015-11-22
Status: Merged
Merged at revision: 491
Proposed branch: lp:~knome/xubuntu-docs/startpage-common-libs
Merge into: lp:xubuntu-docs/xenial
Prerequisite: lp:~krytarik/xubuntu-docs/contributor
Diff against target: 468 lines (+103/-272)
9 files modified
Makefile (+15/-16)
contributor-docs/Makefile (+2/-1)
startpage/index.html (+41/-38)
startpage/reset.css (+0/-53)
startpage/style-smaller.css (+0/-27)
startpage/style-smallest.css (+0/-9)
startpage/style-startpage.css (+43/-0)
startpage/style.css (+0/-127)
user-docs/Makefile (+2/-1)
To merge this branch: bzr merge lp:~knome/xubuntu-docs/startpage-common-libs
Reviewer Review Type Date Requested Status
David Pires 2015-11-22 Approve on 2015-11-23
Krytarik Raido less-silly 2015-11-22 Pending
Review via email: mp+278264@code.launchpad.net

Description of the Change

Change the startpage building process so that they use the same common libs.

To post a comment you must log in.
David Pires (slickymaster) wrote :

Thanks knome

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2015-11-22 16:21:02 +0000
3+++ Makefile 2015-11-22 16:21:02 +0000
4@@ -26,25 +26,24 @@
5 awk -v lang="$$lang" '$$1 == "\"Language-Team:" {print "\t\t\t\t\t\t<li><a href=\\\"contributor/" lang "/index.html\\\">" $$2 "</a></li>\\n"; exit}' contributor-docs/po/$$lang.po; \
6 done | sed '$$ s/\\n$$//')
7
8-all: clean startpage user-all contributor-all
9-
10-user-all: user-html user-html-translations user-pdf user-pdf-translations
11-
12-contributor-all: contributor-html contributor-html-translations contributor-pdf contributor-pdf-translations
13-
14-startpage: startpage-style user-get-translations contributor-get-translations
15+all: clean common-libs startpage user-all contributor-all
16+
17+user-all: common-libs user-html user-html-translations user-pdf user-pdf-translations
18+
19+contributor-all: common-libs contributor-html contributor-html-translations contributor-pdf contributor-pdf-translations
20+
21+common-libs:
22+ mkdir -p build/
23+ cp -r libs-common/ build/
24+ -cp startpage/*.css build/
25+ @touch common-libs
26+
27+startpage: common-libs user-get-translations contributor-get-translations
28 sed "s@<a href=\"[^\"]\+\">Official Documentation</a>@&$(VERSION)@; \
29 s@^\(.*\)<!-- user docs translations -->.*@$(TRSLINKSUSER)@" startpage/index.html > build/index.html
30 sed -i "s@<a href=\"[^\"]\+\">Contributor Documentation</a>@&$(VERSION)@; \
31 s@^\(.*\)<!-- contributor docs translations -->.*@$(if $(TRSLINKSCONTR),$(TRSLINKSCONTR),\1)@" build/index.html
32-
33-startpage-style:
34- mkdir -p build
35- cp startpage/*.css \
36- startpage/*.png \
37- build/
38- @touch startpage-style
39-
40+
41 user-docs/update-translations:
42 ifeq ($(TRANSLATIONS),)
43 ifneq ($(wildcard user-docs/po/LINGUAS),)
44@@ -145,6 +144,6 @@
45 clean:
46 $(MAKE) -C user-docs clean
47 $(MAKE) -C contributor-docs clean
48- rm -rf build startpage-style xubuntu-docs.tar.gz
49+ rm -rf build common-libs startpage-style xubuntu-docs.tar.gz
50
51 .PHONY: startpage
52
53=== modified file 'contributor-docs/Makefile'
54--- contributor-docs/Makefile 2015-11-22 16:21:02 +0000
55+++ contributor-docs/Makefile 2015-11-22 16:21:02 +0000
56@@ -37,8 +37,9 @@
57 zip -Xr9Dq xubuntu-documentation.epub *
58
59 html-style:
60+ $(MAKE) -C ../ common-libs
61 mkdir -p ../build/contributor/libs
62- cp -r ../libs-common ../build/
63+# cp -r ../libs-common ../build/
64 -cp -r libs/images ../build/contributor/libs/
65 @touch html-style
66
67
68=== removed file 'startpage/favicon.png'
69Binary files startpage/favicon.png 2014-07-21 09:57:19 +0000 and startpage/favicon.png 1970-01-01 00:00:00 +0000 differ
70=== modified file 'startpage/index.html'
71--- startpage/index.html 2015-11-22 16:21:02 +0000
72+++ startpage/index.html 2015-11-22 16:21:02 +0000
73@@ -3,52 +3,55 @@
74 <head>
75 <title>Welcome to Xubuntu Documentation!</title>
76 <meta charset="UTF-8" />
77- <link rel="stylesheet" href="reset.css" />
78- <link rel="stylesheet" href="style.css" />
79- <link rel="stylesheet" href="style-smaller.css" media="only screen and (max-width:950px)" />
80- <link rel="stylesheet" href="style-smallest.css" media="only screen and (max-width:400px)" />
81- <link rel="shortcut icon" href="favicon.png">
82+ <link rel="stylesheet" href="libs-common/css/reset.css" />
83+ <link rel="stylesheet" href="libs-common/css/style.css" />
84+ <link rel="stylesheet" href="style-startpage.css" />
85+ <link rel="stylesheet" href="libs-common/css/style-resp-950.css" media="only screen and (max-width:950px)" />
86+ <link rel="stylesheet" href="libs-common/css/style-resp-400.css" media="only screen and (max-width:400px)" />
87+ <link rel="shortcut icon" href="libs-common/images/favicon.png">
88 </head>
89
90 <body>
91
92- <div id="header">
93- <img src="logo.png" alt="Xubuntu" />
94+ <div id="masthead">
95+ <img src="libs-common/images/logo.png" alt="Xubuntu" />
96 </div>
97
98- <div id="content">
99- <h1>Welcome to Xubuntu 16.04 Documentation!</h1>
100-
101- <div id="user" class="section">
102- <div class="documentation">
103- <h2>Official Documentation</h2>
104- <p>The <a href="user/C/index.html">Official Documentation</a> provides information on some of the most common topics on using Xubuntu.</p>
105-
106- <h3>The documentation is available in these additional languages:</h3>
107- <ul class="inline">
108- <li>None yet, contribute!</li><!-- user docs translations -->
109- </ul>
110+ <div class="book">
111+ <div id="content">
112+ <h1>Welcome to Xubuntu 16.04 Documentation!</h1>
113+
114+ <div id="user" class="section">
115+ <div class="documentation">
116+ <h2>Official Documentation</h2>
117+ <p>The <a href="user/C/index.html">Official Documentation</a> provides information on some of the most common topics on using Xubuntu.</p>
118+
119+ <h3>The documentation is available in these additional languages:</h3>
120+ <ul>
121+ <li>None yet, contribute!</li><!-- user docs translations -->
122+ </ul>
123+ </div>
124+
125+ <h2>Other Support Methods</h2>
126+ <p>If you can't find the answer to your question in the Official Documentation, there are other ways to get help and support for Xubuntu. The complete list of support methods can be found in the <a href="http://xubuntu.org/help/">Help & Support</a> section of our website.</p>
127+ <p>To get live help, join the <a href="http://webchat.freenode.net/?channels=xubuntu&nick=xubuntu..d&prompt=1">#xubuntu</a> channel on the Freenode IRC network.</p>
128+ <p>When you are seeking for help, please note that most of the general Ubuntu help also applies to Xubuntu.</p>
129 </div>
130
131- <h2>Other Support Methods</h2>
132- <p>If you can't find the answer to your question in the Official Documentation, there are other ways to get help and support for Xubuntu. The complete list of support methods can be found in the <a href="http://xubuntu.org/help/">Help & Support</a> section of our website.</p>
133- <p>To get live help, join the <a href="http://webchat.freenode.net/?channels=xubuntu&nick=xubuntu..d&prompt=1">#xubuntu</a> channel on the Freenode IRC network.</p>
134- <p>When you are seeking for help, please note that most of the general Ubuntu help also applies to Xubuntu.</p>
135- </div>
136-
137- <div id="contributor" class="section">
138- <h2>Get Involved</h2>
139- <p>Xubuntu is a community-driven project, and you can be part of the community that is creating it! Releasing an operating system requires many people with different skills. Areas of development include artwork, bug triaging, documentation, development, marketing, programming, testing...</p>
140- <p>To learn more on contributing, have a look at the Contributor Documentation below, or visit the <a href="http://xubuntu.org/contribute/">Get Involved</a> section on the Xubuntu website.</p>
141-
142- <div class="documentation">
143- <h2>Contributor Documentation</h2>
144- <p>The <a href="contributor/C/index.html">Contributor Documentation</a> provides information on some of the most common topics on contributing to Xubuntu.</p>
145-
146- <h3>The documentation is available in these additional languages:</h3>
147- <ul class="inline">
148- <li>None yet, contribute!</li><!-- contributor docs translations -->
149- </ul>
150+ <div id="contributor" class="section">
151+ <h2>Get Involved</h2>
152+ <p>Xubuntu is a community-driven project, and you can be part of the community that is creating it! Releasing an operating system requires many people with different skills. Areas of development include artwork, bug triaging, documentation, development, marketing, programming, testing...</p>
153+ <p>To learn more on contributing, have a look at the Contributor Documentation below, or visit the <a href="http://xubuntu.org/contribute/">Get Involved</a> section on the Xubuntu website.</p>
154+
155+ <div class="documentation">
156+ <h2>Contributor Documentation</h2>
157+ <p>The <a href="contributor/C/index.html">Contributor Documentation</a> provides information on some of the most common topics on contributing to Xubuntu.</p>
158+
159+ <h3>The documentation is available in these additional languages:</h3>
160+ <ul>
161+ <li>None yet, contribute!</li><!-- contributor docs translations -->
162+ </ul>
163+ </div>
164 </div>
165 </div>
166 </div>
167
168=== removed file 'startpage/logo.png'
169Binary files startpage/logo.png 2014-03-12 12:43:18 +0000 and startpage/logo.png 1970-01-01 00:00:00 +0000 differ
170=== removed file 'startpage/reset.css'
171--- startpage/reset.css 2012-09-18 00:31:15 +0000
172+++ startpage/reset.css 1970-01-01 00:00:00 +0000
173@@ -1,53 +0,0 @@
174-html, body, div, span, applet, object, iframe,
175-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
176-a, abbr, acronym, address, big, cite, code,
177-del, dfn, em, font, img, ins, kbd, q, s, samp,
178-small, strike, strong, sub, sup, tt, var,
179-b, u, i, center,
180-dl, dt, dd, ol, ul, li,
181-fieldset, form, label, legend,
182-table, caption, tbody, tfoot, thead, tr, th, td,
183-hr {
184- margin: 0;
185- padding: 0;
186- border: 0;
187- outline: 0;
188- font-size: 100%;
189- vertical-align: baseline;
190- background: transparent;
191-}
192-body {
193- line-height: 1;
194-}
195-ol, ul {
196- list-style: none;
197-}
198-blockquote, q {
199- quotes: none;
200-}
201-blockquote:before, blockquote:after,
202-q:before, q:after {
203- content: '';
204- content: none;
205-}
206-
207-/* remember to define focus styles! */
208-:focus {
209- outline: 0;
210-}
211-
212-/* remember to highlight inserts somehow! */
213-ins {
214- text-decoration: none;
215-}
216-del {
217- text-decoration: line-through;
218-}
219-
220-/* tables still need 'cellspacing="0"' in the markup */
221-table {
222- border-collapse: collapse;
223- border-spacing: 0;
224-}
225-
226-
227
228=== removed file 'startpage/style-smaller.css'
229--- startpage/style-smaller.css 2015-01-11 21:50:34 +0000
230+++ startpage/style-smaller.css 1970-01-01 00:00:00 +0000
231@@ -1,27 +0,0 @@
232-/*
233- * Created by Pasi Lallinaho <pasi@shimmerproject.org>
234- * The license of this file is CC-BY-SA 2.0.
235- *
236- */
237-
238-#header {
239- margin: 1em 0;
240- padding: 0 1.5em;
241-}
242-
243- #header img {
244- max-width: 80%;
245- height: auto;
246- }
247-
248-#content {
249- max-width: 100%;
250- min-width: 0;
251-
252- margin: 0 auto;
253- padding: 1.5em;
254-
255- -webkit-border-radius: 0;
256- -moz-border-radius: 0;
257- border-radius: 0;
258-}
259\ No newline at end of file
260
261=== removed file 'startpage/style-smallest.css'
262--- startpage/style-smallest.css 2015-01-11 21:50:34 +0000
263+++ startpage/style-smallest.css 1970-01-01 00:00:00 +0000
264@@ -1,9 +0,0 @@
265-/*
266- * Created by Pasi Lallinaho <pasi@shimmerproject.org>
267- * The license of this file is CC-BY-SA 2.0.
268- *
269- */
270-
271-h1 {
272- font-size: 160%;
273-}
274\ No newline at end of file
275
276=== added file 'startpage/style-startpage.css'
277--- startpage/style-startpage.css 1970-01-01 00:00:00 +0000
278+++ startpage/style-startpage.css 2015-11-22 16:21:02 +0000
279@@ -0,0 +1,43 @@
280+/*
281+ * Created by Pasi Lallinaho <pasi@shimmerproject.org>
282+ * The license of this file is CC-BY-SA 2.0.
283+ *
284+ */
285+
286+.section {
287+ margin: 0 -3em;
288+ padding: 0 3em 1.5em 3em;
289+ border-top: 0.5em solid rgba( 0, 0, 0, 0.1 );
290+}
291+
292+.documentation {
293+ margin: 0 -3em;
294+ padding: 1.8em 3em;
295+ background-color: rgba( 255, 255, 255, 0.95 );
296+}
297+ p + .documentation {
298+ margin-top: 1.8em;
299+ }
300+ .documentation h2 {
301+ margin-top: 0;
302+ }
303+ .documentation h3,
304+ .documentation p,
305+ .documentation li {
306+ font-size: 115%;
307+ line-height: 1.5em;
308+ }
309+
310+h3 + ul {
311+ margin-top: -1em;
312+}
313+
314+ul {
315+ margin: 0;
316+}
317+
318+ul li {
319+ list-style-type: none;
320+ display: inline;
321+ margin-right: 0.5em;
322+}
323
324=== removed file 'startpage/style.css'
325--- startpage/style.css 2015-11-22 16:21:02 +0000
326+++ startpage/style.css 1970-01-01 00:00:00 +0000
327@@ -1,127 +0,0 @@
328-/*
329- * Created by Pasi Lallinaho <pasi@shimmerproject.org>
330- * The license of this file is CC-BY-SA 2.0.
331- *
332- */
333-
334-@import url('reset.css');
335-
336-body {
337- background-color: #e4e4e4;
338-
339- font-family: "Droid Sans", sans-serif;
340- font-size: small;
341- line-height: 1.3em;
342-}
343-
344-#header {
345- max-width: 950px;
346- margin: 2.5em auto 2em auto;
347- padding: 0 3em;
348- line-height: 1.5em;
349-}
350-
351-#content {
352- max-width: 950px;
353- min-width: 580px;
354- margin: 1em auto;
355-
356- padding: 3em 3em 1em;
357- line-height: 1.5em;
358-
359- background-color: #fafafa;
360-
361- border-radius: 4px;
362- box-shadow: 0 0 10px rgba( 0, 0, 0, 0.1 );
363-}
364-
365-.section {
366- margin: 0 -3em;
367- padding: 0 3em 1.5em 3em;
368- border-top: 0.5em solid rgba( 0, 0, 0, 0.1 );
369-}
370-
371-.documentation {
372- margin: 0 -3em;
373- padding: 1.8em 3em;
374- background-color: rgba( 255, 255, 255, 0.95 );
375-}
376- p + .documentation {
377- margin-top: 1.8em;
378- }
379- .documentation h2 {
380- margin-top: 0;
381- }
382- .documentation h3,
383- .documentation p,
384- .documentation li {
385- font-size: 115%;
386- line-height: 1.5em;
387- }
388-
389-/* */
390-
391-h1 {
392- margin: 0 0 1em 0;
393-
394- font-size: 220%;
395- font-weight: normal;
396- line-height: 1.2em;
397-
398- color: #04a;
399-}
400-
401-h2 {
402- margin: 1em 0;
403- /*padding-top: 0.5em;*/
404-
405- font-size: 180%;
406- font-weight: normal;
407- line-height: 1.2em;
408-
409- /*border-top: 1px dotted #ccc;*/
410- color: #333;
411-}
412-
413- h2.intro {
414- color: #2c5aa4;
415- font-size: 200%;
416- }
417-
418-p {
419- margin-bottom: 1em;
420- font-size: 105%;
421- line-height: 1.4em;
422-}
423-
424-a {
425- color: #2774e7;
426- border-bottom: 1px solid #aaa;
427- text-decoration: none;
428-}
429-
430-ol {
431- margin-bottom: 1.5em;
432- font-size: 130%;
433- line-height: 1.5em;
434-}
435-
436- ol li {
437- list-style-type: decimal;
438- margin-left: 1.3em;
439- }
440-
441-ul {
442- margin-bottom: 1em;
443-}
444-
445-ul li {
446- list-style-type: square;
447- list-style-position: inside;
448-}
449-
450-ul.inline li {
451- list-style-type: none;
452- display: inline;
453- margin-right: 0.5em;
454-}
455
456=== modified file 'user-docs/Makefile'
457--- user-docs/Makefile 2015-11-22 16:21:02 +0000
458+++ user-docs/Makefile 2015-11-22 16:21:02 +0000
459@@ -33,8 +33,9 @@
460 zip -Xr9Dq xubuntu-documentation.epub *
461
462 html-style:
463+ $(MAKE) -C ../ common-libs
464 mkdir -p ../build/user/libs
465- cp -r ../libs-common ../build/
466+# cp -r ../libs-common ../build/
467 cp -r libs/images ../build/user/libs/
468 @touch html-style
469

Subscribers

People subscribed via source and target branches