summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-22 15:21:34 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-22 15:21:34 +0000
commitc2db73b6990e92b5ac9887c1b39fa578a3c18836 (patch)
tree70657fd35301f97564f3fbde921686d09da5a609 /app/assets
parent01315cfe760e3a278415842a5bec0d62e02ac8c5 (diff)
parent097238f0a5f6735b7f0596e2283068be17d39e91 (diff)
downloadgitlab-ce-c2db73b6990e92b5ac9887c1b39fa578a3c18836.tar.gz
Merge branch 'project-readme-edit' into 'master'
Restore edit button in project readme Also make sure edit button can actually be clicked, like !1668. See merge request !1670
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/pages/projects.scss8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 41bea0ec5c8..27bedea0e1f 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -544,5 +544,13 @@ pre.light-well {
}
.project-show-readme .readme-holder {
+ margin-left: -$gl-padding;
+ margin-right: -$gl-padding;
+ padding: $gl-padding;
border-top: 0;
+
+ .edit-project-readme {
+ z-index: 100;
+ position: relative;
+ }
}