Merge branch 'master' into #1044-Text-Tool-Add-special-symbols

# Conflicts:
#	packages/ketcher-react/src/icons/index.tsx

packages/ketcher-core/src/application/editor/operations/rgroup/RGroupAttr.ts

@@ -38,6 +38,11 @@ export class RGroupAttr extends BaseOperation {
     const { rgid, attribute, value } = this.data
 
     const rgp = restruct.molecule.rgroups.get(rgid)!
+
+    if (!rgp) {
+      return
+    }
+
     if (!this.data2) {
       this.data2 = {
         rgid,

packages/ketcher-react/src/Editor.module.less

@@ -36,7 +36,7 @@
   position: relative;
   font: @base-size FreeSans, Arimo, 'Droid Sans', Helvetica, 'Helvetica Neue',
     Arial, sans-serif;
-  background-color: white;
+  background-color: @light-background-color;
   color: @main-color;
   min-width: 640px;
   min-height: 400px;
@@ -54,17 +54,16 @@
     border-radius: 4px;
     display: inline-block;
     vertical-align: middle;
-    background: white;
+    background: @light-background-color;
     line-height: 20 / 14;
     height: 2.4em;
     padding: 0.35em 0.15em 0.35em 0.3em;
     border: none;
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
     box-sizing: border-box;
 
     &:active,
     &:focus {
-      outline: 1px solid @active-color;
+      outline: 1px solid @main-color;
     }
 
     &:hover,
@@ -76,7 +75,7 @@
     &[readonly],
     fieldset[disabled] & {
       cursor: not-allowed;
-      background: #efefef;
+      background: @gray-background-color;
       opacity: 0.6;
     }
   }
@@ -88,7 +87,7 @@
     border-radius: 4px;
     display: inline-block;
     vertical-align: middle;
-    background: white;
+    background: @light-background-color;
     line-height: 20 / 14;
     height: 32px;
     padding: 0.35em 0.15em 0.35em 0.3em;

packages/ketcher-react/src/icons/index.tsx

@@ -112,6 +112,24 @@ import ZoomInIcon from './files/zoom-in.svg'
 import ZoomOutIcon from './files/zoom-out.svg'
 import FunctionalGroupsIcon from './files/functional-groups.svg'
 import TextSpecialSymbolsIcon from './files/text-special-symbols.svg'
+import Save1Icon from './files/save-1.svg'
+import Open1Icon from './files/open-1.svg'
+import ResetIcon from './files/reset.svg'
+import CloseIcon from './files/close.svg'
+import GeneralIcon from './files/general.svg'
+import GeneralWhiteIcon from './files/general-white.svg'
+import StereoIcon from './files/stereo.svg'
+import StereoWhiteIcon from './files/stereo-white.svg'
+import AtomsIcon from './files/atoms.svg'
+import AtomsWhiteIcon from './files/atoms-white.svg'
+import BondsIcon from './files/bonds.svg'
+import BondsWhiteIcon from './files/bonds-white.svg'
+import ServerIcon from './files/server.svg'
+import ServerWhiteIcon from './files/server-white.svg'
+import ThreeDViewerIcon from './files/3d.svg'
+import ThreeDViewerWhiteIcon from './files/3d-white.svg'
+import DebuggingIcon from './files/debugging.svg'
+import DebuggingWhiteIcon from './files/debugging-white.svg'
 
 const icons = {
   about: AboutIcon,
@@ -218,8 +236,26 @@ const icons = {
   'shape-rectangle': ShapeRectangleIcon,
   'shape-polyline': ShapePolylineIcon,
   'shape-line': ShapeLineIcon,
-  'text-special-symbols': TextSpecialSymbolsIcon,
-  'not-found': NotFoundIcon
+  'not-found': NotFoundIcon,
+  'save-1': Save1Icon,
+  'open-1': Open1Icon,
+  reset: ResetIcon,
+  close: CloseIcon,
+  general: GeneralIcon,
+  'general-white': GeneralWhiteIcon,
+  stereo: StereoIcon,
+  'stereo-white': StereoWhiteIcon,
+  atoms: AtomsIcon,
+  'atoms-white': AtomsWhiteIcon,
+  bonds: BondsIcon,
+  'bonds-white': BondsWhiteIcon,
+  server: ServerIcon,
+  'server-white': ServerWhiteIcon,
+  '3dviewer': ThreeDViewerIcon,
+  '3dviewer-white': ThreeDViewerWhiteIcon,
+  debugging: DebuggingIcon,
+  'debugging-white': DebuggingWhiteIcon,
+  'text-special-symbols': TextSpecialSymbolsIcon
 }
 
 function emptyIcon() {

packages/ketcher-react/src/script/ui/component/cliparea/cliparea.module.less

@@ -19,7 +19,7 @@
   // Search for less verbose way to make FF happy
   position: absolute;
   bottom: 0;
-  left: 0;
+  left: -50px;
   width: 0;
   height: 0;
   display: block;