summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-29 07:29:07 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-29 07:29:07 +0000
commit3c997218f69d1309c363584979b1143eb083abb1 (patch)
treecdb1f8b514dabb1eac3e0e8c8fdec5a055ccc43d /app
parentada95df88ed845701143a0438fa0338d804c180f (diff)
parent59582aae578453a7f9888e2380a7412c4bf14f4f (diff)
downloadgitlab-ce-3c997218f69d1309c363584979b1143eb083abb1.tar.gz
Merge branch 'projects' into 'master'
page-title-fix Fixed .page-title margin See merge request !1458
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/generic/typography.scss7
-rw-r--r--app/views/projects/empty.html.haml2
2 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/stylesheets/generic/typography.scss b/app/assets/stylesheets/generic/typography.scss
index a004a6d9060..6a3cb49baae 100644
--- a/app/assets/stylesheets/generic/typography.scss
+++ b/app/assets/stylesheets/generic/typography.scss
@@ -12,6 +12,13 @@ body {
line-height: 1.3;
font-size: 1.25em;
font-weight: 600;
+}
+
+.page-title-empty {
+ margin-top: 0px;
+ line-height: 1.3;
+ font-size: 1.25em;
+ font-weight: 600;
margin: 12px 7px 12px 7px;
}
diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml
index d8f9f692c0b..e06454fd148 100644
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@@ -17,7 +17,7 @@
.prepend-top-20
.empty_wrapper
- %h3.page-title
+ %h3.page-title-empty
Command line instructions
%div.git-empty
%fieldset