Merge branch 'master' into ui-improvements

8 files changed, 162 insertions, 63 deletions

diff --git a/app/assets/stylesheets/main/variables.scss b/app/assets/stylesheets/main/variables.scss
index c71984a5665..ca296c85a91 100644
--- a/app/assets/stylesheets/main/variables.scss
+++ b/app/assets/stylesheets/main/variables.scss
@@ -44,6 +44,6 @@ $added: #63c363;
 $deleted: #f77;
 
 /**
- *
+ * NProgress customize
  */
 $nprogress-color: #3498db;
diff --git a/app/assets/stylesheets/sections/sidebar.scss b/app/assets/stylesheets/sections/sidebar.scss
index 80b49d751b9..65229336e92 100644
--- a/app/assets/stylesheets/sections/sidebar.scss
+++ b/app/assets/stylesheets/sections/sidebar.scss
@@ -96,7 +96,7 @@
   }
 }
 
-@media(min-width:768px) {
+@mixin expanded-sidebar {
   .page-with-sidebar {
     padding-left: 250px;
   }
@@ -121,3 +121,44 @@
     border-left: 1px solid #EAEAEA;
   }
 }
+
+@mixin folded-sidebar {
+  .page-with-sidebar {
+    padding-left: 50px;
+  }
+
+  .sidebar-wrapper {
+    width: 52px;
+    position: absolute;
+    left: 50px;
+    height: 100%;
+    margin-left: -50px;
+
+    .nav-sidebar {
+      margin-top: 20px;
+      position: fixed;
+      top: 45px;
+      width: 52px;
+
+      li a {
+        padding-left: 18px;
+        font-size: 14px;
+        padding: 10px 15px;
+        text-align: center;
+
+        & > span {
+          display: none;
+        }
+      }
+    }
+  }
+}
+
+@media (max-width: $screen-sm-max) {
+  @include folded-sidebar;
+}
+
+@media(min-width: $screen-sm-max) {
+  @include expanded-sidebar;
+}
+
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index 1a506832ea2..ea503a9cc2e 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -1,19 +1,42 @@
-%ul.nav-sidebar.navbar-collapse.collapse
+%ul.nav.nav-sidebar
   = nav_link(controller: :dashboard, html_options: {class: 'home'}) do
     = link_to admin_root_path, title: "Stats" do
-      Overview
+      %i.fa.fa-dashboard
+      %span
+        Overview
   = nav_link(controller: :projects) do
-    = link_to "Projects", admin_projects_path
+    = link_to admin_projects_path do
+      %i.fa.fa-cube
+      %span
+        Projects
   = nav_link(controller: :users) do
-    = link_to "Users", admin_users_path
+    = link_to admin_users_path do
+      %i.fa.fa-users
+      %span
+        Users
   = nav_link(controller: :groups) do
-    = link_to "Groups", admin_groups_path
+    = link_to admin_groups_path do
+      %i.fa.fa-group
+      %span
+        Groups
   = nav_link(controller: :logs) do
-    = link_to "Logs", admin_logs_path
+    = link_to admin_logs_path do
+      %i.fa.fa-file-text
+      %span
+        Logs
   = nav_link(controller: :broadcast_messages) do
-    = link_to "Messages", admin_broadcast_messages_path
+    = link_to admin_broadcast_messages_path do
+      %i.fa.fa-bullhorn
+      %span
+        Messages
   = nav_link(controller: :hooks) do
-    = link_to "Hooks", admin_hooks_path
+    = link_to admin_hooks_path do
+      %i.fa.fa-external-link
+      %span
+        Hooks
   = nav_link(controller: :background_jobs) do
-    = link_to "Background Jobs", admin_background_jobs_path
+    = link_to admin_background_jobs_path do
+      %i.fa.fa-cog
+      %span
+        Background Jobs
 
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 619cf625689..da1976346d5 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -1,24 +1,29 @@
-%ul.nav.nav-sidebar.navbar-collapse.collapse
+%ul.nav.nav-sidebar
   = nav_link(path: 'dashboard#show', html_options: {class: 'home'}) do
     = link_to root_path, title: 'Home', class: 'shortcuts-activity' do
       %i.fa.fa-dashboard
-      Activity
+      %span
+        Activity
   = nav_link(path: 'dashboard#projects') do
     = link_to projects_dashboard_path, class: 'shortcuts-projects' do
       %i.fa.fa-cube
-      Projects
+      %span
+        Projects
   = nav_link(path: 'dashboard#issues') do
     = link_to issues_dashboard_path, class: 'shortcuts-issues' do
       %i.fa.fa-exclamation-circle
-      Issues
-      %span.count= current_user.assigned_issues.opened.count
+      %span
+        Issues
+        %span.count= current_user.assigned_issues.opened.count
   = nav_link(path: 'dashboard#merge_requests') do
     = link_to merge_requests_dashboard_path, class: 'shortcuts-merge_requests' do
       %i.fa.fa-tasks
-      Merge Requests
-      %span.count= current_user.assigned_merge_requests.opened.count
+      %span
+        Merge Requests
+        %span.count= current_user.assigned_merge_requests.opened.count
   = nav_link(controller: :help) do
     = link_to help_path do
       %i.fa.fa-question-circle
-      Help
+      %span
+        Help
 
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 3c8f47a7bea..54468d077ab 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -1,36 +1,42 @@
-%ul.nav.nav-sidebar.navbar-collapse.collapse
+%ul.nav.nav-sidebar
   = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
     = link_to group_path(@group), title: "Home" do
       %i.fa.fa-dashboard
-      Activity
+      %span
+        Activity
   - if current_user
     = nav_link(controller: [:group, :milestones]) do
       = link_to group_milestones_path(@group) do
         %i.fa.fa-clock-o
-        Milestones
+        %span
+          Milestones
   = nav_link(path: 'groups#issues') do
     = link_to issues_group_path(@group) do
       %i.fa.fa-exclamation-circle
-      Issues
-      - if current_user
-        %span.count= Issue.opened.of_group(@group).count
+      %span
+        Issues
+        - if current_user
+          %span.count= Issue.opened.of_group(@group).count
   = nav_link(path: 'groups#merge_requests') do
     = link_to merge_requests_group_path(@group) do
       %i.fa.fa-tasks
-      Merge Requests
-      - if current_user
-        %span.count= MergeRequest.opened.of_group(@group).count
+      %span
+        Merge Requests
+        - if current_user
+          %span.count= MergeRequest.opened.of_group(@group).count
   = nav_link(path: 'groups#members') do
     = link_to members_group_path(@group) do
       %i.fa.fa-users
-      Members
+      %span
+        Members
 
   - if can?(current_user, :manage_group, @group)
     = nav_link(html_options: { class: "#{"active" if group_settings_page?} separate-item" }) do
       = link_to edit_group_path(@group), class: "tab no-highlight" do
         %i.fa.fa-cogs
-        Settings
-        %i.fa.fa-angle-down
+        %span
+          Settings
+          %i.fa.fa-angle-down
 
   - if group_settings_page?
     = render 'groups/settings_nav'
diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml
index 05ba20e3611..64d9ad75dc2 100644
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
@@ -1,8 +1,9 @@
-%ul.nav-sidebar.navbar-collapse.collapse
+%ul.nav.nav-sidebar
   = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
     = link_to profile_path, title: "Profile" do
       %i.fa.fa-user
-      Profile
+      %span
+        Profile
   = nav_link(controller: :accounts) do
     = link_to profile_account_path do
       %i.fa.fa-gear
@@ -10,33 +11,40 @@
   = nav_link(controller: :emails) do
     = link_to profile_emails_path do
       %i.fa.fa-envelope-o
-      Emails
-      %span.count= current_user.emails.count + 1
+      %span
+        Emails
+        %span.count= current_user.emails.count + 1
   - unless current_user.ldap_user?
     = nav_link(controller: :passwords) do
       = link_to edit_profile_password_path do
         %i.fa.fa-lock
-        Password
+        %span
+          Password
   = nav_link(controller: :notifications) do
     = link_to profile_notifications_path do
       %i.fa.fa-inbox
-      Notifications
+      %span
+        Notifications
 
   = nav_link(controller: :keys) do
     = link_to profile_keys_path do
       %i.fa.fa-key
-      SSH Keys
-      %span.count= current_user.keys.count
+      %span
+        SSH Keys
+        %span.count= current_user.keys.count
   = nav_link(path: 'profiles#design') do
     = link_to design_profile_path do
       %i.fa.fa-image
-      Design
+      %span
+        Design
   = nav_link(controller: :groups) do
     = link_to profile_groups_path do
       %i.fa.fa-group
-      Groups
+      %span
+        Groups
   = nav_link(path: 'profiles#history') do
     = link_to history_profile_path do
       %i.fa.fa-history
-      History
+      %span
+        History
 
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index d634d39bfdf..94cee0bd50f 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -1,66 +1,76 @@
-%ul.project-navigation.nav.nav-sidebar.navbar-collapse.collapse
+%ul.project-navigation.nav.nav-sidebar
   = nav_link(path: 'projects#show', html_options: {class: "home"}) do
     = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
       %i.fa.fa-dashboard
-      Project
+      %span
+        Project
   - if project_nav_tab? :files
     = nav_link(controller: %w(tree blob blame edit_tree new_tree)) do
       = link_to project_tree_path(@project, @ref || @repository.root_ref), class: 'shortcuts-tree' do
         %i.fa.fa-files-o
-        Files
+        %span
+          Files
 
 
   - if project_nav_tab? :commits
     = nav_link(controller: %w(commit commits compare repositories tags branches)) do
       = link_to project_commits_path(@project, @ref || @repository.root_ref), class: 'shortcuts-commits' do
         %i.fa.fa-history
-        Commits
+        %span
+          Commits
 
   - if project_nav_tab? :network
     = nav_link(controller: %w(network)) do
       = link_to project_network_path(@project, @ref || @repository.root_ref), class: 'shortcuts-network' do
         %i.fa.fa-code-fork
-        Network
+        %span
+          Network
 
   - if project_nav_tab? :graphs
     = nav_link(controller: %w(graphs)) do
       = link_to project_graph_path(@project, @ref || @repository.root_ref), class: 'shortcuts-graphs' do
         %i.fa.fa-area-chart
-        Graphs
+        %span
+          Graphs
 
   - if project_nav_tab? :issues
     = nav_link(controller: %w(issues milestones labels)) do
       = link_to url_for_project_issues, class: 'shortcuts-issues' do
         %i.fa.fa-exclamation-circle
-        Issues
-        - if @project.used_default_issues_tracker?
-          %span.count.issue_counter= @project.issues.opened.count
+        %span
+          Issues
+          - if @project.used_default_issues_tracker?
+            %span.count.issue_counter= @project.issues.opened.count
 
   - if project_nav_tab? :merge_requests
     = nav_link(controller: :merge_requests) do
       = link_to project_merge_requests_path(@project), class: 'shortcuts-merge_requests'  do
         %i.fa.fa-tasks
-        Merge Requests
-        %span.count.merge_counter= @project.merge_requests.opened.count
+        %span
+          Merge Requests
+          %span.count.merge_counter= @project.merge_requests.opened.count
 
   - if project_nav_tab? :wiki
     = nav_link(controller: :wikis) do
       = link_to project_wiki_path(@project, :home), class: 'shortcuts-wiki' do
         %i.fa.fa-book
-        Wiki
+        %span
+          Wiki
 
   - if project_nav_tab? :snippets
     = nav_link(controller: :snippets) do
       = link_to project_snippets_path(@project), class: 'shortcuts-snippets' do
         %i.fa.fa-file-text-o
-        Snippets
+        %span
+          Snippets
 
   - if project_nav_tab? :settings
     = nav_link(html_options: {class: "#{project_tab_class} separate-item"}) do
       = link_to edit_project_path(@project), class: "stat-tab tab no-highlight" do
         %i.fa.fa-cogs
-        Settings
-        %i.fa.fa-angle-down
+        %span
+          Settings
+          %i.fa.fa-angle-down
 
   - if @project_settings_nav
     = render 'projects/settings_nav'
diff --git a/app/views/projects/_settings_nav.html.haml b/app/views/projects/_settings_nav.html.haml
index 591b5b0e160..64eda0bf286 100644
--- a/app/views/projects/_settings_nav.html.haml
+++ b/app/views/projects/_settings_nav.html.haml
@@ -2,24 +2,30 @@
   = nav_link(path: 'projects#edit') do
     = link_to edit_project_path(@project), class: "stat-tab tab " do
       %i.fa.fa-pencil-square-o
-      Project
+      %span
+        Project
   = nav_link(controller: [:team_members, :teams]) do
     = link_to project_team_index_path(@project), class: "team-tab tab" do
       %i.fa.fa-users
-      Members
+      %span
+        Members
   = nav_link(controller: :deploy_keys) do
     = link_to project_deploy_keys_path(@project) do
       %i.fa.fa-key
-      Deploy Keys
+      %span
+        Deploy Keys
   = nav_link(controller: :hooks) do
     = link_to project_hooks_path(@project) do
       %i.fa.fa-link
-      Web Hooks
+      %span
+        Web Hooks
   = nav_link(controller: :services) do
     = link_to project_services_path(@project) do
       %i.fa.fa-cogs
-      Services
+      %span
+        Services
   = nav_link(controller: :protected_branches) do
     = link_to project_protected_branches_path(@project) do
       %i.fa.fa-lock
-      Protected branches
+      %span
+        Protected branches