Skip to content

Commit

Permalink
Merge pull request #68 from colab/colab-vcard
Browse files Browse the repository at this point in the history
Renamed vcard to colab-vcard
  • Loading branch information
Lucas Kanashiro committed Sep 7, 2015
2 parents 7daa556 + 9040187 commit ec15f50
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion colab/accounts/templates/accounts/user_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{% block main-content %}

<div id="user-profile" class="row">
<div class="vcard col-lg-4 col-md-4 col-sm-5">
<div class="colab-vcard col-lg-4 col-md-4 col-sm-5">
<div class="thumbnail">
{% gravatar user_.email 200 %}
</div>
Expand Down
16 changes: 8 additions & 8 deletions colab/static/css/screen.css
Original file line number Diff line number Diff line change
Expand Up @@ -135,25 +135,25 @@ div.submit {

/* User profile */

.vcard {
.colab-vcard {
min-height: 400px;
}

.vcard .thumbnail {
.colab-vcard .thumbnail {
width: 200px;
height: 200px;
}

.vcard h1 {
.colab-vcard h1 {
margin: 0;
padding: 0;
font-size: 26px;
line-height: 33px;
letter-spacing: -1px;
}

.vcard h1 span,
.vcard h1 em {
.colab-vcard h1 span,
.colab-vcard h1 em {
display: inline-block;
overflow-x: hidden;
text-overflow: ellipsis;
Expand All @@ -162,14 +162,14 @@ div.submit {
vertical-align: bottom;
}

.vcard h1 em {
.colab-vcard h1 em {
font-weight: 300;
font-size: 20px;
font-size: 20px;
letter-spacing: 1px;
}

.vcard .divider {
.colab-vcard .divider {
border-bottom: 1px solid #EEE;
margin-top: 10px;
}
Expand Down Expand Up @@ -303,7 +303,7 @@ span.highlighted {
}

/* Subscribe list */
.vcard .label {
.colab-vcard .label {
line-height: 2;
}

Expand Down

0 comments on commit ec15f50

Please sign in to comment.