980e63d830
isotope experiment for form
...
1. This is only for DEMO, please don't merge this commit into any branch
2. This demo is only inside the Journal Paper > Add/Edit page
3. Please check the Diff from the original HTML
4. Please update the 'desktop-main.scss', 'desktop-main.css',
'desktop-component.scss', 'desktop-component.css' for update and mistake
2013-08-23 10:23:40 +08:00
269264d232
'select2' minor update
2013-06-18 15:26:36 +08:00
287e77836d
fix css compiling error
2013-05-14 14:19:20 +08:00
e3782c9cf7
minor update
2013-04-17 14:29:04 +08:00
95e308e046
minor update
2013-04-17 14:18:49 +08:00
dc5f24ab22
starting new branch ( add rules in .gitignore for SASS cache folder )
2013-04-17 14:16:24 +08:00
dd10b3147c
Fix js bug and asset url after merge
2013-04-17 14:14:24 +08:00
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
devin chen
Matt K. Fu
chris
devin