Stephen V. Williams has proposed merging
lp:~svwilliams/loco-directory/876820-team-list-legend into lp:loco-directory.
Requested reviews:
LoCo Team Portal Developers (loco-directory-dev)
Related bugs:
Bug #876820 in LoCo Team Portal: "Move the approved and unapproved labels"
https://bugs.launchpad.net/loco-directory/+bug/876820
For more details, see:
https://code.launchpad.net/~svwilliams/loco-directory/876820-team-list-legend/+merge/81183
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.
--
https://code.launchpad.net/~svwilliams/loco-directory/876820-team-list-legend/+merge/81183
Your team LoCo Team Portal Developers is requested to review the proposed merge
of lp:~svwilliams/loco-directory/876820-team-list-legend into lp:loco-directory.
=== modified file '.bzrignore'
--- .bzrignore 2011-06-10 18:09:20 +0000
+++ .bzrignore 2011-11-03 18:14:23 +0000
@@ -18,3 +18,4 @@
loco_directory/setup.py
bzr_apps
loco_directory/media/js/twidenash
+env
=== modified file 'loco_directory/media/css/newstyle.css'
--- loco_directory/media/css/newstyle.css 2011-10-05 00:50:53 +0000
+++ loco_directory/media/css/newstyle.css 2011-11-03 18:14:23 +0000
@@ -56,6 +56,12 @@
clear: right;
}
+li.float_list {
+ float: right;
+ margin: 0px 10px 0px 0px;
+ clear: right;
+}
+
li.approved {
list-style-image: url(../img/approved.png); /* Colorful Ubuntu Logo */
}
@@ -592,11 +598,11 @@
}
.teams-legend {
- width:50%;
+ width:200px;
padding:5px 0;
- margin:5px 25% 0;
- float:left;
- text-align:center;
+ margin:5px 0 0;
+ float:right;
+ text-align:right;
background-color:#F7F7F7;
box-shadow:0 1px 1px #DFDFDF;
border-radius:8px;
=== modified file 'loco_directory/templates/teams/team_list.html'
--- loco_directory/templates/teams/team_list.html 2011-10-05 00:50:53 +0000
+++ loco_directory/templates/teams/team_list.html 2011-11-03 18:14:23 +0000
@@ -14,8 +14,8 @@
<article class="teams-legend">
<ul>
- <li class="approved col_left">{% trans "Approved Teams" %}</li>
- <li class="unapproved col_right">{% trans "Unapproved Teams" %}</li>
+ <li class="approved float_list">{% trans "Approved Teams" %}</li>
+ <li class="unapproved float_list">{% trans "Unapproved Teams" %}</li>
</ul>
</article>
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
