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

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
=== modified file 'forum/skins/light/media/style/style.css'
--- forum/skins/light/media/style/style.css 2012-09-29 17:29:15 +0000
+++ forum/skins/light/media/style/style.css 2013-01-15 19:26:21 +0000
@@ -279,14 +279,14 @@
279 padding: 0;279 padding: 0;
280}280}
281281
282#logo > span {282#logo > span.description {
283 float: right;283 float: right;
284 font-size: 12px;284 font-size: 12px;
285 opacity: 0.8;285 opacity: 0.8;
286 line-height: 24px;286 line-height: 24px;
287}287}
288288
289#logo > a {289#logo > span.title {
290 font-size: 30px;290 font-size: 30px;
291 display: block;291 display: block;
292 margin-top: 23px;292 margin-top: 23px;
@@ -294,9 +294,7 @@
294 text-align:right;294 text-align:right;
295}295}
296296
297#logo > a > span {297#logo > span.suffix {
298/* color: black;
299 opacity: 0.5; Does not work for every browser*/
300 color: #6F240A;298 color: #6F240A;
301 font-size: 20px;299 font-size: 20px;
302 margin-right: 5px;300 margin-right: 5px;
303301
=== modified file 'forum/skins/light/templates/base_content.html'
--- forum/skins/light/templates/base_content.html 2012-09-25 21:26:12 +0000
+++ forum/skins/light/templates/base_content.html 2013-01-15 19:26:21 +0000
@@ -52,6 +52,7 @@
52 }52 }
53 /*]]>*/53 /*]]>*/
54 </script>54 </script>
55 <link href='http://fonts.googleapis.com/css?family=Ubuntu:300,400,700,300italic,400italic,700italic' rel='stylesheet' type='text/css' />
55 <script type="text/javascript" src="http://www.ubuntu-it.org/sites/all/themes/light-drupal-theme/js/cookies.js"></script>56 <script type="text/javascript" src="http://www.ubuntu-it.org/sites/all/themes/light-drupal-theme/js/cookies.js"></script>
56 <script type="text/javascript" src="http://www.ubuntu-it.org/sites/all/themes/light-drupal-theme/js/accessibility.js"></script>57 <script type="text/javascript" src="http://www.ubuntu-it.org/sites/all/themes/light-drupal-theme/js/accessibility.js"></script>
57 <script type="text/javascript" src="{% media "/media/js/osqa.main.js" %}"></script>58 <script type="text/javascript" src="{% media "/media/js/osqa.main.js" %}"></script>
5859
=== modified file 'forum/skins/light/templates/header.html'
--- forum/skins/light/templates/header.html 2012-09-24 12:07:16 +0000
+++ forum/skins/light/templates/header.html 2013-01-15 19:26:21 +0000
@@ -17,13 +17,12 @@
17 <a href="http://wiki.ubuntu-it.org">wiki</a>17 <a href="http://wiki.ubuntu-it.org">wiki</a>
18 <a id="" href="http://forum.ubuntu-it.org">forum</a>18 <a id="" href="http://forum.ubuntu-it.org">forum</a>
19 <a class="active" id="" href="http://chiedi.ubuntu-it.org">chiedi</a>19 <a class="active" id="" href="http://chiedi.ubuntu-it.org">chiedi</a>
20 <a id="" href="http://chat.ubuntu-it.org">chat</a>
20 <a id="" href="http://cerca.ubuntu-it.org">cerca</a>21 <a id="" href="http://cerca.ubuntu-it.org">cerca</a>
21 <a id="" href="http://planet.ubuntu-it.org">planet</a>22 <a id="" href="http://planet.ubuntu-it.org">planet</a>
22 </div>23 </div>
23 <a href="/" title="Ubuntu - Chiedi alla comunità italiana">24 <span class="suffix">chiedi</span><span class="title">ubuntu-it</span>
24 <span>chiedi</span>ubuntu-it25 <span class="description">comunit&agrave; italiana</span>
25 </a>
26 <span>comunità italiana</span>
27 </div>26 </div>
28 27
29 <div class="buttons">28 <div class="buttons">

Subscribers

People subscribed via source and target branches

to all changes: