devin chen
|
ead749cfed
|
minor update
|
2013-06-18 15:12:52 +08:00 |
|
devin chen
|
989e5aa974
|
minor update
|
2013-04-17 14:29:56 +08:00 |
|
devin chen
|
aedab01ae6
|
minor update
|
2013-04-17 14:29:04 +08:00 |
|
devin chen
|
e3782c9cf7
|
minor update
|
2013-04-17 14:29:04 +08:00 |
|
devin chen
|
055d758769
|
Page Loading Effect
tinyscrollbar has problem
|
2013-04-17 14:27:18 +08:00 |
|
devin chen
|
d177fe0369
|
minor update
|
2013-04-17 14:19:32 +08:00 |
devin
|
e7bffe4c0f
|
devin's new branch
|
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 |