Ubuntu-it Ask

Merge lp:~giuseppeterrasi-deactivatedaccount/ubuntu-it-ask/csschanges into lp:ubuntu-it-ask

  1. csschanges
  2. Merge into stable
Proposed by Giuseppe Terrasi
Status: Merged
Merge reported by: Giuseppe Terrasi
Merged at revision: not available
Proposed branch: lp:~giuseppeterrasi-deactivatedaccount/ubuntu-it-ask/csschanges
Merge into: lp:ubuntu-it-ask
Diff against target: 64 lines (+7/-9)
3 files modified
forum/skins/light/media/style/style.css (+3/-5)
forum/skins/light/templates/base_content.html (+1/-0)
forum/skins/light/templates/header.html (+3/-4)
To merge this branch: bzr merge lp:~giuseppeterrasi-deactivatedaccount/ubuntu-it-ask/csschanges
Reviewer Review Type Date Requested Status
Ubuntu-it Ask Pending
Review via email: mp+143388@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'forum/skins/light/media/style/style.css'
2--- forum/skins/light/media/style/style.css 2012-09-29 17:29:15 +0000
3+++ forum/skins/light/media/style/style.css 2013-01-15 19:26:21 +0000
4@@ -279,14 +279,14 @@
5 padding: 0;
6 }
7
8-#logo > span {
9+#logo > span.description {
10 float: right;
11 font-size: 12px;
12 opacity: 0.8;
13 line-height: 24px;
14 }
15
16-#logo > a {
17+#logo > span.title {
18 font-size: 30px;
19 display: block;
20 margin-top: 23px;
21@@ -294,9 +294,7 @@
22 text-align:right;
23 }
24
25-#logo > a > span {
26-/* color: black;
27- opacity: 0.5; Does not work for every browser*/
28+#logo > span.suffix {
29 color: #6F240A;
30 font-size: 20px;
31 margin-right: 5px;
32
33=== modified file 'forum/skins/light/templates/base_content.html'
34--- forum/skins/light/templates/base_content.html 2012-09-25 21:26:12 +0000
35+++ forum/skins/light/templates/base_content.html 2013-01-15 19:26:21 +0000
36@@ -52,6 +52,7 @@
37 }
38 /*]]>*/
39 </script>
40+ <link href='http://fonts.googleapis.com/css?family=Ubuntu:300,400,700,300italic,400italic,700italic' rel='stylesheet' type='text/css' />
41 <script type="text/javascript" src="http://www.ubuntu-it.org/sites/all/themes/light-drupal-theme/js/cookies.js"></script>
42 <script type="text/javascript" src="http://www.ubuntu-it.org/sites/all/themes/light-drupal-theme/js/accessibility.js"></script>
43 <script type="text/javascript" src="{% media "/media/js/osqa.main.js" %}"></script>
44
45=== modified file 'forum/skins/light/templates/header.html'
46--- forum/skins/light/templates/header.html 2012-09-24 12:07:16 +0000
47+++ forum/skins/light/templates/header.html 2013-01-15 19:26:21 +0000
48@@ -17,13 +17,12 @@
49 <a href="http://wiki.ubuntu-it.org">wiki</a>
50 <a id="" href="http://forum.ubuntu-it.org">forum</a>
51 <a class="active" id="" href="http://chiedi.ubuntu-it.org">chiedi</a>
52+ <a id="" href="http://chat.ubuntu-it.org">chat</a>
53 <a id="" href="http://cerca.ubuntu-it.org">cerca</a>
54 <a id="" href="http://planet.ubuntu-it.org">planet</a>
55 </div>
56- <a href="/" title="Ubuntu - Chiedi alla comunità italiana">
57- <span>chiedi</span>ubuntu-it
58- </a>
59- <span>comunità italiana</span>
60+ <span class="suffix">chiedi</span><span class="title">ubuntu-it</span>
61+ <span class="description">comunit&agrave; italiana</span>
62 </div>
63
64 <div class="buttons">

Subscribers

People subscribed via source and target branches

to all changes: