developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Orbit/app/assets/stylesheets
History
chris 7d5531bf01 Merge branch 'nccu_master' into demo_site 
Conflicts:
	Gemfile
	app/assets/javascripts/tinymce_orbit.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/admin/assets_controller.rb
	app/controllers/admin/module_apps_new_interface_controller.rb
	app/controllers/admin/page_parts_controller.rb
	app/jobs/sync_db.rb
	app/models/page.rb
	app/models/page_part.rb
	app/models/user/user.rb
	app/uploaders/image_uploader.rb
	app/views/admin/assets/create.js.erb
	app/views/admin/module_apps/reload_frontend_pages.js.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/layouts/_users_checkbox_ary.html.erb
	app/views/shared/_privilege_user.html.erb
	config/mongoid.yml
	lib/parsers/parser_common.rb
	vendor/built_in_modules/announcement/announcement.json
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
 		2012-08-22 18:07:49 +08:00
..
admin fix preview window size. 2012-04-13 16:46:16 +08:00
inc Merge branch 'design_team' into ldap 2012-05-09 13:51:00 +08:00
lib The new AdBanner. 2012-04-02 03:04:38 +08:00
rulingcom adding files not commited from previous commit 2011-07-12 16:02:41 +08:00
.gitkeep adding files not commited from previous commit 2011-07-12 16:02:41 +08:00
admin.css.erb Ray's back_end modification before sub_roles 2011-12-23 18:02:45 +08:00
admin_back_end.css.erb Ray's modification before redesign 2012-01-24 11:57:27 +08:00
application.css first version of fb_share 2012-08-06 16:12:49 +08:00
banner_nav.css Ika's changes for orbit bar 2012-07-20 15:41:27 +08:00
bootstrap-orbit.css Ray's changes in css and html 2012-04-30 00:17:18 +08:00
bootstrap.css.erb Fix bugs on 172:180 2012-08-08 17:56:00 +08:00
design.css Modify assets 2011-12-05 09:54:41 +08:00
desktop.css Timeline commit 2012-06-26 15:59:28 +08:00
desktopmain.css little changes 2012-07-06 16:09:26 +08:00
desktopmedia.css some update 2012-05-10 10:54:43 +08:00
devise.css.erb Changes for orbit bar, login 2012-02-19 16:33:22 +08:00
feile.css.erb Merge with sub_roles 2011-12-23 18:34:21 +08:00
font-awesome.css.erb font aweosme change 2012-07-02 16:23:14 +08:00
isotope.css Ray's changes in css and html 2012-04-30 00:17:18 +08:00
jquery.miniColors.css theme setting update 2012-04-11 13:46:32 +08:00
list.css Ray's changes for list.css 2012-08-15 12:13:58 +08:00
message.css form validation again 2012-08-14 01:02:45 +08:00
new_admin.css.erb Ray's changes for image upload component and sign-in page 2012-04-24 11:35:50 +08:00
orbitTimeline.css.erb publication adjustment 2012-07-09 10:44:01 +08:00
reset.css.erb Ray's changes for css files, sort headers in announcement and pagination 2012-04-24 02:37:51 +08:00
scroll_style.css Ray's changes for css files, sort headers in announcement and pagination 2012-04-24 02:37:51 +08:00
sidebar.css.erb Ray's fix for structure side_bar 2012-05-22 16:48:57 +08:00
site_assets.css.erb Ray's changes for css files, sort headers in announcement and pagination 2012-04-24 02:37:51 +08:00
site_designs.css.erb Ray's changes for css files, sort headers in announcement and pagination 2012-04-24 02:37:51 +08:00
site_editor.css.erb Fix for structure js and css 2012-04-25 18:41:38 +08:00
site_items.css.erb Ray's changes for css files, sort headers in announcement and pagination 2012-04-24 02:37:51 +08:00
social-share-button.css New css and images for rss 2012-08-15 18:00:55 +08:00
style.css.erb Ray's changes for sitemap backend 2012-08-08 11:51:20 +08:00
widgets.css Changes on nccu 2012-05-18 15:20:45 +08:00