css - changed border to outline + remove padding

xcorecms · Aug 23, 2017 · 0a211e3 · 0a211e3
1 parent d4b2ee4
commit 0a211e3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/client-side/dist/inline.css b/client-side/dist/inline.css
@@ -5,27 +5,28 @@
   transition: all 0.3s ease;
 }
 .inline-editing {
-  border: 1px dotted #6393b5;
-  padding: 0 12px;
+  outline: 1px dotted #6393b5;
 }
 .inline-editing:focus {
-  border: 1px solid #d3dbe4;
-  outline: none;
+  outline: 1px solid #d3dbe4;
 }
 .inline-editing a {
   cursor: text;
 }
 .inline-editing.inline-content-success {
   background-color: rgba(0, 182, 109, 0.1);
-  border-color: #00b66d;
+  outline-color: #00b66d;
 }
 .inline-editing.inline-content-warning {
   background-color: rgba(182, 160, 12, 0.1);
-  border-color: #b6b357;
+  outline-color: #b6b357;
 }
 .inline-editing.inline-content-error {
   background-color: rgba(216, 32, 43, 0.1);
-  border-color: #d8202b;
+  outline-color: #d8202b;
+}
+.inline-editing-tinymce.mce-content-body {
+  line-height: inherit;
 }
 .inline-error-msg {
   font-weight: bold;

diff --git a/client-side/src/less/inline.less b/client-side/src/less/inline.less
@@ -6,12 +6,10 @@
 }
 
 .inline-editing {
-  border: 1px dotted #6393b5;
-  padding: 0 12px;
+  outline: 1px dotted #6393b5;
 
   &:focus {
-    border: 1px solid #d3dbe4;
-    outline: none;
+    outline: 1px solid #d3dbe4;
   }
 
   a {
@@ -20,17 +18,24 @@
 
   &.inline-content-success {
     background-color: rgba(0, 182, 109, 0.1);
-    border-color: #00b66d;
+    outline-color: #00b66d;
   }
 
   &.inline-content-warning {
     background-color: rgba(182, 160, 12, 0.1);
-    border-color: #b6b357;
+    outline-color: #b6b357;
   }
 
   &.inline-content-error {
     background-color: rgba(216, 32, 43, 0.1);
-    border-color: #d8202b;
+    outline-color: #d8202b;
+  }
+}
+
+// override tinymce 1.3
+.inline-editing-tinymce {
+  &.mce-content-body {
+    line-height: inherit;
   }
 }
 
@@ -164,4 +169,4 @@
 .inline-icon-progress:before {
   content: url("font/loader.gif");
   color: grey;
-}
+}