Finish styling sub nav

This commit is contained in:
Annabel Dunstone 2016-06-03 12:09:45 -06:00
parent 664afebbe9
commit 5db95f5e69
11 changed files with 217 additions and 194 deletions

View file

@ -61,6 +61,11 @@
margin-bottom: -$gl-padding;
}
&.content-component-block {
padding: 11px 0;
background-color: $white-light;
}
.title {
color: $gl-text-color;
}

View file

@ -489,9 +489,11 @@ pre.light-well {
margin: 0;
}
.project-show-activity {
.activity-filter-block {
margin-top: -1px;
.activity-filter-block {
.controls {
padding-bottom: 10px;
border-bottom: 1px solid $border-color;
}
}

View file

@ -1,6 +1,9 @@
- @no_container = true
- page_title "Branches"
= render "projects/commits/head"
.row-content-block
%div{ class: (container_class) }
.row-content-block.second-block.content-component-block
.pull-right
- if can? current_user, :push_code, @project
= link_to new_namespace_project_branch_path(@project.namespace, @project), class: 'btn btn-create' do
@ -25,7 +28,7 @@
= sort_title_oldest_updated
.oneline
Protected branches can be managed in project settings
- unless @branches.empty?
- unless @branches.empty?
%ul.content-list.all-branches
- @branches.each do |branch|
= render "projects/branches/branch", branch: branch

View file

@ -1,7 +1,9 @@
- @no_container = true
- page_title "Builds"
= render "projects/pipelines/head"
.top-area
%div{ class: (container_class) }
.top-area
%ul.nav-links
%li{class: ('active' if @scope.nil?)}
= link_to project_builds_path(@project) do
@ -35,7 +37,7 @@
= icon('wrench')
%span CI Lint
%ul.content-list
%ul.content-list
- if @builds.blank?
%li
.nothing-here-block No builds to show

View file

@ -8,7 +8,7 @@
= render "head"
%div{ class: (container_class) }
.row-content-block.second-block
.row-content-block.second-block.content-component-block
.tree-ref-holder
= render 'shared/ref_switcher', destination: 'commits'

View file

@ -1,7 +1,9 @@
- @no_container = true
- page_title "Compare"
= render "projects/commits/head"
.row-content-block
%div{ class: (container_class) }
.row-content-block.second-block.content-component-block
Compare branches, tags or commit ranges.
%br
Fill input field with commit id like
@ -12,5 +14,5 @@
%br
Changes are shown <b>from</b> the version in the first field <b>to</b> the version in the second field.
.prepend-top-20
.prepend-top-20
= render "form"

View file

@ -1,4 +1,7 @@
.row-content-block.append-bottom-default
- @no_container = true
%div{ class: (container_class) }
.row-content-block.second-block.content-component-block
.tree-ref-holder
= render partial: 'shared/ref_switcher', locals: {destination: 'graph'}

View file

@ -1,7 +1,8 @@
- page_title "Network", @ref
= render "projects/commits/head"
= render "head"
.project-network
%div{ class: (container_class) }
.project-network
.controls
= form_tag namespace_project_network_path(@project.namespace, @project, @id), method: :get, class: 'form-inline network-form' do |f|
= text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: 'search-input form-control input-mx-250 search-sha'

View file

@ -1,4 +1,5 @@
%ul.nav-links
%ul.nav-links.sub-nav
%div{ class: (container_class) }
- if project_nav_tab? :pipelines
= nav_link(controller: :pipelines) do
= link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-pipelines' do

View file

@ -1,7 +1,9 @@
- @no_container = true
- page_title "Pipelines"
= render "projects/pipelines/head"
.top-area
%div{ class: (container_class) }
.top-area
%ul.nav-links
%li{class: ('active' if @scope.nil?)}
= link_to project_pipelines_path(@project) do
@ -36,7 +38,7 @@
= icon('wrench')
%span CI Lint
%ul.content-list.pipelines
%ul.content-list.pipelines
- stages = @pipelines.stages
- if @pipelines.blank?
%li

View file

@ -1,7 +1,9 @@
- @no_container = true
- page_title "Tags"
= render "projects/commits/head"
.row-content-block
%div{ class: (container_class) }
.row-content-block.second-block.content-component-block
- if can? current_user, :push_code, @project
.pull-right
= link_to new_namespace_project_tag_path(@project.namespace, @project), class: 'btn btn-create new-tag-btn' do
@ -10,7 +12,7 @@
.oneline
Tags give the ability to mark specific points in history as being important
.tags
.tags
- unless @tags.empty?
%ul.content-list
- @tags.each do |tag|