Summit

Merge lp:~cjohnston/summit/960px into lp:summit

  1. 960px
  2. Merge into trunk
Proposed by Chris Johnston
Status: Superseded
Proposed branch: lp:~cjohnston/summit/960px
Merge into: lp:summit
Diff against target: 25 lines (+3/-1)
2 files modified
summit/schedule/templates/schedule/schedule.html (+1/-0)
summit/templates/base.html (+2/-1)
To merge this branch: bzr merge lp:~cjohnston/summit/960px
Reviewer Review Type Date Requested Status
Summit Hackers Pending
Review via email: mp+68589@code.launchpad.net

This proposal has been superseded by a proposal from 2011-07-20.

Commit message

Adds 960px to Summit with it taken off on the schedule page.

To post a comment you must log in.
lp:~cjohnston/summit/960px updated
135. By Chris Johnston

Moves link to css into base.html

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/schedule/templates/schedule/schedule.html'
2--- summit/schedule/templates/schedule/schedule.html 2011-05-15 02:19:17 +0000
3+++ summit/schedule/templates/schedule/schedule.html 2011-07-20 21:28:32 +0000
4@@ -92,6 +92,7 @@
5 </script>
6 {% endif %}
7 {% endblock %}
8+{% block 960css %}{% endblock %}
9
10 {% block sub_nav_links %}
11 {% if schedule.edit %}
12
13=== modified file 'summit/templates/base.html'
14--- summit/templates/base.html 2011-07-20 14:35:10 +0000
15+++ summit/templates/base.html 2011-07-20 21:28:32 +0000
16@@ -11,7 +11,8 @@
17 <link rel="stylesheet" type="text/css" media="screen" href="/media/css/layout.css" />
18 <link rel="stylesheet" type="text/css" media="screen" href="/media/css/style.css" />
19 <link rel="stylesheet" type="text/css" media="screen" href="/media/css/twidenash.css" />
20- {% block head %}{% endblock %}
21+ {% block 960css %}<link rel="stylesheet" type="text/css" href="{{ubuntu_website_media}}/css/960.css" />{% endblock %}
22+{% block head %}{% endblock %}
23 {% endblock %}
24
25 {% block top_nav_login_links %}

Subscribers

People subscribed via source and target branches