Ubuntu NL Artwork

Merge lp:~johanvandijk/ubuntu-nl-artwork/light-smf-theme into lp:ubuntu-nl-artwork/light-smf-theme

  1. light-smf-theme
  2. Merge into light-smf-theme-new
Proposed by Johan van Dijk
Status: Needs review
Proposed branch: lp:~johanvandijk/ubuntu-nl-artwork/light-smf-theme
Merge into: lp:ubuntu-nl-artwork/light-smf-theme
Diff against target: 59 lines (+6/-4)
3 files modified
css/index.css (+3/-2)
header.template.php (+1/-0)
index.template.php (+2/-2)
To merge this branch: bzr merge lp:~johanvandijk/ubuntu-nl-artwork/light-smf-theme
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+148058@code.launchpad.net

Description of the change

Small fixes:

* [tt] bbcode tag is now displayed in monospace font (Ubuntu Mono)
* Small layout fixes for tables and polls

Deze code is al maanden in gebruik op de main server, lijkt me tijd om het gelijk te trekken ;)

To post a comment you must log in.
Revision history for this message
Johan van Dijk (johanvandijk) wrote :

Zie ook Bug #1025619 en Bug #1041154

Reply
lp:~johanvandijk/ubuntu-nl-artwork/light-smf-theme updated
29. By Johan van Dijk

Aanpassing header, menu-item Vraag en Antwoord toegevoegd

30. By Johan van Dijk

tagjes gefixt

Unmerged revisions

30. By Johan van Dijk

tagjes gefixt

29. By Johan van Dijk

Aanpassing header, menu-item Vraag en Antwoord toegevoegd

28. By Johan van Dijk <email address hidden>

fix polls

27. By Johan van Dijk <email address hidden>

fix uitlijning tabellen, met name zichtbaar in polls

26. By Johan van Dijk <email address hidden>

aanpassing om [tt] bbcode ook echt in monospace font weer te geven

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'css/index.css'
2--- css/index.css 2012-07-06 07:09:21 +0000
3+++ css/index.css 2013-07-03 01:33:25 +0000
4@@ -411,7 +411,7 @@
5 }
6 .bbc_tt
7 {
8- font-family: "Ubuntu", "dejavu sans mono", "monaco", "lucida console", "courier new", monospace;
9+ font-family: "Ubuntu Mono", "dejavu sans mono", "monaco", "lucida console", "courier new", monospace;
10 }
11
12 /* Generally, those [?] icons. This makes your cursor a help icon. */
13@@ -937,7 +937,7 @@
14 {
15 white-space: nowrap;
16 padding: 0;
17- text-align: left;
18+ text-align: center;
19 }
20
21 /* table_grid styles for Profile > Show Permissions. */
22@@ -2130,6 +2130,7 @@
23 width: 60%;
24 max-width: 450px;
25 overflow: hidden;
26+ float: left;
27 }
28
29 #poll_options dl.options .percentage
30
31=== modified file 'header.template.php'
32--- header.template.php 2012-05-04 19:16:55 +0000
33+++ header.template.php 2013-07-03 01:33:25 +0000
34@@ -26,6 +26,7 @@
35 <div id="sub-nav">
36 <a href="http://wiki.ubuntu-nl.org/" class="sub-nav-item">Documentatie</a>
37 <a href="/" class="sub-nav-item current">Forum</a>
38+ <a href="http://vraag.ubuntu-nl.org/" class="sub-nav-item">Vraag en Antwoord</a>
39 <a href="http://ubuntu-nl.org/ondersteuning/live-chat" class="sub-nav-item">Live chat</a>
40 <a href="http://ubuntu-nl.org/ondersteuning/steunpunten" class="sub-nav-item">Steunpunten</a>
41 <a href="https://lists.ubuntu.com/mailman/listinfo/ubuntu-nl" class="sub-nav-item">Mailinglijst</a>
42
43=== modified file 'index.template.php'
44--- index.template.php 2012-04-22 15:35:00 +0000
45+++ index.template.php 2013-07-03 01:33:25 +0000
46@@ -85,11 +85,11 @@
47 <head>';
48
49 //Ubuntu font
50- echo'<link href="http://fonts.googleapis.com/css?family=Ubuntu:400,400italic,700" rel="stylesheet" type="text/css">';
51+ echo'<link href="http://fonts.googleapis.com/css?family=Ubuntu:400,400italic,700" rel="stylesheet" type="text/css" />';
52
53 // Favicon
54 echo '
55- <link rel="shortcut icon" href="', $settings['theme_url'], '/images/favicon.ico" type="image/x-icon">';
56+ <link rel="shortcut icon" href="', $settings['theme_url'], '/images/favicon.ico" type="image/x-icon" />';
57
58 // The ?fin20 part of this link is just here to make sure browsers don't cache it wrongly.
59 echo '

Subscribers

People subscribed via source and target branches