Cyallop/fix activity feed styling

.gitignore

@@ -43,3 +43,7 @@ docs/_build/
 
 # Saas cache
 **/.sass-cache
+
+# Vi autobackup 
+*.swp
+

ckan_default_templates/user/snippets/followee_dropdown.html

@@ -10,7 +10,7 @@
   {% endif %}
 {%- endmacro %}
 
-<div id="followee-filter" class="pull-right">
+<div id="followee-filter">
   <a href="#followee-popover" class="btn" title="{{ _('Activity from:') }} {{ context.context }}">
     <span>{{ _('Activity from:') }}</span>
     <strong>{{ context.context }}</strong>

ckanext/open_alberta/fanstatic/css/ab-opengov.css

@@ -11,7 +11,8 @@
   font-size: 1.6em;
   /* Bootstrap burgerizes the menu at 768px - move that to 40em as we can't customize BS itself */
   /* Helpers */
-  /* tempoary fix for styling issues caused by alberta.ca css changes */ }
+  /* tempoary fix for styling issues caused by alberta.ca css changes */
+  /* make bootstrap selected-item style not be overridden by alberta.ca default link style causing blue-on-blue invisible text on dashboard news feed filter */ }
   #alberta-ca.IDDP .system-notice {
     padding: 15px;
     background: #c0d4e8;
@@ -649,3 +650,11 @@
       list-style: none;
       display: inline-block;
       margin-right: 5px; }
+  #alberta-ca.IDDP .nav-pills > li.active > a, #alberta-ca.IDDP .nav-pills > li.active > a:focus, #alberta-ca.IDDP .nav-pills > li.active > a:hover {
+    color: #fff; }
+  #alberta-ca.IDDP .dashboard-page-heading {
+    margin-top: 0; }
+  #alberta-ca.IDDP .dashboard-activity-column {
+    padding-right: 5px; }
+    #alberta-ca.IDDP .dashboard-activity-column ul.activity {
+      list-style: none; }

ckanext/open_alberta/sass/ab-opengov.scss

@@ -1020,4 +1020,21 @@ $active-bg-color: #005072;
             margin-right: 5px;
         }
     }
+
+    /* make bootstrap selected-item style not be overridden by alberta.ca default link style causing blue-on-blue invisible text on dashboard news feed filter */
+    .nav-pills>li.active>a, .nav-pills>li.active>a:focus, .nav-pills>li.active>a:hover {
+        color: #fff;
+    }
+
+    .dashboard-page-heading {
+        margin-top: 0;
+    }
+
+    .dashboard-activity-column {
+        padding-right: 5px;
+
+        ul.activity {
+            list-style: none;
+        }
+    }
 }

ckanext/open_alberta/templates/user/dashboard.html

@@ -0,0 +1,24 @@
+{% ckan_extends %}
+
+{% block primary_content_inner %}
+  <div data-module="dashboard">
+    <table>
+      <tr>
+        <td class="dashboard-activity-column">
+          <h2 class="page-heading dashboard-page-heading">
+            {% block page_heading %}
+              {{ _('News feed') }}
+            {% endblock %}
+            <small>{{ _("Activity from items that I'm following") }}</small>
+          </h2>
+          {% block activity_stream %}
+            {{ c.dashboard_activity_stream }}
+          {% endblock %}
+        </td>
+        <td>
+          {% snippet 'user/snippets/followee_dropdown.html', context=c.dashboard_activity_stream_context, followees=c.followee_list %}
+        </td>
+      </tr>
+    </table>
+  </div>
+{% endblock %}