bump version to 1.3.0

MARIE-js · Jun 11, 2020 · 49bfc7e · 49bfc7e
1 parent 04ca137
commit 49bfc7e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/MARIE-js/MARIE.js.svg?branch=master)](https://travis-ci.org/MARIE-js/MARIE.js) [![Gitter chat](https://badges.gitter.im/MARIE-js/gitter.png)](https://gitter.im/MARIE-js/Lobby) [![npm version](https://badge.fury.io/js/npm.svg)](https://badge.fury.io/js/npm)
 ==============
-Current version: `1.2.0`
+Current version: `1.3.0`
 
 MARIE.js is an implementation of a simulator for a 'Machine Architecture that is Really Intuitive and Easy'
 from [The Essentials of Computer Organization and Architecture](https://books.google.com.au/books/about/The_Essentials_of_Computer_Organization.html?id=3kQoAwAAQBAJ&redir_esc=y) (Linda Null, Julia Lobur) in JavaScript.

diff --git a/build/about.html b/build/about.html
@@ -90,7 +90,7 @@
 
         <main>
             <div id="about" class="container">
-      				<h1 class="center">MARIE.js <span class="version">v1.2.0</span></h1>
+      				<h1 class="center">MARIE.js <span class="version">v1.3.0</span></h1>
       				<h2>About MARIE</h2>
       				<p>MARIE ('Machine Architecture that is Really Intuitive and Easy') is a machine architecture and assembly language from <a href="https://books.google.com.au/books/about/The_Essentials_of_Computer_Organization.html?id=3kQoAwAAQBAJ&redir_esc=y" target="_blank">The Essentials of Computer Organization and Architecture</a> (Linda Null, Julia Lobur). The publisher provides a set of <a href="http://computerscience.jbpub.com/ecoa/3e/simulators.aspx">simulators for the machine</a>, written in Java. However, since using simulators can be rather difficult, we have implemented a web-based version, so that students are able to access it readily and easily. Since beginning the project we have added many features such as importing and exporting of Marie Assembly Source files (*.mas) to provide compatibility with the existing simulators.</p>
                       <br>
@@ -133,7 +133,7 @@ <h2>License</h2>
                       <h4 class="modal-title"> MARIE.js | <i class="fa fa-hashtag"></i> Current Version</h4>
                   </div>
                   <div class="modal-body">
-                      <p>This version of <strong>MARIE.js</strong> is: v1.2.0</p>
+                      <p>This version of <strong>MARIE.js</strong> is: v1.3.0</p>
                   </div>
               </div>
           </div>

diff --git a/build/index.html b/build/index.html
@@ -66,6 +66,7 @@
               <li><a href="./?addition"><span class="fa fa-plus"></span> Addition</a></li>
               <li><a href="./?multiply"><span class="fa fa-times"></span> Multiply</a></li>
               <li><a href="./?quicksort"><span class="fa fa-sort"></span> Quicksort</a></li>
+              <li><a href="./?unicode"><span class="fa fa-font"></span> Unicode</a></li>
           </ul>
       </li>
       <li class="dropdown">
@@ -216,7 +217,7 @@
                                       <select id="output-select" class="output-type">
                                           <option>HEX</option>
                                           <option>DEC</option>
-                                          <option>UNICODE</option>
+                                          <option>UNICODE (UTF-16BE)</option>
                                           <option>BIN</option>
                                       </select>
                                       <hr>
@@ -242,7 +243,7 @@
                                       <select id="input-list-select" class="output-type">
                                           <option>HEX</option>
                                           <option>DEC</option>
-                                          <option>UNICODE</option>
+                                          <option>UNICODE (UTF-16BE)</option>
                                           <option>BIN</option>
                                       </select>
                                   </div>
@@ -335,7 +336,7 @@ <h4>Input Value</h4>
                         <h4 class="modal-title">MARIE.js | <i class="fa fa-hashtag"></i> Current Version</h4>
                     </div>
                     <div class="modal-body">
-                        <p>This version of <strong>MARIE.js</strong> is: v1.2.0</p>
+                        <p>This version of <strong>MARIE.js</strong> is: v1.3.0</p>
                     </div>
                 </div>
             </div>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "MARIE.js",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "MARIE.js is an implementation of a simulator for a 'Machine Architecture that is Really Intuitive and Easy' from The Essentials of Computer Organization and Architecture (Linda Null, Julia Lobur) in JavaScript.",
   "main": "main.js",
   "scripts": {

diff --git a/src/css/styleDark.css b/src/css/styleDark.css
@@ -127,7 +127,6 @@ button[disabled=disabled], button:disabled {
 }
 
 .output-type {
-    width:100px;
     text-align: right;
     color: inherit;
     bottom:100%;

diff --git a/src/css/styleLight.css b/src/css/styleLight.css
@@ -500,7 +500,6 @@ codeblock {
 }
 
 .output-type {
-    width:100px;
     text-align: right;
     background-color: inherit;
     color: inherit;