LoCo Team Portal

Merge lp:~svwilliams/loco-team-portal/876820-team-list-legend into lp:loco-team-portal

  1. 876820-team-list-legend
  2. Merge into 0.2
Proposed by Stephen V. Williams
Status: Merged
Approved by: Chris Johnston
Approved revision: 499
Merged at revision: 498
Proposed branch: lp:~svwilliams/loco-team-portal/876820-team-list-legend
Merge into: lp:loco-team-portal
Diff against target: 55 lines (+13/-6)
3 files modified
.bzrignore (+1/-0)
loco_directory/media/css/newstyle.css (+10/-4)
loco_directory/templates/teams/team_list.html (+2/-2)
To merge this branch: bzr merge lp:~svwilliams/loco-team-portal/876820-team-list-legend
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+81183@code.launchpad.net

Commit message

team-legend now 200px, float:right, shifted:40%
new li class to stack the elements

Description of the change

Modified the teams-legend and added a new ls class (float-list)
 * teams legend is now 200px
 * teams legend has padding 25% removed (so it goes all the way right)
 * float-list forces both list items float:right clear:right

Let me know if you'd like it to look any different.

To post a comment you must log in.
lp:~svwilliams/loco-team-portal/876820-team-list-legend updated
499. By Stephen V. Williams

moved box to center and left aligned list elements

Revision history for this message
Chris Johnston (cjohnston) wrote :

Looks good.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2011-06-10 18:09:20 +0000
3+++ .bzrignore 2011-11-03 19:46:36 +0000
4@@ -18,3 +18,4 @@
5 loco_directory/setup.py
6 bzr_apps
7 loco_directory/media/js/twidenash
8+env
9
10=== modified file 'loco_directory/media/css/newstyle.css'
11--- loco_directory/media/css/newstyle.css 2011-10-05 00:50:53 +0000
12+++ loco_directory/media/css/newstyle.css 2011-11-03 19:46:36 +0000
13@@ -56,6 +56,12 @@
14 clear: right;
15 }
16
17+li.float_list {
18+ float: left;
19+ margin: 0px 0px 0px 25px;
20+ clear: left;
21+}
22+
23 li.approved {
24 list-style-image: url(../img/approved.png); /* Colorful Ubuntu Logo */
25 }
26@@ -592,11 +598,11 @@
27 }
28
29 .teams-legend {
30- width:50%;
31+ width:200px;
32 padding:5px 0;
33- margin:5px 25% 0;
34- float:left;
35- text-align:center;
36+ margin:5px 40% 0;
37+ float:right;
38+ text-align:right;
39 background-color:#F7F7F7;
40 box-shadow:0 1px 1px #DFDFDF;
41 border-radius:8px;
42
43=== modified file 'loco_directory/templates/teams/team_list.html'
44--- loco_directory/templates/teams/team_list.html 2011-10-05 00:50:53 +0000
45+++ loco_directory/templates/teams/team_list.html 2011-11-03 19:46:36 +0000
46@@ -14,8 +14,8 @@
47
48 <article class="teams-legend">
49 <ul>
50- <li class="approved col_left">{% trans "Approved Teams" %}</li>
51- <li class="unapproved col_right">{% trans "Unapproved Teams" %}</li>
52+ <li class="approved float_list">{% trans "Approved Teams" %}</li>
53+ <li class="unapproved float_list">{% trans "Unapproved Teams" %}</li>
54 </ul>
55 </article>
56

Subscribers

People subscribed via source and target branches