From e350f7bb04db5b16e6b2a163c72f3134fa98744a Mon Sep 17 00:00:00 2001
From: Lisa P <mail@lislis.de>
Date: Mon, 28 Sep 2015 14:41:09 +0200
Subject: [PATCH] fix dashboard avatars and filter padding

---
 app/styles/app.scss                      | 1 -
 app/styles/app/layouts/branches.sass     | 2 ++
 app/styles/app/layouts/dashboard.sass    | 5 +++++
 app/styles/app/modules/section.sass      | 8 --------
 app/templates/components/orgs-filter.hbs | 6 +++---
 app/templates/dashboard/repositories.hbs | 2 +-
 6 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 app/styles/app/modules/section.sass

diff --git a/app/styles/app.scss b/app/styles/app.scss
index 091b7cb0..24bfdfbc 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -24,7 +24,6 @@
 
 @import "app/animation/tractor";
 
-@import "app/modules/section";
 @import "app/modules/loader";
 @import "app/modules/tiles";
 @import "app/modules/buttons";
diff --git a/app/styles/app/layouts/branches.sass b/app/styles/app/layouts/branches.sass
index 083247f8..f4176a1b 100644
--- a/app/styles/app/layouts/branches.sass
+++ b/app/styles/app/layouts/branches.sass
@@ -168,6 +168,7 @@
     padding: 0.3em 0.5em
     color: $white
     text-decoration: none
+    line-height: 1
   .icon-trigger path,
   .icon-eye path
     fill: $white
@@ -192,6 +193,7 @@
       padding: 0.3em .5em 0.4em
       text-decoration: none
       color: $grey-dark
+      line-height: 1.4
       &:hover
         color: $white
         background-color: $teal-dark
diff --git a/app/styles/app/layouts/dashboard.sass b/app/styles/app/layouts/dashboard.sass
index a3e7cd47..4312e700 100644
--- a/app/styles/app/layouts/dashboard.sass
+++ b/app/styles/app/layouts/dashboard.sass
@@ -22,6 +22,11 @@
     margin: auto
     max-width: 1024px
 
+.dashboard-filter
+  padding: 0 $column-gutter/2
+  @media #{$medium-up}
+    padding: 0
+
 .dashboard-active
   padding: 0
   margin: 3rem 0 5rem
diff --git a/app/styles/app/modules/section.sass b/app/styles/app/modules/section.sass
deleted file mode 100644
index 4bdd6285..00000000
--- a/app/styles/app/modules/section.sass
+++ /dev/null
@@ -1,8 +0,0 @@
-.section
-  font-size: $font-size-normal
-
-.section--white
-  background-color: $white
-
-.section--maxheight
-  height: 3.3em
diff --git a/app/templates/components/orgs-filter.hbs b/app/templates/components/orgs-filter.hbs
index a01e4c71..41072c7c 100644
--- a/app/templates/components/orgs-filter.hbs
+++ b/app/templates/components/orgs-filter.hbs
@@ -5,7 +5,7 @@
     {{else}}
       <a href="" title="">
         {{#if selected }}
-          <img src="https://placehold.it/30x30" alt="">
+          <img src="{{selected.avatar_url}}" alt="{{org.login}}">
           {{#if selected.name}}
             {{selected.name}}
           {{else}}
@@ -19,11 +19,11 @@
   </div>
   <ul class="filter-dropdown">
     {{#if selected }}
-      <li><a href="#" title="" {{action 'select'}}>All organizations</a></li>
+      <li><a title="" {{action 'select'}}>All organizations</a></li>
     {{/if}}
     {{#each org in orgs}}
       <li>
-        <a href="#" title="" {{action 'select' org}}><img src="https://placehold.it/30x30" alt="">
+        <a title="" {{action 'select' org}}><img src="{{org.avatar_url}}" alt="">
           {{#if org.name }}
             {{org.name}}
           {{else}}
diff --git a/app/templates/dashboard/repositories.hbs b/app/templates/dashboard/repositories.hbs
index 622738dc..24f7008a 100644
--- a/app/templates/dashboard/repositories.hbs
+++ b/app/templates/dashboard/repositories.hbs
@@ -1,4 +1,4 @@
-<div id="filters" class="section section--white section--maxheight">
+<div id="filters" class="dashboard-filter">
   <div class="row">
       {{orgs-filter orgs=orgs selected=selectedOrg action="selectOrg"}}
     <div class="float-right">