Skip to content
Snippets Groups Projects
Verified Commit 03090a88 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Replace all navigation menu with nav-links class

parent 8c3debb1
No related branches found
No related tags found
No related merge requests found
Showing
with 59 additions and 54 deletions
Loading
Loading
@@ -20,7 +20,7 @@
 
.content-block,
.gray-content-block {
margin-top: -$gl-padding;
margin-top: 0;
margin-bottom: -$gl-padding;
background-color: $background-color;
padding: $gl-padding;
Loading
Loading
@@ -134,3 +134,13 @@
.block-connector {
margin-top: -1px;
}
.nav-block {
.controls {
float: right;
.btn {
margin-top: 7px;
}
}
}
Loading
Loading
@@ -81,7 +81,7 @@
display: none;
}
 
.center-top-menu, .left-top-menu {
.nav-links, .nav-links {
li a {
font-size: 14px;
padding: 19px 10px;
Loading
Loading
Loading
Loading
@@ -2,7 +2,7 @@
padding: 0;
margin: 0;
list-style: none;
height: 56px;
height: auto;
border-bottom: 1px solid $border-color;
 
li {
Loading
Loading
@@ -10,6 +10,7 @@
 
a {
display: inline-block;
padding: 14px;
padding-top: $gl-padding;
padding-bottom: 11px;
margin-bottom: -1px;
Loading
Loading
@@ -25,7 +26,7 @@
}
 
&.active a {
color: #616060;
color: #000000;
border-bottom: 2px solid #4688f1;
}
 
Loading
Loading
Loading
Loading
@@ -24,7 +24,7 @@
 
.container-fluid {
background: #FFF;
padding: $gl-padding;
padding: 0 $gl-padding;
 
&.container-blank {
background: none;
Loading
Loading
.detail-page-header {
margin-top: -$gl-padding;
margin-bottom: -$gl-padding;
padding: 7px 0;
margin-bottom: 0px;
border-bottom: 1px solid $border-color;
color: #5c5d5e;
font-size: 16px;
Loading
Loading
// Common
.diff-file {
margin-left: -$gl-padding;
margin-right: -$gl-padding;
border: none;
border-bottom: 1px solid #E7E9EE;
 
Loading
Loading
Loading
Loading
@@ -30,7 +30,7 @@
margin-top: 7px;
}
 
.center-top-menu {
.nav-links {
text-align: left;
}
}
Loading
Loading
Loading
Loading
@@ -3,9 +3,9 @@
*
*/
.mr-state-widget {
background: #F7F8FA;
background: $background-color;
color: $gl-gray;
border: 1px solid #dce0e6;
border: 1px solid $border-color;
@include border-radius(2px);
 
form {
Loading
Loading
Loading
Loading
@@ -228,7 +228,6 @@
}
 
.projects-search-form {
.input-group .form-control {
height: 42px;
}
Loading
Loading
@@ -418,9 +417,8 @@ ul.nav.nav-projects-tabs {
 
.top-area {
border-bottom: 1px solid #EEE;
height: 42px;
 
ul.left-top-menu {
ul.nav-links {
display: inline-block;
width: 50%;
margin-bottom: 0px;
Loading
Loading
@@ -523,8 +521,7 @@ pre.light-well {
}
 
.projects-search-form {
margin: -$gl-padding;
padding: $gl-padding;
padding: $gl-padding 0;
padding-bottom: 0;
margin-bottom: 0px;
 
Loading
Loading
@@ -660,8 +657,6 @@ pre.light-well {
}
 
.project-show-readme .readme-holder {
margin-left: -$gl-padding;
margin-right: -$gl-padding;
padding: ($gl-padding + 7px);
border-top: 0;
 
Loading
Loading
Loading
Loading
@@ -4,7 +4,7 @@
- if @all_builds.running_or_pending.any?
= link_to 'Cancel all', cancel_all_admin_builds_path, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
 
%ul.center-top-menu
%ul.nav-links
%li{class: ('active' if @scope.nil?)}
= link_to admin_builds_path do
All
Loading
Loading
.hidden-xs
= render "events/event_last_push", event: @last_push
 
.gray-content-block
.nav-block
- if current_user
.pull-right
.controls
= link_to dashboard_projects_path(:atom, { private_token: current_user.private_token }), class: 'btn rss-btn' do
%i.fa.fa-rss
= render 'shared/event_filter'
Loading
Loading
%ul.center-top-menu
%ul.nav-links
%li{ class: ("active" unless params[:filter]) }
= link_to activity_dashboard_path, class: 'shortcuts-activity', data: {placement: 'right'} do
Your Projects
Loading
Loading
%ul.center-top-menu
%ul.nav-links
= nav_link(page: dashboard_groups_path) do
= link_to dashboard_groups_path, title: 'Your groups', data: {placement: 'right'} do
Your Groups
Loading
Loading
= content_for :flash_message do
= render 'shared/project_limit'
.top-area
%ul.left-top-menu
%ul.nav-links
= nav_link(page: [dashboard_projects_path, root_path]) do
= link_to dashboard_projects_path, title: 'Home', class: 'shortcuts-activity', data: {placement: 'right'} do
Your Projects
Loading
Loading
%ul.center-top-menu
%ul.nav-links
= nav_link(page: dashboard_snippets_path, html_options: {class: 'home'}) do
= link_to dashboard_snippets_path, title: 'Your snippets', data: {placement: 'right'} do
Your Snippets
Loading
Loading
Loading
Loading
@@ -48,7 +48,7 @@
#{@milestone.open_items_count} open
= milestone_progress_bar(@milestone)
 
%ul.center-top-menu.no-top.no-bottom
%ul.nav-links.no-top.no-bottom
%li.active
= link_to '#tab-issues', 'data-toggle' => 'tab' do
Issues
Loading
Loading
Loading
Loading
@@ -3,32 +3,36 @@
 
= render 'dashboard/snippets_head'
 
.gray-content-block
.pull-right
.nav-block
.controls
= link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do
= icon('plus')
New Snippet
 
.btn-group.btn-group-next.snippet-scope-menu
= link_to dashboard_snippets_path, class: "btn btn-default #{"active" unless params[:scope]}" do
All
%span.badge
= current_user.snippets.count
= link_to dashboard_snippets_path(scope: 'are_private'), class: "btn btn-default #{"active" if params[:scope] == "are_private"}" do
Private
%span.badge
= current_user.snippets.are_private.count
= link_to dashboard_snippets_path(scope: 'are_internal'), class: "btn btn-default #{"active" if params[:scope] == "are_internal"}" do
Internal
%span.badge
= current_user.snippets.are_internal.count
= link_to dashboard_snippets_path(scope: 'are_public'), class: "btn btn-default #{"active" if params[:scope] == "are_public"}" do
Public
%span.badge
= current_user.snippets.are_public.count
.nav-links.snippet-scope-menu
%li{ class: ("active" unless params[:scope]) }
= link_to dashboard_snippets_path do
All
%span.badge
= current_user.snippets.count
%li{ class: ("active" if params[:scope] == "are_private") }
= link_to dashboard_snippets_path(scope: 'are_private') do
Private
%span.badge
= current_user.snippets.are_private.count
%li{ class: ("active" if params[:scope] == "are_internal") }
= link_to dashboard_snippets_path(scope: 'are_internal') do
Internal
%span.badge
= current_user.snippets.are_internal.count
%li{ class: ("active" if params[:scope] == "are_public") }
= link_to dashboard_snippets_path(scope: 'are_public') do
Public
%span.badge
= current_user.snippets.are_public.count
 
= render 'snippets/snippets'
 
Loading
Loading
@@ -54,7 +54,7 @@
#{@milestone.open_items_count} open
= milestone_progress_bar(@milestone)
 
%ul.center-top-menu.no-top.no-bottom
%ul.nav-links.no-top.no-bottom
%li.active
= link_to '#tab-issues', 'data-toggle' => 'tab' do
Issues
Loading
Loading
Loading
Loading
@@ -56,5 +56,5 @@
= render "projects", projects: @projects
 
- else
%p.center-top-menu.no-top
%p.nav-links.no-top
No projects to show
Loading
Loading
@@ -139,9 +139,9 @@
%h2#navs Navigation
 
%h4
%code .center-top-menu
%code .nav-links
.example
%ul.center-top-menu
%ul.nav-links
%li.active
%a Open
%li
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment