diff options
| -rw-r--r-- | docs/git.rst | 4 | ||||
| -rw-r--r-- | mediagoblin/static/css/base.css | 34 | ||||
| -rw-r--r-- | mediagoblin/static/images/background.png | bin | 0 -> 6336 bytes | |||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 48 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/user.html | 28 |
5 files changed, 62 insertions, 52 deletions
diff --git a/docs/git.rst b/docs/git.rst index 73e7a311..bd0f9d52 100644 --- a/docs/git.rst +++ b/docs/git.rst @@ -63,6 +63,10 @@ Further, if you isolate your changes to a branch, then you can work on multiple issues at the same time and they don't conflict with one another. +Name your branches using the isue number and something that makes it clear +what it's about. For example, if you were working on tagging, you +might name your branch ``360_tagging``. + Properly document your changes ------------------------------ diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 31b8ebc2..2d099526 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -1,10 +1,12 @@ body { - background-color: #1F1F1F; - color: #aaa; + background-color: #111; + background-image:url("../images/background.png"); + color: #999; font-family: sans-serif; padding:none; margin:0px; height:100%; + font: 16px "HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,sans-serif; } form { @@ -18,23 +20,31 @@ form { font-family: 'Carter One'; font-style: normal; font-weight: normal; - src: local('CarterOne'), url('http://themes.googleusercontent.com/font?kit=FWNn6ITYqL6or7ZTmBxRhq3fkYX5z1QtDUdIWoaaD_k') format('woff'); + src: local('CarterOne'), url('http://themes.googleusercontent.com/font?kit=VjW2qt1pkqVtO22ObxgEBRsxEYwM7FgeyaSgU71cLG0') format('woff'); } /* text styles */ h1{ - font-family: 'Carter One', arial, serif; + font-family:'Carter One',arial,serif; margin-bottom: 15px; margin-top:15px; + color:#fff; + font-size: 30px; } h2{ margin-top:20px; + color:#fff; +} + +h3{ + border-bottom:1px solid #222; + font-size:18px; } a { - color: #fff; + color: #999; } label { @@ -49,11 +59,10 @@ label { } .mediagoblin_header { - width:100%; height:36px; - background-color:#2F2F2F; padding-top:14px; - margin-bottom:40px; + margin-bottom:20px; + border-bottom:1px solid #222222; } .header_submit{ @@ -75,12 +84,10 @@ label { } .mediagoblin_footer { - width:100%; height:30px; - background-color:#2F2F2F; + border-top:1px solid #222222; bottom:0px; padding-top:8px; - position:absolute; text-align:center; font-size:14px; color:#999; @@ -129,7 +136,7 @@ text-align:center; /* forms */ .form_box { - background-color:#393939; + background-color:#222; background-image:url("../images/background_lines.png"); background-repeat:repeat-x; font-size:18px; @@ -181,6 +188,7 @@ text-align:center; .comment_author { margin-bottom:40px; padding-top:4px; + font-size:14px; } .comment_content p { @@ -213,7 +221,7 @@ img.media_icon{ display:block; float:left; text-align:center; - background-color:#393939; + background-color:#222; text-decoration:none; padding:12px 0pt; font-family:'Carter One', arial, serif; diff --git a/mediagoblin/static/images/background.png b/mediagoblin/static/images/background.png Binary files differnew file mode 100644 index 00000000..aa101308 --- /dev/null +++ b/mediagoblin/static/images/background.png diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 40bb085e..b38ad674 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -14,9 +14,11 @@ # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -#} +-#} +<!doctype html> <html> <head> + <meta charset="utf-8"> <title>{% block title %}GNU MediaGoblin{% endblock title %}</title> <link rel="stylesheet" type="text/css" href="{{ request.staticdirect('/css/contrib/reset.css') }}"/> @@ -34,27 +36,25 @@ {% block mediagoblin_body %} <div class="mediagoblin_body"> {% block mediagoblin_header %} - <div class="mediagoblin_header"> - <div class="container_16"> - <div class="grid_16"> - {% block mediagoblin_logo %} - <a class="mediagoblin_logo" href="{{ request.urlgen('index') }}"><img src="{{ request.staticdirect('/images/logo.png') }}" alt="Mediagoblin logo" /></a> - {% endblock %} + <div class="container_16"> + <div class="grid_16 mediagoblin_header"> + {% block mediagoblin_logo %} + <a class="mediagoblin_logo" href="{{ request.urlgen('index') }}"><img src="{{ request.staticdirect('/images/logo.png') }}" alt="Mediagoblin logo" /></a> + {% endblock %} + {% if request.user %} + <a class="header_submit" href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit media</a> + {% endif %} + {% block mediagoblin_header_title %}{% endblock %} + <div class="mediagoblin_header_right"> {% if request.user %} - <a class="header_submit" href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit media</a> + <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', + user= request.user['username']) }}"> + {{ request.user['username'] }}</a>'s account + (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>) + {% else %} + <a href="{{ request.urlgen('mediagoblin.auth.login') }}"> + Login</a> {% endif %} - {% block mediagoblin_header_title %}{% endblock %} - <div class="mediagoblin_header_right"> - {% if request.user %} - <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', - user= request.user['username']) }}"> - {{ request.user['username'] }}</a>'s account - (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>) - {% else %} - <a href="{{ request.urlgen('mediagoblin.auth.login') }}"> - Login</a> - {% endif %} - </div> </div> </div> </div> @@ -67,11 +67,9 @@ </div> </div> {% block mediagoblin_footer %} - <div class="mediagoblin_footer"> - <div class="container_16"> - <div class="grid_16"> - Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU project</a> - </div> + <div class="container_16"> + <div class="grid_16 mediagoblin_footer"> + Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU project</a> </div> </div> {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index 9d99ac53..7ab2031e 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -26,25 +26,25 @@ {% block mediagoblin_content -%} {% if user %} - <h1>{{ user.username }}'s profile</h1> - <div class="grid_6 alpha"> - {% include "mediagoblin/utils/profile.html" %} - {% if request.user['_id'] == user['_id'] or request.user['is_admin'] %} + <h1>{{ user.username }}'s profile</h1> + <div class="grid_6 alpha"> + {% include "mediagoblin/utils/profile.html" %} + {% if request.user['_id'] == user['_id'] or request.user['is_admin'] %} <a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{ user.username }}">Edit profile</a> - {% endif %} - </div> - <div class="grid_10 omega"> - {% set pagination_base_url = user_gallery_url %} - {% include "mediagoblin/utils/object_gallery.html" %} - <div class="clear"></div> - <p><a href="{{ user_gallery_url }}">View all of {{ user.username }}'s media</a></p> + {% endif %} + </div> + <div class="grid_10 omega"> + {% set pagination_base_url = user_gallery_url %} + {% include "mediagoblin/utils/object_gallery.html" %} + <p><a href="{{ user_gallery_url }}">View all of {{ user.username }}'s media</a></p> <a href={{ request.urlgen( 'mediagoblin.user_pages.atom_feed', user=user.username) }}>atom feed</a> - {% else %} - {# This *should* not occur as the view makes sure we pass in a user. #} - <p>Sorry, no such user found.<p/> </div> + <div class="clear"></div> + {% else %} + {# This *should* not occur as the view makes sure we pass in a user. #} + <p>Sorry, no such user found.<p/> {% endif %} {% endblock %} |
