custom 'parabola' theme with slim header

8 files changed, 60 insertions, 6 deletions

diff --git a/.gitignore b/.gitignore
index f6bf15790..6abb4b97a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@
 /public/themes/*
 !/public/themes/alternate
 !/public/themes/classic
+!/public/themes/parabola
 !/public/themes/README
 /tmp/*
 /tmp/cache/*
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 792af987c..4aedcadf0 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -546,7 +546,7 @@ module ApplicationHelper
 
   def page_header_title
     if @project.nil? || @project.new_record?
-      h(Setting.app_title)
+      content_tag(:span, h(Setting.app_title), class: 'current-project')
     else
       b = []
       ancestors = (@project.root? ? [] : @project.ancestors.visible.to_a)
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index 3fba9b9ee..50e2c9d26 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -68,8 +68,11 @@
     <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>
 </div>
 
+<% if display_main_menu?(@project) %>
 <div id="header">
-
+<% else %>
+<div id="header" class="header-no-menu">
+<% end %>
     <a href="#" class="mobile-toggle-button js-flyout-menu-toggle-button"></a>
 
     <% if User.current.logged? || !Setting.login_required? %>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index ba0924a7c..5e274f626 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -1,5 +1,3 @@
-<h2><%= l(:label_home) %></h2>
-
 <div class="splitcontentleft">
   <div class="wiki">
     <%= textilizable Setting.welcome_text %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index df57a57f3..06d1d6d32 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -601,8 +601,8 @@ en:
   label_login_with_open_id_option: or login with OpenID
   label_password_lost: Lost password
   label_password_required: Confirm your password to continue
-  label_home: Home
-  label_my_page: My page
+  label_home: Tracker Home
+  label_my_page: My Issues
   label_my_account: My account
   label_my_projects: My projects
   label_administration: Administration
diff --git a/public/themes/parabola/images/home.png b/public/themes/parabola/images/home.png
new file mode 100644
index 000000000..fed62219f
--- /dev/null
+++ b/public/themes/parabola/images/home.png
diff --git a/public/themes/parabola/images/wrench.png b/public/themes/parabola/images/wrench.png
new file mode 100644
index 000000000..5c8213fef
--- /dev/null
+++ b/public/themes/parabola/images/wrench.png
diff --git a/public/themes/parabola/stylesheets/application.css b/public/themes/parabola/stylesheets/application.css
new file mode 100644
index 000000000..41c7d02f0
--- /dev/null
+++ b/public/themes/parabola/stylesheets/application.css
@@ -0,0 +1,52 @@
+@import url(../../../stylesheets/application.css);
+
+body{ color:#303030; background:#e8eaec; }
+
+#top-menu { font-size: 80%; height: 2em; padding-top: 0.5em; background-color: #578bb8; }
+#top-menu a { font-weight: bold; }
+#header { background: #467aa7; min-height:4.5em; padding: 4px 6px 0px 6px; }
+#header.header-no-menu { min-height:2.5em; }
+#header h1 { margin-left: 6px; }
+#header h1 span.current-project { top: -3px ; position: relative ; }
+#quick-search { margin-right: 6px; }
+#main-menu { background-color: #578bb8; left: 0; border-top: 1px solid #fff; width: 100%; }
+#main-menu li { margin: 0; padding: 0; }
+#main-menu li a { background-color: #578bb8; border-right: 1px solid #fff; font-size: 90%; padding: 4px 8px 4px 8px; font-weight: bold; }
+#main-menu li a:hover { background-color: #80b0da; color: #ffffff; }
+#main-menu li a.selected, #main-menu li a.selected:hover { background-color: #80b0da; color: #ffffff; }
+#main-menu li a.new-object { background-color:#80b0da; }
+
+#main-menu .menu-children {
+  border-right: 1px solid #80b0da;
+  border-bottom: 1px solid #80b0da;
+  border-left: 1px solid #80b0da;
+}
+#main-menu .menu-children li a { border-right: none; }
+#main-menu .menu-children li a:hover { background-color: #80b0da }
+
+#footer { background-color: #578bb8; border: 0; color: #fff;}
+#footer a { color: #fff; font-weight: bold; }
+
+#main { font:90% Verdana,Tahoma,Arial,sans-serif; background: #e8eaec; }
+#main a { font-weight: bold; color: #467aa7;}
+#main a:hover { color: #2a5a8a; text-decoration: underline; }
+#content { background: #fff; }
+#content .tabs ul { bottom:-1px; }
+
+h2, h3, h4, .wiki h1, .wiki h2, .wiki h3 { border-bottom: 0px; color:#606060; font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
+h2, .wiki h1 { letter-spacing:-1px; }
+h4 { border-bottom: dotted 1px #c0c0c0; }
+
+#top-menu a.home, #top-menu a.my-page, #top-menu a.projects, #top-menu a.administration, #top-menu a.help { 
+    background-position: 0% 40%;
+    background-repeat: no-repeat;
+    padding-left: 20px;
+    padding-top: 2px;
+    padding-bottom: 3px;
+}
+
+#top-menu a.home { background-image: url(../images/home.png); }
+#top-menu a.my-page { background-image: url(../../../images/user.png); }
+#top-menu a.projects { background-image: url(../../../images/projects.png); }
+#top-menu a.administration { background-image: url(../images/wrench.png); }
+#top-menu a.help { background-image: url(../../../images/help.png); }