From d75c6135e49d5e83192019bdb4dcadfe2a4a6ff0 Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Fri, 8 Sep 2017 01:07:50 +0300 Subject: RepoEditor: Fix empty state for image blob view. --- app/assets/stylesheets/pages/repo.scss | 7 +++++++ app/views/projects/blob/viewers/_download.html.haml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 69abb13add4..cc3fbf4aa66 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -84,6 +84,13 @@ } } + .blob-no-preview { + .vertical-center { + justify-content: center; + width: 100%; + } + } + &.edit-mode { .blob-viewer-container { overflow: hidden; diff --git a/app/views/projects/blob/viewers/_download.html.haml b/app/views/projects/blob/viewers/_download.html.haml index 6d1138f7959..253566c43be 100644 --- a/app/views/projects/blob/viewers/_download.html.haml +++ b/app/views/projects/blob/viewers/_download.html.haml @@ -1,5 +1,5 @@ .file-content.blob_file.blob-no-preview - .center + .center.render-error.vertical-center = link_to blob_raw_path do %h1.light = icon('download') -- cgit v1.2.1 From fff151260af94c84895e7dd8471d087675d4b4b0 Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Tue, 12 Sep 2017 01:59:19 +0300 Subject: RepoEditor: Fix active line hilite color. --- app/assets/stylesheets/pages/repo.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index cc3fbf4aa66..a86568a8c5e 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -71,6 +71,11 @@ height: 100%; .monaco-editor.vs { + .current-line { + border: none; + background: #f1f1f2; + } + .line-numbers { cursor: pointer; -- cgit v1.2.1 From 6457f6c7e85e4399a8e1d60ccd76a30ef2f9edcd Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Tue, 12 Sep 2017 01:59:31 +0300 Subject: RepoEditor: Fix markdown preview rendering. --- app/assets/stylesheets/pages/repo.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index a86568a8c5e..7dfcf7b7d9c 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -73,7 +73,7 @@ .monaco-editor.vs { .current-line { border: none; - background: #f1f1f2; + background: $well-light-border; } .line-numbers { @@ -115,7 +115,7 @@ overflow: auto; > div, - .file-content { + .file-content:not(.wiki) { display: flex; } -- cgit v1.2.1