Permalink
Browse files

Merge branch 'master' of github.com:openclipart/openclipart

  • Loading branch information...
vicapow committed Mar 13, 2013
2 parents d9e433f + 3edf5e6 commit 387e883970d1487b6eff76a972f212102cf373b3
Showing with 18 additions and 3 deletions.
  1. +4 −1 styles/thumbnail.less
  2. +1 −1 templates/profile/edit.template
  3. +13 −1 templates/profile/show.template
View
@@ -27,6 +27,9 @@ a.thumbnail {
border: none;
box-shadow: none;
text-decoration: none;
+ h5 {
+ color: #333;
+ }
}
h5 {
font-size: 14px;
@@ -38,4 +41,4 @@ a.thumbnail {
font-family: "AsapBold";
}
}
-}
+}
@@ -55,8 +55,8 @@
</div>
<div class="control-group">
<div class="controls">
- <button type="submit" class="btn btn-primary">Update</button>
<a href="{{back}}" class="btn"> Cancel </a>
+ <button type="submit" class="btn btn-ocal btn-danger">Update</button>
</div>
</div>
</form>
@@ -1,28 +1,39 @@
{% extends 'main.template' %}
{% block content %}
<div class="row">
- <div class="span6">
+
+ <div class="span12">
<h3>
{{profile.username}}
<span class="vote-star achievements">
<a href="#" class="active">{{favorites}}</a>
</span>
</h3>
+ </div>
+
+ <div class="span2">
{% if profile.avatar != 0 %}
<img class="media-object" src="/avatars/{{profile.id}}.png?clipart={{profile.avatar}}">
{% else %}
<img class="media-object" src="/img/avatar-default.png">
{% endif %}
+ </div>
+
+ <div class="span4">
<div class="user-details">
<div>{{profile.full_name}}</div>
<div>{{profile.about}}</div>
</div>
</div>
+
<div class="span6">
<div class="user-links">
<div><a target="_blank" href="{{profile.homepage}}">Homepage</a></div>
<div><a target="_blank" href="http://twitter.com/{{profile.twitter}}">twitter</a></div>
</div>
+ </div>
+
+ <div class="span12">
{% if is_owner %}
<div class="edit-menu pull-right">
<a href="/profile/{{profile.username}}/edit">edit your profile</a>
@@ -47,6 +58,7 @@
</div>
{% endif %}
</div>
+
</div>
<div class="row">
<div class="span6 section">

0 comments on commit 387e883

Please sign in to comment.