Merge branch 'develop' into fix/form-errors

client/modules/IDE/actions/project.js

@@ -270,9 +270,7 @@ export function resetProject() {
 }
 
 export function newProject() {
-  setTimeout(() => {
-    browserHistory.push('/');
-  }, 0);
+  browserHistory.push('/', { confirmed: true });
   return resetProject();
 }
 

client/modules/IDE/pages/IDEView.jsx

@@ -56,7 +56,8 @@ function WarnIfUnsavedChanges() {
           isAuth(nextLocation.pathname) ||
           isAuth(currentLocation.pathname) ||
           isOverlay(nextLocation.pathname) ||
-          isOverlay(currentLocation.pathname)
+          isOverlay(currentLocation.pathname) ||
+          nextLocation.state?.confirmed
         ) {
           return true; // allow navigation
         }

client/modules/Legal/components/PolicyContainer.jsx

@@ -7,6 +7,7 @@ import { remSize, prop } from '../../../theme';
 
 const PolicyContainerMain = styled.main`
   max-width: ${remSize(700)};
+  min-height: 100vh;
   margin: 0 auto;
   padding: ${remSize(10)};
   line-height: 1.5em;

client/styles/components/_editor.scss

@@ -98,7 +98,7 @@ pre.CodeMirror-line {
     margin-left: 0;
   }
 
-  // z-index: 20;
+  z-index: 1;
 
   width: 580px;
   font-family: Montserrat, sans-serif;

client/styles/components/_nav.scss

@@ -162,21 +162,26 @@
     position: absolute;
   }
 }
-.svg__logo g > path {
+
+.svg__logo {
+
   @include themify() {
-    fill: getThemifyVariable('logo-color');
+    // Set background color of the logo
+    background-color: getThemifyVariable('logo-color');
   }
-}
-.svg__logo g g:first-of-type path {
-  fill: none;
+
 }
 
-.svg__logo g g:first-of-type use {
+.svg__logo g path{
+
   @include themify() {
+    // Set internal color of the logo;
     fill: getThemifyVariable('logo-background-color');
   }
+
 }
 
+
 .nav__keyboard-shortcut {
   font-size: #{12 / $base-font-size}rem;
   font-family: Inconsololata, monospace;

client/styles/components/_toolbar.scss

@@ -125,8 +125,12 @@
 }
 
 .toolbar__autorefresh-label {
+	cursor: pointer;
 	@include themify() {
 		color: getThemifyVariable('secondary-text-color');
+		&:hover {
+			color: getThemifyVariable('logo-color');
+		}
 	}
 	margin-left: #{5 / $base-font-size}rem;
 	font-size: #{12 / $base-font-size}rem;

client/utils/codemirror-search.js

@@ -98,16 +98,24 @@ function persistentDialog(cm, text, deflt, onEnter, replaceOpened, onKeyDown) {
 
     var upArrow = dialog.getElementsByClassName("up-arrow")[0];
     CodeMirror.on(upArrow, "click", function () {
-      cm.focus();
-      CodeMirror.commands.findPrev(cm);
-      searchField.blur();
+      if (searchField.value.trim() === "") {
+        searchField.focus();
+      } else {
+        cm.focus();
+        CodeMirror.commands.findPrev(cm);
+        searchField.blur();
+      }
     });
 
     var downArrow = dialog.getElementsByClassName("down-arrow")[0];
     CodeMirror.on(downArrow, "click", function () {
+      if (searchField.value.trim() === "") {
+        searchField.focus();
+      }else{
       cm.focus();
       CodeMirror.commands.findNext(cm);
       searchField.blur();
+      }
     });
 
     var regexpButton = dialog.getElementsByClassName("CodeMirror-regexp-button")[0];
@@ -371,7 +379,7 @@ function doSearch(cm, rev, persistent, immediate, ignoreQuery) {
       startSearch(cm, state, q);
       findNext(cm, rev);
     }
-  } else {
+  } else { 
     dialog(cm, queryDialog, 'Search for:', q, function (query) {
       if (query && !state.query)
         cm.operation(function () {