From 0392669cbc7686f54677362457cfc4e62a527414 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 31 Dec 2013 03:15:58 +0200 Subject: [PATCH] Fix some css after bootstrap 3 --- app/assets/stylesheets/gitlab_bootstrap/common.scss | 7 +++++++ app/assets/stylesheets/gitlab_bootstrap/files.scss | 1 - app/assets/stylesheets/gitlab_bootstrap/mixins.scss | 4 ++++ app/assets/stylesheets/gitlab_bootstrap/typography.scss | 6 +----- app/assets/stylesheets/sections/header.scss | 19 +++++++++++++++---- app/assets/stylesheets/sections/tree.scss | 2 +- app/assets/stylesheets/selects.scss | 1 + app/views/projects/blob/_blob.html.haml | 1 - app/views/projects/commits/_head.html.haml | 2 +- app/views/projects/issues/_head.html.haml | 2 +- app/views/projects/tree/_tree.html.haml | 2 -- 11 files changed, 31 insertions(+), 16 deletions(-) diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss index ca5167e..f185bd7 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/common.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss @@ -20,6 +20,7 @@ .append-right-10 { margin-right:10px } .append-right-20 { margin-right:20px } .append-bottom-10 { margin-bottom:10px } +.append-bottom-15 { margin-bottom:15px } .append-bottom-20 { margin-bottom:20px } .inline { display: inline-block } @@ -129,3 +130,9 @@ pre.well-pre { .gl-hide { display: none; } + +.breadcrumb > li + li:before { + content: "/"; + padding: 0; + color: #666; +} diff --git a/app/assets/stylesheets/gitlab_bootstrap/files.scss b/app/assets/stylesheets/gitlab_bootstrap/files.scss index 3f9e498..6607ae3 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/files.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/files.scss @@ -20,7 +20,6 @@ text-align: left; color: $style_color; padding: 9px 10px; - height: 18px; .options { float: right; diff --git a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss index feb7d48..e637b64 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss @@ -84,6 +84,10 @@ } @mixin md-typography { + img { + max-width: 100%; + } + *:first-child { margin-top: 0; } diff --git a/app/assets/stylesheets/gitlab_bootstrap/typography.scss b/app/assets/stylesheets/gitlab_bootstrap/typography.scss index d398655..4490566 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/typography.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/typography.scss @@ -2,11 +2,6 @@ * Headers * */ -h1, h2, h3, h4, h5, h6 { - font-weight: 500; - line-height: 1.1; -} - h1.page-title { @include page-title; font-size: 28px; @@ -99,6 +94,7 @@ a:focus { background: #f5f5f5; } ul { + padding: 0; margin: 0 0 9px 25px !important; } } diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss index 4efdaf7..b0dd0d0 100644 --- a/app/assets/stylesheets/sections/header.scss +++ b/app/assets/stylesheets/sections/header.scss @@ -103,7 +103,6 @@ header { } .search-input { - width: 300px; background-image: url("icon-search.png"); background-repeat: no-repeat; background-position: 10px; @@ -115,9 +114,6 @@ header { border: 1px solid #c6c6c6; box-shadow: none; @include transition(all 0.15s ease-in 0s); - &:focus { - width: 400px; - } } } @@ -201,3 +197,18 @@ header { } } +.search .search-input { + width: 300px; + &:focus { + width: 400px; + } +} + +@media (max-width: 1200px) { + .search .search-input { + width: 200px; + &:focus { + width: 300px; + } + } +} diff --git a/app/assets/stylesheets/sections/tree.scss b/app/assets/stylesheets/sections/tree.scss index e916c20..ef4546d 100644 --- a/app/assets/stylesheets/sections/tree.scss +++ b/app/assets/stylesheets/sections/tree.scss @@ -111,7 +111,7 @@ .tree-ref-holder { float: left; - margin-top: 5px; + margin-top: 8px; } .readme-holder { diff --git a/app/assets/stylesheets/selects.scss b/app/assets/stylesheets/selects.scss index 7259c7d..8e63195 100644 --- a/app/assets/stylesheets/selects.scss +++ b/app/assets/stylesheets/selects.scss @@ -3,6 +3,7 @@ min-width: 100px; .chosen-single { + height: 26px; background: #EEE !important; border: 1px solid #DDD !important; @include box-shadow(none !important); diff --git a/app/views/projects/blob/_blob.html.haml b/app/views/projects/blob/_blob.html.haml index 6524aae..32ea967 100644 --- a/app/views/projects/blob/_blob.html.haml +++ b/app/views/projects/blob/_blob.html.haml @@ -4,7 +4,6 @@ = link_to project_tree_path(@project, @ref) do = @project.path - tree_breadcrumbs(@tree, 6) do |title, path| - \/ %li - if path - if path.end_with?(@path) diff --git a/app/views/projects/commits/_head.html.haml b/app/views/projects/commits/_head.html.haml index c2da9f2..a9fcc57 100644 --- a/app/views/projects/commits/_head.html.haml +++ b/app/views/projects/commits/_head.html.haml @@ -1,4 +1,4 @@ -%ul.nav.nav-tabs +%ul.nav.nav-tabs.append-bottom-15 %li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'} = nav_link(controller: [:commit, :commits]) do diff --git a/app/views/projects/issues/_head.html.haml b/app/views/projects/issues/_head.html.haml index 1c3b39a..4dbe4f3 100644 --- a/app/views/projects/issues/_head.html.haml +++ b/app/views/projects/issues/_head.html.haml @@ -1,4 +1,4 @@ -%ul.nav.nav-tabs +%ul.nav.nav-tabs.append-bottom-15 = nav_link(controller: :issues) do = link_to project_issues_path(@project), class: "tab" do Browse Issues diff --git a/app/views/projects/tree/_tree.html.haml b/app/views/projects/tree/_tree.html.haml index 6b5b84f..80ed1fd 100644 --- a/app/views/projects/tree/_tree.html.haml +++ b/app/views/projects/tree/_tree.html.haml @@ -4,14 +4,12 @@ = link_to project_tree_path(@project, @ref) do = @project.path - tree_breadcrumbs(tree, 6) do |title, path| - \/ %li - if path = link_to truncate(title, length: 40), project_tree_path(@project, path) - else = link_to title, '#' - if @repository.branch_names.include?(@ref) - \/ %li = link_to project_new_tree_path(@project, @id), title: 'New file', id: 'new-file-link' do %small -- libgit2 0.21.2