4 Commits

Author	SHA1	Message	Date
devin chen	95e308e046	minor update	2013-04-17 14:18:49 +08:00
devin chen	dc5f24ab22	starting new branch ( add rules in .gitignore for SASS cache folder )	2013-04-17 14:16:24 +08:00
chris	dd10b3147c	Fix js bug and asset url after merge	2013-04-17 14:14:24 +08:00
devin	c8aa50ee87	Lots of Update ... 1. CSS to SCSS 2. Journal Paper update Conflicts: Gemfile.lock app/assets/javascripts/orbitdesktop.js app/assets/stylesheets/desktop/desktop-main.css vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb	2013-04-17 14:14:23 +08:00