From 1eaab9146f0a9bcbf2641087d96ebc75d53bedee Mon Sep 17 00:00:00 2001
From: Christian Ratz <c.ratz@finn.de>
Date: Fri, 8 Nov 2013 14:08:55 +0100
Subject: [PATCH] Clean up CSS

- moved rules to top_menu file
- removed empty scss file
---
 app/assets/stylesheets/default.css            |  1 -
 app/assets/stylesheets/layout/header.css.scss | 60 -------------------
 .../stylesheets/layout/top_menu.css.sass      | 13 ++++
 3 files changed, 13 insertions(+), 61 deletions(-)
 delete mode 100644 app/assets/stylesheets/layout/header.css.scss

diff --git a/app/assets/stylesheets/default.css b/app/assets/stylesheets/default.css
index 4ca2c07ed1..d1b131f494 100644
--- a/app/assets/stylesheets/default.css
+++ b/app/assets/stylesheets/default.css
@@ -37,7 +37,6 @@ See doc/COPYRIGHT.rdoc for more details.
  *= require application
  *= require layout/base
  *= require layout/top_menu
- *= require layout/header
  *= require content/breadcrumb
  *= require content/main_menu
  *= require default/application
diff --git a/app/assets/stylesheets/layout/header.css.scss b/app/assets/stylesheets/layout/header.css.scss
deleted file mode 100644
index bf2f7cc6bf..0000000000
--- a/app/assets/stylesheets/layout/header.css.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-- copyright
- * OpenProject is a project management system.
- * Copyright (C) 2012-2013 the OpenProject Foundation (OPF)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 3.
- *
- * OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
- * Copyright (C) 2006-2013 Jean-Philippe Lang
- * Copyright (C) 2010-2013 the ChiliProject Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * See doc/COPYRIGHT.rdoc for more details.  ++*/
-
-
-.account-nav {
-  display: block;
-}
-
-#header {
-  height: 55px;
-  min-width: 1000px;
-}
-
-.account-nav li a {
-  display: block;
-  padding: 0px 9px 0px;
-}
-.account-nav li > ul > li {
-  max-width: 350px;
-}
-
-
-li a.home  {
-  background-image: url(image-path('home_black_white_sprite.png'));
-  background-position: center -43px;
-  width: 20px;
-}
-
-li a.home:hover  {
-  background-position: center -11px;
-}
-
-
-#header .chzn-container .chzn-results .highlighted {
-  background-color:  #24b3e7;
-}
diff --git a/app/assets/stylesheets/layout/top_menu.css.sass b/app/assets/stylesheets/layout/top_menu.css.sass
index 59a48617d6..93a58262e2 100644
--- a/app/assets/stylesheets/layout/top_menu.css.sass
+++ b/app/assets/stylesheets/layout/top_menu.css.sass
@@ -236,4 +236,17 @@
   font-family: 'LatoBold', 'Lucida Grande', Helvetica, Arial, sans-serif !important
   font-weight: normal !important
 
+#header
+  height: 55px
+  min-width: 1100px
+  .chzn-container .chzn-results .highlighted
+    background-color:  #24b3e7
 
+.account-nav
+  display: block
+  li
+    a
+      display: block
+      padding: 0px 9px 0px
+    > ul > li
+      max-width: 350px