~erikg/karma/erikg-karma

	Commit message (Expand)	Author	Age	Files	Lines
...
*	added black/white versions of grade images (for grades that aren't available)...	christophd@sugarlabs.org	2009-09-02	13	-8/+86

*	increased the size of the icons in both grade and subject stage, experimented...	christophd@sugarlabs.org	2009-09-01	2	-14/+16

*	more experimentation with the lesson navigation	christophd@sugarlabs.org	2009-09-01	3	-71/+30

*	renamed files to meet new naming conventions for knavbar, cleaned up css refe...	christophd@sugarlabs.org	2009-09-01	5	-17/+11

*	corrected a typo in knavbar css	christophd@sugarlabs.org	2009-09-01	1	-1/+1

*	JS Documentation: Karma main constructor done.	Felipe Lopez Toledo	2009-09-01	27	-0/+12182

*	Merge branch 'master' of git://git.sugarlabs.org/karma/mainline	christophd@sugarlabs.org	2009-08-31	3	-93/+106
\|\
\| *	now sidebar in mytest.html is properly positioned	root	2009-08-31	2	-6/+15

\| *	all px values now in mytest.html	root	2009-08-31	3	-91/+95

* \|	started building lesson navigation with icons	christophd@sugarlabs.org	2009-08-31	3	-59/+106
\|/
*	updated chakra.css to contain lesson specific layout (previously in separate ...	christophd@sugarlabs.org	2009-08-31	2	-2/+23

*	Merge branch 'master' of git://git.sugarlabs.org/karma/mainline	christophd@sugarlabs.org	2009-08-31	7	-3/+105
\|\
\| *	trying mytest1.html w/ 0 width for canvas element	root	2009-08-31	2	-6/+6

\| *	added experiments folder for my canvas experiments	root	2009-08-31	6	-3/+105

* \|	first version with weekly lesson previews working, though auto-loading of wee...	christophd@sugarlabs.org	2009-08-31	7	-20/+123
\|/
*	corrected mistake with path to css/js files	christophd@sugarlabs.org	2009-08-31	1	-6/+6

*	moved current chakra design to ROOT/; moved chakra related assets/css/js into...	christophd@sugarlabs.org	2009-08-31	37	-7686/+406

*	cleaned up css on mytest.css	root	2009-08-29	2	-85/+40

*	fixed position of reset button	root	2009-08-29	3	-1/+21

*	changed sizes of boxes	root	2009-08-29	17	-22/+24

*	Merge branch 'bryan'	root	2009-08-29	2	-112/+260
\|\
\| *	changing layout in mytest.html	root	2009-08-29	2	-156/+233

\| *	adding more boxes to mytest.html	root	2009-08-28	2	-57/+104

\| *	adding imgs to newtest	root	2009-08-28	2	-33/+57

* \|	removed old grade2 mockups, adapted chakra according to feedback from meeting...	christophd@sugarlabs.org	2009-08-28	7	-470/+193

* \|	experimenting with stage 3 design (currently broken)	christophd@sugarlabs.org	2009-08-28	2	-7/+17

* \|	added new grade icons	christophd@sugarlabs.org	2009-08-28	8	-0/+0

* \|	made the drop down version of stage 3 the default, renamed the other one to _...	christophd@sugarlabs.org	2009-08-27	2	-69/+76

* \|	worked on drop down version of stage 3	christophd@sugarlabs.org	2009-08-27	1	-6/+6

* \|	Merge branch 'master' of git://git.sugarlabs.org/karma/mainline	christophd@sugarlabs.org	2009-08-27	14	-791/+289
\|\ \ \| \|/
\| *	have basic layout working for mytest.html and using correct doctype	root	2009-08-27	14	-791/+289

* \|	removed back buttons again and replaced them by grade - subject navigation ba...	christophd@sugarlabs.org	2009-08-27	4	-14/+21

* \|	changed background color of admin area	christophd@sugarlabs.org	2009-08-27	2	-7/+4
\|/
*	when renaming the css files one shouldn't forget to update the corresponding ...	christophd@sugarlabs.org	2009-08-27	3	-3/+3

*	added back button in b/w, renamed index_iphone chakra html / css to index (ol...	christophd@sugarlabs.org	2009-08-27	9	-486/+486

*	Printstyle css added for lesson plan	Roshan Karki	2009-08-27	1	-0/+50

*	proceeded with the non drop down menu design until I realized there's no way ...	christophd@sugarlabs.org	2009-08-26	2	-1/+60

*	improved month-list stage 3 view	christophd@sugarlabs.org	2009-08-26	2	-5/+1

*	Merge branch 'master' of git://git.sugarlabs.org/karma/mainline	christophd@sugarlabs.org	2009-08-26	227	-10710/+9045
\|\
\| *	experimenting w/ drawing images	root	2009-08-26	5	-5/+8

\| *	mytest.html added to master branch	Felipe Lopez Toledo	2009-08-25	1	-0/+116

\| *	mytest.html added to master branch	Felipe Lopez Toledo	2009-08-25	20	-11832/+8464

\| *	mytest.html added to master branch	Felipe Lopez Toledo	2009-08-25	0	-0/+0

\| *	Revert "a little clean up, fixed bug on karma plugin: clear function"	Felipe Lopez Toledo	2009-08-25	7	-6/+3374

\| *	a little clean up, fixed bug on karma plugin: clear function	Felipe Lopez Toledo	2009-08-25	7	-3374/+6

\| *	lesson plan template added	Roshan Karki	2009-08-25	4	-0/+148

\| *	added scoreboard	root	2009-08-24	1	-5/+11

\| *	got timer working on adding_up_to_10	root	2009-08-24	49	-5/+54

\| *	changed adding_up_to_10_2 to adding_up_to_10 and changed starting page from l...	root	2009-08-24	40	-120/+371

\| *	minor changes	Felipe Lopez Toledo	2009-08-24	2	-6/+14