[#354] Lot's of tweaks from after #300 merge

ckan · Feb 19, 2013 · 0717982 · 0717982
1 parent 2bce23c
commit 0717982
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 27 deletions.
diff --git a/ckan/public/base/images/dashboard-followee-related.png b/ckan/public/base/images/dashboard-followee-related.png
diff --git a/ckan/public/base/less/dashboard.less b/ckan/public/base/less/dashboard.less
@@ -13,7 +13,7 @@
     strong {
       margin: 0 5px;
       white-space: nowrap;
-      max-width: 100px;
+      max-width: 90px;
       overflow: hidden;
       text-overflow: ellipsis;
     }
@@ -22,20 +22,19 @@
 
 .dashboard-context {
   position: relative;
-  margin: -20px -25px 20px -20px;
+  margin-bottom: 20px;
   padding: 20px;
-  border-left: 1px solid #DCDCDC;
   border-bottom: 1px solid #DCDCDC;
   background-color: @moduleHeadingBackgroundColor;
-  .border-radius(0 5px 0 0);
+  .border-radius(3px 0 0 0);
   h2 {
     margin-bottom: 10px;
   }
   .arrow {
     position: absolute;
     content: ' ';
-    top: 24px;
-    left: -10px;
+    top: 70px;
+    right: -10px;
     width: 10px;
     height: 21px;
     background: transparent url("@{imagePath}/dashboard-followee-related.png");
@@ -59,6 +58,9 @@
     padding: 5px;
     border-bottom: 1px solid @inputBorder;
     .border-radius(3px 3px 0 0);
+    .input-prepend {
+      margin-bottom: 0;
+    }
     .add-on,
     input {
       float: left;
@@ -72,7 +74,7 @@
     input {
       padding: 4px 12px 4px 8px;
       font-size: 13px;
-      width: 231px;
+      width: 208px;
       .border-radius(0 100px 100px 0);
     }
   }

diff --git a/ckan/public/base/less/footer.less b/ckan/public/base/less/footer.less
@@ -24,7 +24,7 @@
 
 .footer-links li {
   display: inline-block;
-  width: 40%;
+  width: 44%;
   margin-right: 5%;
   margin-bottom: 5px;
 }

diff --git a/ckan/public/base/less/layout.less b/ckan/public/base/less/layout.less
@@ -102,7 +102,7 @@
     border-top: 1px dotted #DDD;
     dl {
       float: left;
-      width: 33%;
+      width: 50%;
       margin: 5px 0 0 0;
       color: @layoutTextColor;
       dt {

diff --git a/ckan/templates/snippets/context.html b/ckan/templates/snippets/context.html
@@ -1,10 +1,10 @@
 {%if type == 'user' %}
-  <h2>{{ dict.name }}</h2>
+  <h4>{{ dict.name }}</h4>
   {% snippet 'snippets/context/user.html', id=dict.id, name=dict.name, about=dict.about, is_me='false', num_followers=dict.num_followers, number_administered_packages=dict.number_administered_packages, number_of_edits=dict.number_of_edits %}
 {%elif type == 'dataset' %}
-  <h2>{{ dict.title }}</h2>
+  <h4>{{ dict.title }}</h4>
   {% snippet 'snippets/context/dataset.html', id=dict.id, name=dict.name, notes=dict.notes, num_resources=dict.num_resources, num_tags=dict.num_tags %}
 {%elif type == 'group' %}
-  <h2>{{ dict.title }}</h2>
+  <h4>{{ dict.title }}</h4>
   {% snippet 'snippets/context/group.html', id=dict.id, name=dict.name, description=dict.description, num_followers=dict.num_followers, package_count=dict.package_count %}
 {% endif %}
diff --git a/ckan/templates/snippets/context/dataset.html b/ckan/templates/snippets/context/dataset.html
@@ -7,10 +7,6 @@
   {% endif %}
   <div class="btn-group">
     {{ h.follow_button('dataset', id) }}
-    <a href="{{ h.url_for(controller='package', action='read', id=name) }}" class="btn">
-      <i class="icon-eye-open"></i>
-      View Dataset
-    </a>
   </div>
   <div class="nums">
     <dl>

diff --git a/ckan/templates/snippets/context/group.html b/ckan/templates/snippets/context/group.html
@@ -1,4 +1,4 @@
-<div class="popover-context profile-info">
+<div class="context-info">
   {% if description != 'null' %}
     {% set description = description|striptags %}
     <p class="about">
@@ -7,10 +7,6 @@
   {% endif %}
   <div class="btn-group">
     {{ h.follow_button('group', id) }}
-    <a href="{{ h.url_for(controller='group', action='read', id=name) }}" class="btn">
-      <i class="icon-eye-open"></i>
-      View Group
-    </a>
   </div>
   <div class="nums">
     <dl>

diff --git a/ckan/templates/snippets/context/user.html b/ckan/templates/snippets/context/user.html
@@ -1,4 +1,4 @@
-<div class="popover-context profile-info">
+<div class="context-info">
   {% if about != 'null' %}
     {% set about = about|striptags %}
     <p class="about">
@@ -9,10 +9,6 @@
     {% if is_me == 'false' %}
       {{ h.follow_button('user', id) }}
     {% endif %}
-    <a href="{{ h.url_for(controller='user', action='read', id=name) }}" class="btn">
-      <i class="icon-eye-open"></i>
-      View Profile
-    </a>
   </div>
   <div class="nums">
     <dl>

diff --git a/ckan/templates/user/dashboard.html b/ckan/templates/user/dashboard.html
@@ -19,7 +19,7 @@ <h2 class="page-heading">
 
 {% block secondary_content %}
   {% if not c.dashboard_activity_stream_context.dict == None %}
-    <div class="dashboard-aside-context">
+    <div class="context-info dashboard-context">
       <span class="arrow"></span>
       {% snippet 'snippets/context.html', type=c.dashboard_activity_stream_context.filter_type, dict=c.dashboard_activity_stream_context.dict %}
     </div>