Merge pull request coderwall#158 from seuros/menu

just3ws · just3ws · commit 485c67a29f24 · 2014-08-08T23:17:27.000-05:00
Style top menu
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -1,5 +1,5 @@
 @import "base";
-@import "compass/css3/";
+@import "compass/css3";
 @import "fonts";
 @import "normailze";
 @import "tipTip";
@@ -103,31 +103,23 @@ h4 {
 #nav {
   float: right;
   li {
-    float: left;
+    display: inline-block;
     line-height: 100px;
     margin-left: 30px;
     &:first-child {
       margin: 0px;
     }
   }
-  .new {
-    a:before {
-      content: "New";
-      padding: 3px 6px 2px 6px;
-      @include border-radius(4px);
-      background: $light-blue;
-      color: #fff;
-      margin-right: 10px;
-      font-size: 0.7em;
-      vertical-align: middle;
-      text-transform: uppercase;
-    }
+  i {
+    font-size: 1.4em;
+    color: $level2;
+    margin-right: 2px;
   }
   a {
     font-size: 1.4em;
     color: #fff;
     @include ts-top-black;
-    display: block;
+    display: inline;
     &:hover {
       color: $light-blue;
     }
@@ -137,6 +129,9 @@ h4 {
     &:hover {
       color: $light-grey;
     }
+    i {
+      color: $level1;
+    }
   }
 }
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -124,26 +124,6 @@ def connections_nav_class
     end
   end
 
-  def team_nav_class
-    if params[:controller] == "teams" && params[:action] != 'index'
-      if signed_in? && current_user.team_document_id == params[:id] || params[:id].blank?
-        'active'
-      else
-        nil
-      end
-    else
-      nil
-    end
-  end
-
-  def teams_nav_class
-    if params[:controller] == "teams" && params[:action] == 'index'
-      'active'
-    else
-      nil
-    end
-  end
-
   def jobs_nav_class
     if params[:controller] == "opportunities" && params[:action] == 'index'
       'active'
diff --git a/app/views/application/_navigation.slim b/app/views/application/_navigation.slim
@@ -0,0 +1,36 @@
+header#masthead
+  .inside-masthead.cf
+    .mobile-panel.cf
+      = link_to root_path, class: 'logo'
+        span coderwall
+      a.menu-btn
+
+    nav#nav
+      ul
+        li
+          i.fa.fa-graduation-cap
+          = link_to(t('protips'), root_path)
+        -if signed_in?
+          li
+            i.fa.fa-user
+            = link_to('Profile', badge_path(username: current_user.username), class: mywall_nav_class)
+
+        li
+          i.fa.fa-money
+          = link_to('Jobs', jobs_path, class: jobs_nav_class)
+        -if signed_in?
+          li
+            i.fa.fa-cogs
+            = link_to('Settings', settings_path, class: settings_nav_class)
+          li
+            i.fa.fa-sign-out
+            = link_to('Sign out', sign_out_path)
+        -else
+
+          li
+            i.fa.fa-sign-in
+            = link_to('Sign In', signin_path, class: signin_nav_class)
+          li
+            i.fa.fa-plus-square
+            = link_to('Sign Up', signin_path, class: signup_nav_class)
+
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -18,7 +18,7 @@
     = yield :head
 
   %body{ id: yield(:body_id) }
-    = render partial: 'layouts/navigation'
+    = render partial: 'navigation'
     #main-content
       - if main_content_wrapper(yield(:content_wrapper))
         - if flash[:notice] || flash[:error]
diff --git a/app/views/layouts/protip.html.haml b/app/views/layouts/protip.html.haml
@@ -10,27 +10,8 @@
     = yield :head
     = csrf_meta_tag
   %body.protip-single
-    = render partial: 'layouts/navigation'
+    = render partial: 'navigation'
 
-    .mobile-top
-      %a.new-logo{href: '/'}
-      %a.mobile-nav-btn#x-mobile-toggle
-
-      %nav.mobile-nav#x-mobile-menu
-        %ul
-          %li= link_to('Discover', root_path)
-          -if signed_in?
-            %li= link_to('Admin', admin_root_path) if is_admin?
-            %li= link_to('Profile', badge_path(username: current_user.username), class: mywall_nav_class)
-
-          %li= link_to('Teams', teams_path, class: teams_nav_class)
-          %li= link_to('Jobs', jobs_path, class: jobs_nav_class)
-          -if signed_in?
-            %li= link_to('Settings', settings_path, class: settings_nav_class)
-            %li= link_to('Sign out', sign_out_path)
-          -else
-            %li= link_to('Sign In', signin_path, class: signin_nav_class)
-            %li= link_to('Sign Up', signin_path, class: signup_nav_class)
     %canvas.blur{src: image_path(users_background_image)}
     =yield
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -2,4 +2,4 @@
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
-  hello: "Hello world"
+  protips: "Protips"
