Paul Tagliamonte has proposed merging
lp:~paultag/loco-directory/css-and-html-fixes into lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
css / html changes
--
https://code.launchpad.net/~paultag/loco-directory/css-and-html-fixes/+merge/36520
Your team loco-directory-dev is requested to review the proposed merge of
lp:~paultag/loco-directory/css-and-html-fixes into lp:loco-directory.
=== modified file 'loco_directory/media/css/continents.css'
--- loco_directory/media/css/continents.css 2010-09-15 19:41:26 +0000
+++ loco_directory/media/css/continents.css 2010-09-24 00:59:40 +0000
@@ -1,4 +1,12 @@
-/* Continents */
+/*
+ * continents.css
+ *
+ * CSS to support the world browser for all the LoCo teams,
+ * globally.
+ *
+ * Author: Michal Hall ( mhall119 )
+ */
+
ul#continents {
list-style: none;
background: url(../images/map.png) no-repeat 0px 0px;
=== modified file 'loco_directory/media/css/newstyle.css'
--- loco_directory/media/css/newstyle.css 2010-09-15 20:05:30 +0000
+++ loco_directory/media/css/newstyle.css 2010-09-24 00:59:40 +0000
@@ -1,3 +1,13 @@
+/*
+ * newstyle.css
+ *
+ * Base style for the LoCo Directory. This is an implementation
+ * of the ( at the time of this writing ) new Ubuntu branding.
+ *
+ * Author: Michal Hall ( mhall119 )
+ * Author: Paul Tagliamonte ( paultag )
+ */
+
#home {
font-family: UbuntuBeta, Helvetica, Arial, 'Liberation Sans', FreeSans, sans-serif;
}
@@ -5,16 +15,20 @@
a {
color: #DD4814;
}
+
a:visited {
color: #b12a10;
}
+
th.form-item-label {
vertical-align: top;
}
+
label {
font-weight: bold;
white-space: nowrap;
}
+
#venue-map-selector {
width: 400px;
height: 300px;
@@ -49,11 +63,11 @@
}
li.approved {
- list-style-image: url(../img/approved.png);
+ list-style-image: url(../img/approved.png); /* Colorful Ubuntu Logo */
}
li.unapproved {
- list-style-image: url(../img/unapproved.png);
+ list-style-image: url(../img/unapproved.png); /* Grey Ubuntu Logo */
}
br.clear {
@@ -197,7 +211,7 @@
-webkit-box-shadow: 0px 0px 1px #FFE4B6;
}
-/* UI Errors */
+/* UI Errors ( To yell at the user when they don't fill out a form ) */
ul.errorlist {
margin: 0px;
@@ -214,7 +228,7 @@
}
-/* Flickr Feed for Global Event*/
+/* Flickr Feed for Global Event */
.thumbs {
margin: 0px;
@@ -236,7 +250,6 @@
.thumbs li img { display: block; }
.thumbs li a img { border: none;}
-/* 960px header and footer */
header#page-header {
width: 960px;
margin: 0px auto;
=== modified file 'loco_directory/media/css/twidenash.css'
--- loco_directory/media/css/twidenash.css 2010-09-15 19:41:26 +0000
+++ loco_directory/media/css/twidenash.css 2010-09-24 00:59:40 +0000
@@ -1,14 +1,25 @@
+/*
+ * twidenash.css
+ *
+ * twidenash CSS stuff.
+ *
+ * Author: Michal Hall ( mhall119 )
+ */
+
+
ul.twidenash li {
list-style-type: none;
clear: both;
padding: 3px;
font-size: 100%;
}
+
ul.twidenash li img {
float: left;
vertical-align: top;
padding-right: 10px;
}
+
ul.twidenash li .comment {
margin-left: 5px;
display: block;
=== modified file 'loco_directory/templates/about_loco.html'
--- loco_directory/templates/about_loco.html 2010-08-20 09:58:11 +0000
+++ loco_directory/templates/about_loco.html 2010-09-24 00:59:40 +0000
@@ -15,8 +15,8 @@
<article class="main-content">
<h3>{% trans "Joining a LoCo Team" %}</h3>
<ul>
- <li>{% trans "Do you want to join a LoCo Team? It's easy! Just " %}<a title="{% trans "See All LoCo Teams" %}" href="{% url team-list %}">{% trans "find a team" %}</a> {% trans "in your area and click the 'Join This Team!' link at the top of their page." %}</ul>
- <li>{% trans "If you are not able to find a LoCo Team in your area and want to create one, take a look at the " %}<a href="https://wiki.ubuntu.com/LoCoTeamHowto"; title="{% trans "LoCo Team HowTo" %}">{% trans "LoCo Team HowTo" %}</a>{% trans " for more information on setting up a LoCo Team." %}</ul>
+ <li>{% trans "Do you want to join a LoCo Team? It's easy! Just " %}<a title="{% trans "See All LoCo Teams" %}" href="{% url team-list %}">{% trans "find a team" %}</a> {% trans "in your area and click the 'Join This Team!' link at the top of their page." %}</li>
+ <li>{% trans "If you are not able to find a LoCo Team in your area and want to create one, take a look at the " %}<a href="https://wiki.ubuntu.com/LoCoTeamHowto"; title="{% trans "LoCo Team HowTo" %}">{% trans "LoCo Team HowTo" %}</a>{% trans " for more information on setting up a LoCo Team." %}</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
