Merge lp:~michael.nelson/ubuntu-webcatalog/fix-carousel-width into lp:ubuntu-webcatalog

Proposed by Michael Nelson
Status: Merged
Approved by: Łukasz Czyżykowski
Approved revision: 100
Merged at revision: 99
Proposed branch: lp:~michael.nelson/ubuntu-webcatalog/fix-carousel-width
Merge into: lp:ubuntu-webcatalog
Diff against target: 23 lines (+2/-1)
2 files modified
src/webcatalog/static/css/carousel.css (+1/-0)
src/webcatalog/templates/webcatalog/department_overview.html (+1/-1)
To merge this branch: bzr merge lp:~michael.nelson/ubuntu-webcatalog/fix-carousel-width
Reviewer Review Type Date Requested Status
Łukasz Czyżykowski (community) Approve
Review via email: mp+101706@code.launchpad.net

Commit message

featured-widget has correct width in chromium and 'Ubuntu apps directory' not repeated for department pages.

Description of the change

Fixes two tiny issues:

1) On the landing page in chromium, the featured-widget carousel was displaying only 2 columns like this:

http://people.canonical.com/~michaeln/tmp/carousel-width-chromium-firefox.png

I couldn't see why chromium was collapsing the width for the widget, so set it explicitly (and checked zooming etc.) - I'd be happy to change that if you find it though :)

2) The h1 used for departments was repeating "Ubuntu apps directory" that's already in the div#header.

`fab test` shows tests still pass.

To post a comment you must log in.
Revision history for this message
Łukasz Czyżykowski (lukasz-czyzykowski) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/webcatalog/static/css/carousel.css'
--- src/webcatalog/static/css/carousel.css 2012-04-05 01:09:37 +0000
+++ src/webcatalog/static/css/carousel.css 2012-04-12 10:02:27 +0000
@@ -112,6 +112,7 @@
112 margin: 28px 0 30px 222px;112 margin: 28px 0 30px 222px;
113 overflow: hidden;113 overflow: hidden;
114 padding: 5px;114 padding: 5px;
115 width: 677px;
115}116}
116.featured-widget .carousel-wrapper{117.featured-widget .carousel-wrapper{
117 height: 320px;118 height: 320px;
118119
=== modified file 'src/webcatalog/templates/webcatalog/department_overview.html'
--- src/webcatalog/templates/webcatalog/department_overview.html 2012-04-05 01:09:37 +0000
+++ src/webcatalog/templates/webcatalog/department_overview.html 2012-04-12 10:02:27 +0000
@@ -2,7 +2,7 @@
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{% trans "Ubuntu Apps Directory" %} — {{ dept.name }}{% endblock %}4{% block title %}{% trans "Ubuntu Apps Directory" %} — {{ dept.name }}{% endblock %}
5{% block header %}{% trans "Ubuntu Apps Directory" %} — {{ dept.name }}{% endblock %}5{% block header %}{{ dept.name }}{% endblock %}
66
7{% block content %}7{% block content %}
88

Subscribers

People subscribed via source and target branches