Merge branch 'improve-ui' into 'master'

Improve ui

* Separate settings tab from others in project navigation
* Put webhooks and service navs together for consistency with GitLab

cc @vsizov

See merge request !54

1 files changed, 10 insertions, 8 deletions

diff --git a/app/views/layouts/_nav_project.html.haml b/app/views/layouts/_nav_project.html.haml
index 063f54e..4f3e3b3 100644
--- a/app/views/layouts/_nav_project.html.haml
+++ b/app/views/layouts/_nav_project.html.haml
@@ -8,10 +8,6 @@
     = link_to project_charts_path(@project) do
       %i.icon-bar-chart
       Charts
-  = nav_link path: 'web_hooks#index' do
-    = link_to project_web_hooks_path(@project) do
-      %i.icon-link
-      Web Hooks
   = nav_link path: 'runners#index' do
     = link_to project_runners_path(@project) do
       %i.icon-cog
@@ -20,15 +16,21 @@
     = link_to project_jobs_path(@project) do
       %i.icon-code
       Jobs
+  = nav_link path: 'web_hooks#index' do
+    = link_to project_web_hooks_path(@project) do
+      %i.icon-link
+      Web Hooks
   = nav_link path: 'services#index' do
     = link_to project_services_path(@project) do
       %i.icon-gear
       Services
-  = nav_link path: 'projects#edit' do
-    = link_to edit_project_path(@project) do
-      %i.icon-cogs
-      Settings
   = nav_link path: 'events#index' do
     = link_to project_events_path(@project) do
       %i.icon-book
       Events
+  %li
+    %hr
+  = nav_link path: 'projects#edit' do
+    = link_to edit_project_path(@project) do
+      %i.icon-cogs
+      Settings