Merge pull request #63 from nm-t/master

egaga · web-flow · commit 58eca38031a9 · 2018-08-26T18:39:48.000+03:00
[FEAT] Added minor styling to keyboard
diff --git a/css/css.css b/css/css.css
diff --git a/css/development.css b/css/development.css
diff --git a/css/problems.css b/css/problems.css
diff --git a/css/test.css b/css/test.css
diff --git a/css/tutorial.css b/css/tutorial.css
diff --git a/css/virtual_keyboard.css b/css/virtual_keyboard.css
@@ -21,6 +21,12 @@
 }
 
 .keyboard_wrapper {
+    user-select: none;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    font-family: sans-serif;
+    font-size: 14px;
     margin-left: 78px;
     width: 730px;
 }
@@ -75,6 +81,18 @@
     box-shadow: 2px 2px 2px black;
 }
 
+.keyButton.medium {
+    width: 62px;
+}
+
+.keyButton.large {
+    width: 88px;
+}
+
+.keyButton.space {
+    width: 355px;
+}
+
 .keyButton.pressed_down {
     box-shadow: none;
     background-color: #555 !important;
diff --git a/development.html b/development.html
@@ -4,7 +4,7 @@
 <head>
   <meta charset='utf-8' />
   <title>Open Vim</title>
-  <link rel="stylesheet" type="text/css" href="development.css?version={VERSION}" />
+  <link rel="stylesheet" type="text/css" href="css/development.css?version={VERSION}" />
   
   <script type="text/javascript">
 		var _gaq = _gaq || [];
diff --git a/js/tutorial/init_tutorial.js b/js/tutorial/init_tutorial.js
@@ -64,6 +64,8 @@ function init_tutorial() {
       }
     });
 
+    updateModifierKeys();
+
     var tutorial = createTutorial($(this), interpreter, messager, doc);
     register_VIM_TUTORIAL_SECTIONS(interpreter, messager,
                                    tutorial.createSection, tutorial.registerSection, tutorial.showCommandOneByOne, doc);
@@ -75,3 +77,14 @@ function init_tutorial() {
     });
   });
 }
+
+function updateModifierKeys() {
+  addSizeClass('caps', 'medium');
+  addSizeClass('Enter', 'medium');
+  addSizeClass('shift', 'large');
+  addSizeClass('Space', 'space');
+}
+
+function addSizeClass(key, size){
+  $(".keyButton:contains('" + key + "')").addClass(size);
+}
diff --git a/js/virtual_keyboard.js b/js/virtual_keyboard.js
@@ -26,7 +26,7 @@ function create_VIM_VIRTUAL_KEYBOARD() {
     two('9', ')'), two('0', '=')];
   var tabRow = ['tab', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', {key: 'Backspace', label: '<='}];
   var capslockRow = ['caps', 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', '*', 'Enter'];
-  var shiftRow = ['shift', two('>', '<'), 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.'];
+  var shiftRow = ['shift', 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', two('>', '<')];
   var bottomRow = ['ctrl', 'alt', 'Space'];
 
   function createKeyButton(key) {
@@ -38,16 +38,14 @@ function create_VIM_VIRTUAL_KEYBOARD() {
     else if(key.primary !== undefined) {
       var $key = $('<div />', { 'text': (key.primary + " " + key.secondary), 'class': 'keyButton' });
       $key.data('keyboard', key.primary);
-      return $key;
     } else if(key.key !== undefined) {
       var $key = $('<div />', { 'text': key.label, 'class': 'keyButton' });
       $key.data('keyboard', key.key);
-      return $key;
     } else {
       var $key = $('<div />', { 'text': key, 'class': 'keyButton' });
       $key.data('keyboard', key);
-      return $key;
     }
+    return $key;
   }
 
   function createRow(row) {
diff --git a/problems.html b/problems.html
@@ -3,8 +3,8 @@
 <html lang='en' xmlns='http://www.w3.org/1999/xhtml'> 
 <head>
   <meta charset='utf-8' />
-  <link rel="stylesheet" type="text/css" href="css.css?version={VERSION}" />
-  <link rel="stylesheet" type="text/css" href="problems.css?version={VERSION}" />
+  <link rel="stylesheet" type="text/css" href="css/css.css?version={VERSION}" />
+  <link rel="stylesheet" type="text/css" href="css/problems.css?version={VERSION}" />
 
   <title>Interactive Vim tutorial - problems</title>
 
diff --git a/sandbox.html b/sandbox.html
@@ -3,7 +3,7 @@
 <html lang='en' xmlns='http://www.w3.org/1999/xhtml'> 
 <head>
   <meta charset='utf-8' />
-  <link rel="stylesheet" type="text/css" href="css.css?version={VERSION}" />
+  <link rel="stylesheet" type="text/css" href="css/css.css?version={VERSION}" />
   <title>Interactive Vim tutorial - sandbox</title>
 
   <!-- GENERAL (mostly) -->
diff --git a/tests.html b/tests.html
@@ -3,8 +3,8 @@
 <html lang='en' xmlns='http://www.w3.org/1999/xhtml'> 
 <head>
   <meta charset='utf-8' />
-  <link rel="stylesheet" type="text/css" href="css.css?version={VERSION}" />
-  <link rel="stylesheet" type="text/css" href="test.css?version={VERSION}" />
+  <link rel="stylesheet" type="text/css" href="css/css.css?version={VERSION}" />
+  <link rel="stylesheet" type="text/css" href="css/test.css?version={VERSION}" />
   <title>Interactive Vim tutorial - testing</title>
 
   <!-- GENERAL (mostly) -->
diff --git a/toproduction.sh b/toproduction.sh
@@ -1,2 +1,2 @@
-cp -R -v *.css *.html *.gif js production
+cp -R -v *.html *.gif css js production
 ./setversion.sh
diff --git a/tutorial.html b/tutorial.html
@@ -3,9 +3,9 @@
 <html lang='en' xmlns='http://www.w3.org/1999/xhtml'> 
 <head>
   <meta charset='utf-8' />
-  <link rel="stylesheet" type="text/css" href="css.css?version={VERSION}" />
-  <link rel="stylesheet" type="text/css" href="tutorial.css?version={VERSION}" />
-  <link rel="stylesheet" type="text/css" href="virtual_keyboard.css?version={VERSION}" />
+  <link rel="stylesheet" type="text/css" href="css/css.css?version={VERSION}" />
+  <link rel="stylesheet" type="text/css" href="css/tutorial.css?version={VERSION}" />
+  <link rel="stylesheet" type="text/css" href="css/virtual_keyboard.css?version={VERSION}" />
     
   <title>Interactive Vim tutorial</title>
 
diff --git a/twosandboxes.html b/twosandboxes.html
@@ -3,7 +3,7 @@
 <html lang='en' xmlns='http://www.w3.org/1999/xhtml'> 
 <head>
   <meta charset='utf-8' />
-  <link rel="stylesheet" type="text/css" href="css.css?version={VERSION}" />
+  <link rel="stylesheet" type="text/css" href="css/css.css?version={VERSION}" />
   <title>Interactive Vim tutorial - two sandboxes</title>
 
   <!-- GENERAL (mostly) -->

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-cp -R -v .css .html *.gif js production`
	`1`	`+cp -R -v .html .gif css js production`
`2`	`2`	`./setversion.sh`