Permalink
Browse files

yasp is now GPLv3

  • Loading branch information...
luto committed Jan 3, 2014
1 parent 6818305 commit 974d0f6df9112ddf19032774100c06743caef8f3
Showing with 694 additions and 6 deletions.
  1. +674 −0 LICENSE.txt
  2. +3 −0 README.md
  3. +10 −4 src/app/css/editor.css
  4. +1 −0 src/app/langs/de.js
  5. +1 −0 src/app/langs/en.js
  6. +5 −2 src/index.html
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -12,3 +12,6 @@ $ grunt commandsjs
# Online-Demo
http://yasp.me/yasp/src/app/test/
+
+# License
+GPLv3 (see `LICENSE.txt`)
View
@@ -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;
View
@@ -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",
View
@@ -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",
View
@@ -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>

0 comments on commit 974d0f6

Please sign in to comment.