From d473b4e57e59b84a123e74149d9e2f24f8d801e4 Mon Sep 17 00:00:00 2001
From: john <johnbarlas39@gmail.com>
Date: Fri, 13 Jan 2017 20:18:06 +0200
Subject: [PATCH] merge two css files for images into one
---
app/components/SimpleEditor/elements/elements.scss | 1 -
app/components/SimpleEditor/elements/images/image.scss | 7 ++++++-
.../SimpleEditor/elements/images/insert-image-tool.scss | 5 -----
3 files changed, 6 insertions(+), 7 deletions(-)
delete mode 100644 app/components/SimpleEditor/elements/images/insert-image-tool.scss
diff --git a/app/components/SimpleEditor/elements/elements.scss b/app/components/SimpleEditor/elements/elements.scss
index 520be25..b19c57b 100644
--- a/app/components/SimpleEditor/elements/elements.scss
+++ b/app/components/SimpleEditor/elements/elements.scss
@@ -11,4 +11,3 @@
@import './track_change/trackChange';
@import './images/image';
-@import './images/insert-image-tool';
diff --git a/app/components/SimpleEditor/elements/images/image.scss b/app/components/SimpleEditor/elements/images/image.scss
index 87cc681..039f783 100644
--- a/app/components/SimpleEditor/elements/images/image.scss
+++ b/app/components/SimpleEditor/elements/images/image.scss
@@ -11,7 +11,6 @@
height: 300px;
width: 400px;
}
-
}
.sc-isolated-node.sm-image {
@@ -22,3 +21,9 @@
width: 100%;
}
}
+
+.sc-insert-image-tool > input {
+ left: -1000px;
+ position: fixed;
+ top: -1000px;
+}
diff --git a/app/components/SimpleEditor/elements/images/insert-image-tool.scss b/app/components/SimpleEditor/elements/images/insert-image-tool.scss
deleted file mode 100644
index d870d20..0000000
--- a/app/components/SimpleEditor/elements/images/insert-image-tool.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.sc-insert-image-tool > input {
- left: -1000px;
- position: fixed;
- top: -1000px;
-}
--
GitLab