From 862dbea4b128cb89d4964cfd12f8d6fc0f3d4131 Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 2 Feb 2015 19:34:47 +0100 Subject: [PATCH] cosmetics and version number is now better --- .../_dark.sassc | Bin 6138 -> 6719 bytes .../main.sassc | Bin 46014 -> 46251 bytes assets/css/_dark.sass | 3 +++ assets/css/main.css | 6 +++++- assets/css/main.sass | 1 + assets/js/main.coffee | 5 +++++ assets/js/main.js | 7 ++++++- config.codekit | 9 +++++++++ index.html | 2 +- index.jade | 2 +- 10 files changed, 31 insertions(+), 4 deletions(-) diff --git a/assets/css/.sass-cache/2d0411df462de46f5efe3b5ca6d99acee5b9782a/_dark.sassc b/assets/css/.sass-cache/2d0411df462de46f5efe3b5ca6d99acee5b9782a/_dark.sassc index e8062c9eec3a50087551c61f3f2c3a1c198f461f..2901336538399ef57bf5a2c9b7cc231383f8b72b 100644 GIT binary patch delta 421 zcmeyRzu#nnq=u21g^6WSilv32rKyR9S)!SVk&(G!vT3SiT8crEk(s5Lu|=Y}x$#6t zbw+`WnH{3y`PQ0z)>_eQo=QSV`6-nOdS$6a#hLk&HM!&@+48LoIITH6l{i6CY}TA1 z)`kYwqL~Vl1^84ZpXcS%=dzYDu$BdjS*th*=3DD?TkA#x^%-%1^zlFp%L8kL>I>(# zmd>}9WCxnVW-XN|jA{bNbdX8bruo+5oYoRhl?p(WY;b)b9#9`pm8^r1wOJ;EHCr^> zTAGQev6-=nsinE8xj~|tL0X!Txk<8#g^`&-is3{@ ubw>V;nH{16R(uX6sksF?i6yC?N=)wY;wNqv;YLIN}=tn1{UBw z47e-d!>E>B=A>?}@EBL*=4AO?v5Q&epz15t@mQlyT`g4P9l@1$0cT@)bo>nGGqU?C2 zl4v$blq87?lSHBSVGX#Ks$l1t5_(@rK{BsnW8y?Hw5ygM9fQmB4Y^$uU<~9QgC<4; z?!nluar@6djBdvSV-qU9afszC$DFjN23ODN4#c=CFI4n<~ta8via)BJ z+MGU7nDPY!LQwGB_IkvA@1)l|;PHvUiQwR*Fd66Zj4s?|G{wCRwJBNewfSxmrH_e$hdm9DjbAUzOMysrI;3 zr(CZhw^emxc>=zMoEH5B%nrA?8GKr!wKqzQD89*W#%ZgBrOn?YN6!s4!`X!^Ok9CQ zze)=|M0bHXWHZGT_&A2Q#sK$8SCiC#dpjHL{Ucl4{b2KLW8x|x)oIE8#v-B`+X z>o4TG@hL@(rKau_O`Qby%Taz^AGwYmYEVnU(guAI4sN^|X3}K7y;>8?q?G~F^hTVb2m{gwHGYyM|;Vsd&wz-<;Y+;?O-{ym-}2^|MI+cs5}|U&_xZE zSB5&qUPGc7ZRzx34 z4@4r>jv`&Q45F63Ny;9HTDg)wwuEA-vP input body.dark .settings, body.dark .info, body.dark .stats background-color: $dark_background + color: $dark_primary + +body .version color: $dark_primary \ No newline at end of file diff --git a/assets/css/main.css b/assets/css/main.css index 9b2567c..24053fa 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -73,6 +73,9 @@ body.dark .settings, body.dark .info, body.dark .stats { background-color: #303030; color: #FFC107; } +body .version { + color: #FFC107; } + * { -webkit-transition: background-color 0.3s; -moz-transition: background-color 0.3s; @@ -245,7 +248,8 @@ input { animation: slide-out 0.5s; } .version { - margin-top: 30px; } + margin-top: 30px; + color: #21a1e1; } .wrapper-more { margin-top: 28px; } diff --git a/assets/css/main.sass b/assets/css/main.sass index 506fa27..f469fbb 100644 --- a/assets/css/main.sass +++ b/assets/css/main.sass @@ -167,6 +167,7 @@ input .version margin-top: 30px + color: $blue .wrapper-more margin-top: 28px diff --git a/assets/js/main.coffee b/assets/js/main.coffee index 15cd78f..39c8199 100644 --- a/assets/js/main.coffee +++ b/assets/js/main.coffee @@ -1,3 +1,5 @@ +version = '0.1.2' + selection = [] lektionen = [] currQ = {} @@ -195,6 +197,9 @@ save_wrongs = () -> true $ -> + $('.version').html 'v' + version + console.log 'Stammformen by Ben Bals' + console.log 'Version: v' + version $('.start').addClass('slide-in') setTimeout -> $('.start').removeClass('slide-in') diff --git a/assets/js/main.js b/assets/js/main.js index 2f75e6a..dbcd4fe 100644 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript 1.8.0 (function() { - var add_lektion, add_lektionen, add_points, add_to_wrong, add_wrong, all_data, change_theme, check, currQ, data, learn_wrongs, lektionen, li_listeners, load_lektions, newQ, random, remove_lektion, remove_wrong, save_lektions, save_wrongs, selection, wrongs; + var add_lektion, add_lektionen, add_points, add_to_wrong, add_wrong, all_data, change_theme, check, currQ, data, learn_wrongs, lektionen, li_listeners, load_lektions, newQ, random, remove_lektion, remove_wrong, save_lektions, save_wrongs, selection, version, wrongs; data = { 1: ['agere, ago, egi, actum', 'audire, audio, audivi, auditum', 'esse, sum, fui, -', 'invenire, invenio, inveni, inventum', 'iuvare, iuvo, iuvi, iutum', 'ludere, ludo, lusi, lusum', 'reprehendere, reprehendo, reprehendi, reprehensum', 'respondere, respondeo, respondi, responsum', 'sedere, sedeo, sedi, sessum', 'tacere, taceo, tacui, tacitum', 'venire, venio, veni, ventum', 'videre, video, vidi, visum'], @@ -35,6 +35,8 @@ 30: ['ardere, ardeo, arsi, -', 'avertere, averto, averti, aversum', 'componere, compono, composui, compositum', 'conscribere, conscribo, conscripsi, conscriptum', 'differre, differo, distuli, dilatum', 'ferre, fero, tuli, latum', 'inferre, infero, intuli, illatum', 'offerre, offero, obtuli, oblatum', 'perferre, perfero, pertuli, perlatum', 'perspicere, perspicio, perspexi, perspectum', 'praeferre, praefero, praetuli, praelatum', 'referre, refero, rettuli, relatum', 'servire, servio, servivi, servitum'] }; + version = '0.1.2'; + selection = []; lektionen = []; @@ -270,6 +272,9 @@ $(function() { var i, key, val, _i, _len, _ref; + $('.version').html('v' + version); + console.log('Stammformen by Ben Bals'); + console.log('Version: v' + version); $('.start').addClass('slide-in'); setTimeout(function() { return $('.start').removeClass('slide-in'); diff --git a/config.codekit b/config.codekit index 89c9c5c..76c6734 100644 --- a/config.codekit +++ b/config.codekit @@ -96,6 +96,15 @@ "outputStyle": 0, "syntaxCheckerStyle": 1 }, + "\/index.html": { + "fileType": 8192, + "ignore": 1, + "ignoreWasSetByUser": 0, + "inputAbbreviatedPath": "\/index.html", + "outputAbbreviatedPath": "No Output Path", + "outputPathIsOutsideProject": 0, + "outputPathIsSetByUser": 0 + }, "\/index.jade": { "compileDebug": 1, "fileType": 512, diff --git a/index.html b/index.html index 492c6ce..32714ce 100644 --- a/index.html +++ b/index.html @@ -13,7 +13,7 @@

Go
Einstellungen
Mehr
-

v0.1.1

+

v0.1.2

diff --git a/index.jade b/index.jade index b473b02..f3d7829 100644 --- a/index.jade +++ b/index.jade @@ -21,7 +21,7 @@ html .wrapper-more a.btn.btn-underline(href="http://benbals.github.io/actiolatein") Mehr - p.version v0.1.1 + p.version v0.1.2 .game.dpn