From e97abfce3b9e4e836aaf9d9ac32a45c6490f8831 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sat, 13 Jul 2013 20:00:46 +0300
Subject: [PATCH] Fix edit page crash. Minot UI imporvements
---
app/assets/stylesheets/gitlab_bootstrap/mixins.scss | 2 +-
app/assets/stylesheets/sections/nav.scss | 4 ++--
app/assets/stylesheets/themes/ui_mars.scss | 4 ++++
app/helpers/commits_helper.rb | 2 +-
app/views/profiles/keys/index.html.haml | 6 +-----
app/views/projects/commits/show.html.haml | 2 ++
app/views/projects/edit_tree/show.html.haml | 2 +-
7 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
index 2773b0abc..eed7cb78e 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss
@@ -77,7 +77,7 @@
@mixin md-typography {
code { padding: 0 4px; }
- p { font-size: 13px; }
+ p { font-size: 14px; }
h1 { margin-top: 30px;}
h2 { margin-top: 25px;}
h3 { margin-top: 20px;}
diff --git a/app/assets/stylesheets/sections/nav.scss b/app/assets/stylesheets/sections/nav.scss
index 54263523e..77ed57a6c 100644
--- a/app/assets/stylesheets/sections/nav.scss
+++ b/app/assets/stylesheets/sections/nav.scss
@@ -7,7 +7,7 @@
ul {
margin: auto;
- height: 40px;
+ height: 42px;
overflow: hidden;
.count {
font-weight: normal;
@@ -74,7 +74,7 @@
text-align: center;
font-weight: normal;
height: 38px;
- line-height: 34px;
+ line-height: 36px;
color: #777;
text-shadow: 0 1px 1px white;
padding: 0 10px;
diff --git a/app/assets/stylesheets/themes/ui_mars.scss b/app/assets/stylesheets/themes/ui_mars.scss
index a2b8c21ea..44649ea03 100644
--- a/app/assets/stylesheets/themes/ui_mars.scss
+++ b/app/assets/stylesheets/themes/ui_mars.scss
@@ -31,4 +31,8 @@
border-left: 1px solid #666;
}
}
+
+ .main-nav {
+ box-shadow: 0 -1px 0 white inset;
+ }
}
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 2bc618941..86979156d 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -134,7 +134,7 @@ module CommitsHelper
parts = @path.split('/')
parts.each_with_index do |part, i|
- crumbs += content_tag(:span, '/', class: 'divider')
+ crumbs += content_tag(:span, ' / ', class: 'divider')
crumbs += content_tag(:li) do
# The text is just the individual part, but the link needs all the parts before it
link_to part, project_commits_path(@project, tree_join(@ref, parts[0..i].join('/')))
diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml
index ec814c4ab..caa83d65e 100644
--- a/app/views/profiles/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
@@ -1,8 +1,3 @@
-%h3.page-title
- SSH Keys
- = link_to "Add SSH Key", new_profile_key_path, class: "btn pull-right btn-primary"
-
-%br
%p.light
SSH key allows you to establish a secure connection between your computer and GitLab
%p.light
@@ -15,6 +10,7 @@
%h5.title
SSH Keys (#{@keys.count})
.pull-right
+ = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-small btn-primary"
%ul.well-list#keys-table
= render @keys
- if @keys.blank?
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index cb9ef820d..d56923fdc 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -2,6 +2,8 @@
- if @path.present?
%ul.breadcrumb
+ %li.light
+ History for
= commits_breadcrumbs
%div{id: dom_id(@project)}
diff --git a/app/views/projects/edit_tree/show.html.haml b/app/views/projects/edit_tree/show.html.haml
index 25a361cb2..65b6e9948 100644
--- a/app/views/projects/edit_tree/show.html.haml
+++ b/app/views/projects/edit_tree/show.html.haml
@@ -21,7 +21,7 @@
= text_area_tag 'commit_message', '', placeholder: "Update #{@blob.name}", required: true, rows: 3
.form-actions
= hidden_field_tag 'last_commit', @last_commit
- = hidden_field_tag 'content', '', id: :file-content
+ = hidden_field_tag 'content', '', id: "file-content"
.commit-button-annotation
= button_tag "Commit changes", class: 'btn commit-btn js-commit-button btn-primary'
.message
--
2.30.9