orbit-basic/app/assets/images
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
..
connection Connection page design 2012-05-01 18:05:17 +08:00
desktop Lots of Update 2013-04-17 14:14:23 +08:00
ft-icons file view update 2012-11-21 07:37:42 +08:00
icons new icons and widgets 2012-04-12 22:18:58 +08:00
miniColors custom theme settings 2012-04-10 17:44:36 +08:00
mobile Add mobile but remove news in it 2013-01-07 03:03:38 +08:00
module apply view 2013-01-14 19:18:25 +08:00
stockBackground wallpaper added 2012-04-17 18:06:07 +08:00
template/thumb Add images to store 2012-12-07 02:37:05 +08:00
timeline timeline change 2012-07-05 16:49:03 +08:00
75.png Ray's modifications 2011-11-18 16:43:14 +08:00
Jobs.jpg Integration of Ray' modifications 2011-11-17 20:02:58 +08:00
PIE.htc Ray's modification before redesign 2012-01-24 11:57:27 +08:00
Thumbs.db Ray's changes for front-end banner 2012-05-08 17:21:26 +08:00
add_mamber.png Integration of Ray' modifications 2011-11-17 20:02:58 +08:00
ajax-loader.gif js for preventing user do stupid things durning ajax 2012-05-22 14:59:54 +08:00
ar1.png Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
background.jpg Changes for orbit bar, login 2012-02-19 16:33:22 +08:00
bar_bg.png adding files not commited from previous commit 2011-07-12 16:02:41 +08:00
bar_border.png Ika's changes 2011-08-25 08:07:18 +08:00
bar_btn.png Ika's changes 2011-08-25 08:07:18 +08:00
bar_id.png Ika's changes 2011-08-25 08:07:18 +08:00
bar_orbit.png Ray's modification before redesign 2012-01-24 11:57:27 +08:00
bar_pw.png Ika's changes 2011-08-25 08:07:18 +08:00
body.jpg ika's modification to the backend 2011-11-16 18:34:54 +08:00
bought_btn.png Ika's changes 2011-08-25 08:07:18 +08:00
buy_btn.png Ika's changes 2011-08-25 08:07:18 +08:00
check.png Ray's changes for css files, sort headers in announcement and pagination 2012-04-24 02:37:51 +08:00
default-img.png Orbit-bar in front-end and back-end, side-bar and drop-down menu 2012-02-15 00:34:22 +08:00
dropdown_ad.png Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
editicon.png Ray's changes for page_edit 2012-05-13 19:36:04 +08:00
f1.jpg Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
f2.jpg Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
f3.jpg Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
facebook.png with connection and some save settings… 2012-04-26 21:30:13 +08:00
glyphicons-halflings-white.png Orbit-bar in front-end and back-end, side-bar and drop-down menu 2012-02-15 00:34:22 +08:00
glyphicons-halflings.png Orbit-bar in front-end and back-end, side-bar and drop-down menu 2012-02-15 00:34:22 +08:00
gmail.png with connection and some save settings… 2012-04-26 21:30:13 +08:00
h1_bg.jpg Integration of Ray' modifications 2011-11-17 20:02:58 +08:00
h1_bg.png Ray's back_end modification before sub_roles 2011-12-23 18:02:45 +08:00
home.png adding files not commited from previous commit 2011-07-12 16:02:41 +08:00
hr_cover.png Ray's modifications 2011-11-18 16:43:14 +08:00
html.png Ika's changes 2011-08-25 08:07:18 +08:00
icon.png Ray's back_end modification before sub_roles 2011-12-23 18:02:45 +08:00
icon1.png ika's modification to the backend 2011-11-16 18:34:54 +08:00
icon2.png ika's modification to the backend 2011-11-16 18:34:54 +08:00
icons_pack.png Ray's changes for drag and drop in structure's side_bar 2012-05-11 17:54:33 +08:00
icons_pack_white.png Ray's changes for drag and drop in structure's side_bar 2012-05-11 17:54:33 +08:00
line.png Integration of Ray' modifications 2011-11-17 20:02:58 +08:00
linkedin.png with connection and some save settings… 2012-04-26 21:30:13 +08:00
logo.png Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
main-search.png Changes in orbit_bar and js in announcements 2012-02-23 15:51:33 +08:00
menber-pic.png Changes in orbit_bar and js in announcements 2012-02-23 15:51:33 +08:00
mfilter_bg.jpg Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
mheader_bg.jpg Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
mside_bg.png Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
nccu_logo.png Changes for nccu 2012-02-29 16:01:50 +08:00
ncculogo.ico Ika's changes for orbit bar 2012-07-20 15:41:27 +08:00
ncculogo_bk.ico Ray's changes for new backend 2012-09-14 02:38:56 +08:00
news_alt.jpg Set default picture 2012-08-16 17:24:12 +08:00
note_alert.png with notifications and other changes 2012-04-06 17:47:03 +08:00
note_imp.png with notifications and other changes 2012-04-06 17:47:03 +08:00
note_success.png Dock change and getting values from db 2012-04-06 17:49:22 +08:00
orbit-bar.png Ray's changes 2012-05-04 19:11:28 +08:00
orbitbar.png Final Ray's modifications 2011-11-19 21:47:18 +08:00
orbitbar1.png Ray's modifications 2011-11-18 16:43:14 +08:00
person.png Ray's modifications 2011-11-18 16:43:14 +08:00
preview.png Integration of Ray' modifications 2011-11-17 20:02:58 +08:00
rails.png adding files not commited from previous commit 2011-07-12 16:02:41 +08:00
roles_type.jpg Integration of Ray' modifications 2011-11-17 20:02:58 +08:00
sample_theme.jpg theme setting update 2012-04-11 13:46:32 +08:00
search_bg.png Integration of Ray' modifications 2011-11-17 20:02:58 +08:00
search_block_bg.jpg Integration of Ray' modifications 2011-11-17 20:02:58 +08:00
service_btn.png Ray's modification before redesign 2012-01-24 11:57:27 +08:00
sidebar_li.jpg Integration of Ray' modifications 2011-11-17 20:02:58 +08:00
sidebar_li2.jpg Ray's back_end modification before sub_roles 2011-12-23 18:02:45 +08:00
sign-in-logo-nccu.png Ray's changes for new backend 2012-09-14 02:38:56 +08:00
sign-in-logo.png Ika's changes for orbit bar 2012-07-20 15:41:27 +08:00
sign-in-logo2.png Changes for orbit bar, login 2012-02-19 16:33:22 +08:00
social-share-button.png New css and images for rss 2012-08-15 18:00:55 +08:00
switch.png Final Ray's modifications 2011-11-19 21:47:18 +08:00
tfilter_bg.jpg Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
theader_bg.jpg Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
thumb_default.png Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
tlist_tap.png Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
topnav_bg.png Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
tree_list.png adding files not commited from previous commit 2011-07-12 16:02:41 +08:00
tree_list_h.png adding files not commited from previous commit 2011-07-12 16:02:41 +08:00
twitter.png with connection and some save settings… 2012-04-26 21:30:13 +08:00
ui_bg.png Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
upload_but.png Ray's modifications 2011-11-18 16:43:14 +08:00
wood_floor.jpg Integration of Ray' modifications 2011-11-17 20:02:58 +08:00