yasp is now GPLv3

yasp · Jan 3, 2014 · 974d0f6 · 974d0f6
1 parent 6818305
commit 974d0f6
Show file tree

Hide file tree

Showing 6 changed files with 694 additions and 6 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
@@ -12,3 +12,6 @@ $ grunt commandsjs
 
 # Online-Demo
 http://yasp.me/yasp/src/app/test/
+
+# License
+GPLv3 (see `LICENSE.txt`)
diff --git a/src/app/css/editor.css b/src/app/css/editor.css
@@ -123,10 +123,6 @@ span.cm-keyword {
     height: 100%;
 }
 
-#dialog_help .modal-footer {
-    margin-top: 0;
-}
-
 #help_container {
     margin-top: 10px;
     overflow-y: scroll;
@@ -170,6 +166,12 @@ span.cm-keyword {
     vertical-align: middle;
 }
 
+/* === about === */
+#dialog_about h6 {
+    font-weight: bold;
+    margin-bottom: 5px;
+}
+
 /* === other styles === */
 .toolbarcontainer {
     background-color: #f7f7f7;
@@ -202,6 +204,10 @@ span.cm-keyword {
     left: 0;
 }
 
+.modal-footer {
+    margin-top: 0;
+}
+
 /* Fix z-index bug with labellist */
 .modal {
     z-index: 100000;

diff --git a/src/app/langs/de.js b/src/app/langs/de.js
@@ -34,6 +34,7 @@ if (yasp.l10n.lang === undefined) yasp.l10n.lang = { };
         "cutting-edge Debugger and highly sophisticated assembler. The development suit " +
         "aims to make learning assembler programming easy and accessible for everyone.",
     "editor.about.version": "Version",
+    "editor.about.license": "Lizenz",
     "editor.about.team": "Team",
     "editor.about.specialthanks": "Besonderer Dank geht an",
     "editor.about.logo": "Logo",

diff --git a/src/app/langs/en.js b/src/app/langs/en.js
@@ -36,6 +36,7 @@ if (yasp.l10n.lang === undefined) yasp.l10n.lang = { };
       "cutting-edge Debugger and highly sophisticated assembler. The development suit " +
       "aims to make learning assembler programming easy and accessible for everyone.",
     "editor.about.version": "Version",
+    "editor.about.license": "License",
     "editor.about.team": "Team",
     "editor.about.specialthanks": "Special Thanks",
     "editor.about.logo": "Logo",

diff --git a/src/index.html b/src/index.html
@@ -143,6 +143,11 @@ <h6 data-l10n="editor.about.version"></h6>
                         <ul>
                             <li>0.6 BETA</li>
                         </ul>
+                        <h6 data-l10n="editor.about.license"></h6>
+                        <ul>
+                            <li>GPLv3</li>
+                            <li>&copy; 2013, 2014 Michael Lutonsky, Robert Fischer</li>
+                        </ul>
                         <h6 data-l10n="editor.about.team"></h6>
                         <ul>
                             <li><a href="http://luto.at/" target="_blank">Michael Lutonsky</a></li>
@@ -161,8 +166,6 @@ <h6 data-l10n="editor.about.logo"></h6>
                             <li><span data-l10n="editor.about.logo.font"></span>: <a href="http://www.dafont.com/digital-7.font" target="_blank">Digital 7</a> (Free for personal use)</li>
                             <li>Created with Inkscape (<a href="http://inkscape.org/" target="_blank">http://inkscape.org/</a>)</li>
                         </ul>
-                        <br>
-                        <p>&copy; 2013, 2014 Michael Lutonsky, Robert Fischer</p>
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>