From 5f95ef7e56ea93fb248c192c9ca84091b32fff36 Mon Sep 17 00:00:00 2001
From: Matchu <matchu1993@gmail.com>
Date: Thu, 26 Dec 2013 13:08:51 -0500
Subject: [PATCH] make userbar area more compact, including removing favicon

---
 app/assets/stylesheets/_layout.sass                   | 9 +++++++--
 app/assets/stylesheets/partials/clean/_constants.sass | 2 +-
 app/helpers/application_helper.rb                     | 4 ----
 app/views/layouts/application.html.haml               | 1 -
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/_layout.sass b/app/assets/stylesheets/_layout.sass
index 33262088..9c312a43 100644
--- a/app/assets/stylesheets/_layout.sass
+++ b/app/assets/stylesheets/_layout.sass
@@ -71,7 +71,7 @@ h3
 $container_width: 800px
 
 #container
-  margin: 1em auto
+  margin: .25em auto
   padding-top: $container-top-padding
   position: relative
   width: $container_width
@@ -218,7 +218,8 @@ dd
     weight: bold
   left: 0
   line-height: 1
-  padding: .25em
+  padding-left: .25em
+  padding-right: .25em
   position: absolute
   top: 0
   &:hover
@@ -227,6 +228,10 @@ dd
   span:before
     content: "<< "
 
+#home-link, #userbar
+  padding-top: 6px
+  padding-bottom: 6px
+
 .pagination
   a, span
     margin: 0 .5em
diff --git a/app/assets/stylesheets/partials/clean/_constants.sass b/app/assets/stylesheets/partials/clean/_constants.sass
index f0595da9..f2cd567a 100644
--- a/app/assets/stylesheets/partials/clean/_constants.sass
+++ b/app/assets/stylesheets/partials/clean/_constants.sass
@@ -27,5 +27,5 @@ $object-width:     100px
 $object-padding:   8px
 $nc-icon-size:     16px
 
-$container-top-padding: 3em
+$container-top-padding: 2.5em
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index da969f84..e427f9eb 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -14,10 +14,6 @@ module ApplicationHelper
     @body_class << " #{class_name}"
   end
 
-  def auth_server_icon_url
-    "http://#{Openneo::Auth.config.auth_server}/favicon.png"
-  end
-
   def body_class
     "#{params[:controller]} #{params[:controller]}-#{params[:action]}".tap do |output|
       output << @body_class if @body_class
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index b860dbce..823e2e86 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -49,7 +49,6 @@
           = link_to t('.userbar.logout'), logout_path_with_return_to
         - else
           = link_to login_path_with_return_to, :id => 'userbar-log-in' do
-            = image_tag auth_server_icon_url
             %span= t('.userbar.login')
 
       #footer