From 8826d3c8667c32ec5adb14156c4ef221e56a8bf9 Mon Sep 17 00:00:00 2001
From: barlas <yannisbarlas@gmail.com>
Date: Tue, 21 Mar 2017 18:40:40 +0200
Subject: [PATCH] line height should always be double spaced
---
app/components/SimpleEditor/Editor.js | 8 ++------
app/components/SimpleEditor/SimpleEditor.scss | 19 +------------------
.../elements/comment/comment.scss | 3 ++-
.../panes/Comments/commentsPane.scss | 3 ++-
4 files changed, 7 insertions(+), 26 deletions(-)
diff --git a/app/components/SimpleEditor/Editor.js b/app/components/SimpleEditor/Editor.js
index a94e42f..72fc9d5 100644
--- a/app/components/SimpleEditor/Editor.js
+++ b/app/components/SimpleEditor/Editor.js
@@ -58,8 +58,8 @@ class Editor extends ProseEditor {
}
render ($$) {
- const { trackChangesView } = this.state
- const canToggleTrackChanges = this.canToggleTrackChanges()
+ // const { trackChangesView } = this.state
+ // const canToggleTrackChanges = this.canToggleTrackChanges()
const el = $$('div').addClass('sc-prose-editor')
@@ -138,10 +138,6 @@ class Editor extends ProseEditor {
)
)
- if (trackChangesView && canToggleTrackChanges) {
- el.addClass('track-changes-mode')
- }
-
const modal = $$(ModalWarning, {
width: 'medium',
textAlign: 'center'
diff --git a/app/components/SimpleEditor/SimpleEditor.scss b/app/components/SimpleEditor/SimpleEditor.scss
index 92210ae..f363e65 100644
--- a/app/components/SimpleEditor/SimpleEditor.scss
+++ b/app/components/SimpleEditor/SimpleEditor.scss
@@ -38,24 +38,6 @@ $active-blue: #4a90e2;
width: 20%;
z-index: 9999;
}
-
- .track-changes-mode {
- div.se-content {
- line-height: 38px;
- }
-
- .sc-prose-editor-overlay-tools .se-active-tools .sc-comment-icon {
- top: 0;
- }
-
- .sc-comment-pane-list li .comment-list .single-comment-row {
- padding: 3px 12px;
- }
-
- .sc-overlay .se-active-tools .sc-overlay-bubble .sc-comment-icon {
- top: 0;
- }
- }
}
.sc-prose-editor {
@@ -279,6 +261,7 @@ $active-blue: #4a90e2;
box-shadow: 0 0 8px $dark-gray;
color: $transparent-black;
font-family: 'Fira Sans';
+ line-height: 38px;
margin: 1.5% 17.8% 7%;
min-height: 100vh;
padding: 3% 4% 1%;
diff --git a/app/components/SimpleEditor/elements/comment/comment.scss b/app/components/SimpleEditor/elements/comment/comment.scss
index 65df65a..6aadfc8 100644
--- a/app/components/SimpleEditor/elements/comment/comment.scss
+++ b/app/components/SimpleEditor/elements/comment/comment.scss
@@ -40,7 +40,8 @@ $white: #fff;
font-size: 20px;
left: 8px;
position: relative;
- top: 6.7px;
+ // top: 6.7px;
+ top: 0;
}
.action-icon {
diff --git a/app/components/SimpleEditor/panes/Comments/commentsPane.scss b/app/components/SimpleEditor/panes/Comments/commentsPane.scss
index eac574c..98205dc 100644
--- a/app/components/SimpleEditor/panes/Comments/commentsPane.scss
+++ b/app/components/SimpleEditor/panes/Comments/commentsPane.scss
@@ -82,7 +82,8 @@ $white: #fff;
.single-comment-row {
border-bottom: 1px solid $dark-gray;
- padding: 10px 12px;
+ // padding: 10px 12px;
+ padding: 3px 12px;
.sc-comment-entry {
width: 88%;
--
GitLab