Skip to content
Snippets Groups Projects
Commit a5fb9980 authored by Jacob Schatz's avatar Jacob Schatz
Browse files

Merge branch 'dz-small-ui-fixes' into 'master'

Small ui fixes

- Dont use small font size for commits list    
- Use standard button size for new file
- Fix vertical align for files tab top navigation
- Add border bottom and margin for readme holder 


cc @skyruler @jschatz1 

See merge request !3419
parents fd279dd0 0f00a75d
No related branches found
No related tags found
1 merge request!3419Small ui fixes
Pipeline #
Loading
@@ -3,12 +3,10 @@
Loading
@@ -3,12 +3,10 @@
* *
*/ */
.file-holder { .file-holder {
border: none;
border: 1px solid $border-color; border: 1px solid $border-color;
   
&.readme-holder { &.readme-holder {
margin-top: 10px; margin: $gl-padding-top 0;
border-bottom: 0;
} }
   
table { table {
Loading
Loading
Loading
@@ -93,7 +93,6 @@ li.commit {
Loading
@@ -93,7 +93,6 @@ li.commit {
.commit-row-info { .commit-row-info {
color: $gl-gray; color: $gl-gray;
line-height: 24px; line-height: 24px;
font-size: 13px;
   
a { a {
color: $gl-gray; color: $gl-gray;
Loading
Loading
Loading
@@ -222,7 +222,7 @@
Loading
@@ -222,7 +222,7 @@
padding: 0; padding: 0;
background: transparent; background: transparent;
border: none; border: none;
line-height: 42px; line-height: 36px;
margin: 0; margin: 0;
   
> li + li:before { > li + li:before {
Loading
Loading
Loading
@@ -2,7 +2,7 @@
Loading
@@ -2,7 +2,7 @@
- header_title project_title(@project, "Files", project_files_path(@project)) - header_title project_title(@project, "Files", project_files_path(@project))
   
.file-finder-holder.tree-holder.clearfix .file-finder-holder.tree-holder.clearfix
.gray-content-block.top-block .nav-block
.tree-ref-holder .tree-ref-holder
= render 'shared/ref_switcher', destination: 'find_file', path: @path = render 'shared/ref_switcher', destination: 'find_file', path: @path
%ul.breadcrumb.repo-breadcrumb %ul.breadcrumb.repo-breadcrumb
Loading
Loading
Loading
@@ -15,11 +15,11 @@
Loading
@@ -15,11 +15,11 @@
- if current_user - if current_user
%li %li
- if !on_top_of_branch? - if !on_top_of_branch?
%span.btn.btn-sm.add-to-tree.disabled.has-tooltip{title: "You can only add files when you are on a branch", data: { container: 'body' }} %span.btn.add-to-tree.disabled.has-tooltip{title: "You can only add files when you are on a branch", data: { container: 'body' }}
= icon('plus') = icon('plus')
- else - else
%span.dropdown %span.dropdown
%a.dropdown-toggle.btn.btn-sm.add-to-tree{href: '#', "data-toggle" => "dropdown"} %a.dropdown-toggle.btn.add-to-tree{href: '#', "data-toggle" => "dropdown"}
= icon('plus') = icon('plus')
%ul.dropdown-menu %ul.dropdown-menu
- if can_edit_tree? - if can_edit_tree?
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment