Skip to content

Commit

Permalink
[#354] Updated left side bar class and all relevant pages
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnmartin
johnmartin committed Feb 5, 2013
1 parent 690bbb0 commit f209fd3
Show file tree
Hide file tree
Showing 7 changed files with 89 additions and 91 deletions.
79 changes: 79 additions & 0 deletions ckan/public/base/less/layout.less
View file
Expand Up @@ -155,3 +155,82 @@
.hero .tags .tag {
margin-right: 15px;
}

.context-info {
.module-content {
padding: 15px;
}
.image {
img,
a {
display: block;
.border-radius(4px);
}
}
p {
overflow: auto;
}
code {
display: block;
font-weight: normal;
padding: 0;
margin: 0;
overflow: auto;
}
h1.heading {
margin: 10px 0 5px 0;
font-size: 18px;
line-height: 1.3;
}
.info {
margin-top: 15px;
padding-top: 10px;
border-top: 1px dotted #DDD;
dl dd {
margin-top: 3px;
margin-left: 0;
}
}
.nums {
.clearfix;
margin-top: 15px;
padding-top: 10px;
padding-bottom: 0;
border-top: 1px dotted #DDD;
dl {
float: left;
width: 33%;
margin: 5px 0 0 0;
color: @layoutTextColor;
dt {
display: block;
font-size: 13px;
font-weight: 300;
}
dd {
display: block;
font-size: 30px;
font-weight: 700;
line-height: 36px;
margin-left: 0;
.smallest {
font-size: 13px;
}
.smaller {
font-size: 16px;
}
.small {
font-size: 21px;
}
}
}
}
&.editing {
.module-heading {

}
.module-content {
margin-top: 0;
}
}
}
81 changes: 0 additions & 81 deletions ckan/public/base/less/profile.less
View file
Expand Up @@ -11,84 +11,3 @@
margin-bottom: 20px;
}
}

.profile-info {
.module-content {
padding: 15px;
}
.avatar {
border: 1px solid #DDD;
padding: 5px;
.border-radius(2px);
img,
a {
display: block;
}
}
p {
overflow: auto;
}
code {
display: block;
font-weight: normal;
padding: 0;
margin: 0;
overflow: auto;
}
h1.heading {
margin: 10px 0 5px 0;
font-size: 18px;
line-height: 1.3;
}
.info {
margin-top: 15px;
padding-top: 10px;
border-top: 1px dotted #DDD;
dl dd {
margin-top: 3px;
margin-left: 0;
}
}
.nums {
.clearfix;
margin-top: 15px;
padding-top: 10px;
padding-bottom: 0;
border-top: 1px dotted #DDD;
dl {
float: left;
width: 33%;
margin: 5px 0 0 0;
color: @layoutTextColor;
dt {
display: block;
font-size: 13px;
font-weight: 300;
}
dd {
display: block;
font-size: 30px;
font-weight: 700;
line-height: 36px;
margin-left: 0;
.smallest {
font-size: 13px;
}
.smaller {
font-size: 16px;
}
.small {
font-size: 21px;
}
}
}
}
&.editing {
.module-heading {

}
.module-content {
margin-top: 0;
}
}
}
6 changes: 3 additions & 3 deletions ckan/templates/group/read_base.html
View file
Expand Up @@ -45,11 +45,11 @@
{% endblock %}

{% block secondary_content %}
<div class="module profile-info">
<div class="module context-info">
<section class="module-content">
<div class="avatar">
<div class="image">
<a href="{{ c.group_dict.url }}">
<img src="{{ c.group_dict.image_url or h.url_for_static('/base/images/placeholder-group.png') }}" width="200" height="125" alt="{{ c.group_dict.name }}" />
<img src="{{ c.group_dict.image_url or h.url_for_static('/base/images/placeholder-group.png') }}" width="190" height="118" alt="{{ c.group_dict.name }}" />
</a>
</div>
<h1 class="heading">{{ c.group_dict.display_name }}</h1>
Expand Down
4 changes: 2 additions & 2 deletions ckan/templates/snippets/organization.html
View file
Expand Up @@ -12,9 +12,9 @@
#}

{% with truncate=truncate or 0, url=h.url_for(controller='organization', action='read', id=organization.name) %}
<div class="module profile-info">
<div class="module context-info">
<section class="module-content">
<div class="avatar">
<div class="image">
<a href="{{ url }}">
<img src="{{ organization.image_url or h.url_for_static('/base/images/placeholder-organization.png') }}" width="200" alt="{{ organization.name }}" />
</a>
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/user/edit.html
View file
Expand Up @@ -3,7 +3,7 @@
{% set user = c.userobj %}

{% block breadcrumb_content %}
<li>{% link_for _('User'), controller='user', action='index' %}</li>
<li>{% link_for _('Users'), controller='user', action='index' %}</li>
<li>{% link_for user.display_name|truncate(35), controller='user', action='read', id=user.name %}</li>
<li class="active">{% link_for _('Edit'), controller='user', action='edit', id=user.name %}</li>
{% endblock %}
Expand Down
6 changes: 3 additions & 3 deletions ckan/templates/user/read_base.html
View file
Expand Up @@ -11,7 +11,7 @@

{% block actions_content %}
{% if h.check_access('user_update', user) %}
<li>{% link_for _('Edit'), controller='user', action='edit', id=user.name, class_='btn', icon='wrench' %}</li>
<li>{% link_for _('Edit'), controller='user', action='edit', id=user.name, class_='btn btn-primary', icon='wrench' %}</li>
{% endif %}
{% if c.is_myself == false %}
<li>{{ h.follow_button('user', user.id) }}</li>
Expand All @@ -33,10 +33,10 @@
{% endblock %}

{% block secondary_content %}
<div class="module profile-info">
<div class="module context-info">
<section class="module-content">
{% block secondary_content_inner %}
<div class="avatar">{{ h.linked_gravatar(user.email_hash, 180) }}</div>
<div class="image">{{ h.linked_gravatar(user.email_hash, 190) }}</div>
<h1 class="heading">{{ user.fullname or _('No full name provided') }}</h1>
{% if c.about_formatted %}
{{ c.about_formatted }}
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/user/snippets/back_to_user_action.html
View file
@@ -1 +1 @@
<li>{% link_for _('Back to profile'), controller='user', action='read', id=user.name, class_='btn', icon='caret-left' %}</li>
<li>{% link_for _('View my profile'), controller='user', action='read', id=user.name, class_='btn', icon='eye-open' %}</li>

0 comments on commit f209fd3

Please sign in to comment.