Commit c844723a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

restyled main menu. move from left to top orientation

parent 1226223bf59d
......@@ -78,29 +78,63 @@ a {
margin-top:62px;
}
.container-fluid > .sidebar {
width: 140px;
border-right: 1px solid $border_color;
.container-fluid .sidebar {
width: 250px;
border-left: 1px solid $lite_border_color;
height:100%;
min-height:450px;
float:right;
}
.fixed {
position:fixed;
nav.main_menu {
border-radius: 4px;
box-shadow: 0 1px 2px black;
width: 100%;
margin: auto;
margin-top:20px;
margin-bottom:20px;
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #595d63), to(#31363e));
background-image: -webkit-linear-gradient(#595d63 6.6%, #31363e);
background-image: -moz-linear-gradient(#595d63 6.6%, #31363e);
background-image: -o-linear-gradient(#595d63 6.6%, #31363e);
.label {
background:$hover;
text-shadow:none;
color:$style_color;
}
aside a {
display:block;
position:relative;
padding:12px 10px;
margin:10px 0 0 0;
font-size:13px;
a {
font-weight:bold;
color:$style_color;
&:first-child{
-webkit-border-top-left-radius: 4px;
-webkit-border-bottom-left-radius: 4px;
-moz-border-radius-topleft: 4px;
-moz-border-radius-bottomleft: 4px;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
}
padding: 10px 25px;
display: inline-block;
color: #D6DADF;
border-right: 1px solid #31363E;
position: relative;
box-shadow: 1px 0 0 rgba(255, 255, 255, 0.1);
margin: 0;
text-shadow: 0 -1px 0 black;
&.current {
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #595d63), to(#2c2f35));
background-image: -webkit-linear-gradient(#595d63 6.6%, #2c2f35);
background-image: -moz-linear-gradient(#595d63 6.6%, #202227);
background-image: -o-linear-gradient(#595d63 6.6%, #202227);
}
}
}
.container-fluid > .content {
margin-left: 160px;
margin-left: 0px;
margin-top:20px;
}
......
%nav.main_menu
-#= link_to "Activities", dashboard_path, :class => "#{"active" if current_page?(dashboard_path) || current_page?(root_path) }"
= link_to "Projects", projects_path, :class => "#{"active" if current_page?(projects_path)}"
= link_to "Issues", dashboard_issues_path, :class => "#{"active" if current_page?(dashboard_issues_path)}", :id => "issues_slide"
= link_to "Requests", dashboard_merge_requests_path, :class => "#{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
= link_to "Help", help_path, :class => "#{"active" if controller.controller_name == "help"}"
.fixed
%aside
-#= link_to "Activities", dashboard_path, :class => "#{"active" if current_page?(dashboard_path) || current_page?(root_path) }"
= link_to "Projects", projects_path, :class => "#{"active" if current_page?(projects_path)}"
= link_to "Issues", dashboard_issues_path, :class => "#{"active" if current_page?(dashboard_issues_path)}", :id => "issues_slide"
= link_to "Requests", dashboard_merge_requests_path, :class => "#{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
= link_to "Help", help_path, :class => "#{"active" if controller.controller_name == "help"}"
%nav.main_menu
= link_to project_path(@project), :class => project_tab_class do
Project
- if @project.repo_exists?
= link_to "Repository", project_repository_path(@project), :class => repository_tab_class
= link_to "Files", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class
= link_to "Commits", project_commits_path(@project), :class => (controller.controller_name == "commits") ? "current" : nil
= link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
- if @project.issues_enabled
= link_to project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
Issues
- if @project.merge_requests_enabled
= link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do
Merge Requests
- if @project.wall_enabled
= link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
@Wall
- if @project.common_notes.today.count > 0
%span.label= @project.common_notes.today.count
.project-sidebar
.fixed
%aside
= link_to project_path(@project), :class => project_tab_class do
Project
- if @project.repo_exists?
= link_to "Repository", project_repository_path(@project), :class => repository_tab_class
= link_to "Files", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class
= link_to "Commits", project_commits_path(@project), :class => (controller.controller_name == "commits") ? "current" : nil
= link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
- if @project.issues_enabled
= link_to project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
Issues
- if @project.merge_requests_enabled
= link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do
Merge Requests
- if @project.wall_enabled
= link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
@Wall
- if @project.common_notes.today.count > 0
%span.label= @project.common_notes.today.count
......@@ -5,12 +5,10 @@
= render "layouts/flash"
= render "layouts/head_panel", :title => "Admin area"
.container-fluid
.sidebar
.fixed
%aside
= link_to "Users", admin_users_path, :class => controller.controller_name == "users" ? "current" : nil
= link_to "Projects", admin_projects_path, :class => controller.controller_name == "projects" ? "current" : nil
= link_to "Emails", admin_emails_path, :class => controller.controller_name == "mailer" ? "current" : nil
= link_to "Resque", "/info/resque"
%nav.main_menu
= link_to "Users", admin_users_path, :class => controller.controller_name == "users" ? "current" : nil
= link_to "Projects", admin_projects_path, :class => controller.controller_name == "projects" ? "current" : nil
= link_to "Emails", admin_emails_path, :class => controller.controller_name == "mailer" ? "current" : nil
= link_to "Resque", "/info/resque"
.content= yield
......@@ -5,9 +5,8 @@
= render "layouts/flash"
= render "layouts/head_panel", :title => "Dashboard"
.container-fluid
.sidebar
= render :partial => "layouts/app_side"
= render :partial => "layouts/app_menu"
.content
.row
.span10= yield
.span4= render "layouts/projects_side"
.span12= yield
.sidebar= render "layouts/projects_side"
......@@ -5,16 +5,15 @@
= render "layouts/flash"
= render "layouts/head_panel", :title => "Profile"
.container-fluid
.sidebar
%aside
= link_to "Profile", profile_path, :class => current_page?(:controller => "profile", :action => :show) ? "current" : nil
= link_to "Password & token", profile_password_path, :class => current_page?(:controller => "profile", :action => :password) ? "current" : nil
= link_to "Design", profile_design_path, :class => current_page?(:controller => "profile", :action => :design) ? "current" : nil
= link_to keys_path, :class => controller.controller_name == "keys" ? "current" : nil do
Keys
- unless current_user.keys.empty?
%span.label= current_user.keys.count
%nav.main_menu
= link_to "Profile", profile_path, :class => current_page?(:controller => "profile", :action => :show) ? "current" : nil
= link_to "Password & token", profile_password_path, :class => current_page?(:controller => "profile", :action => :password) ? "current" : nil
= link_to "Design", profile_design_path, :class => current_page?(:controller => "profile", :action => :design) ? "current" : nil
= link_to keys_path, :class => controller.controller_name == "keys" ? "current" : nil do
Keys
- unless current_user.keys.empty?
%span.label= current_user.keys.count
.content
.row
.span10= yield
.span4= render "layouts/projects_side"
.span12= yield
.sidebar= render "layouts/projects_side"
......@@ -5,12 +5,12 @@
= render "layouts/flash"
= render "layouts/head_panel", :title => @project.name
.container-fluid
.sidebar= render :partial => "layouts/project_side"
= render :partial => "layouts/project_menu"
.content
- if @full_content
= yield
- else
.row
.span10= yield
.span4= render "layouts/project_side_right"
.span12= yield
.sidebar= render "layouts/project_side_right"
- @projects.in_groups_of(2, false) do |projects|
.row
- projects.each_with_index do |project, i|
.span4.well
.span5.well
= link_to project_path(project) do
%h3= truncate(project.name, :length => 20)
%p.title.repository.git_url_wrapper
......
......@@ -19,7 +19,7 @@
= render :partial => "refs/tree_file", :locals => { :name => tree.name, :content => tree.data, :file => tree }
- else
- contents = tree.contents
%table#tree-slider
%table#tree-slider.bordered-table.zebra-striped
%thead
%th Name
%th Last Update
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment