Christophe Vilayphiou 20504b2205 Merge branch 'design_team' into ldap ... Conflicts: app/controllers/admin/page_parts_controller.rb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb		2012-04-30 07:57:20 +08:00
..
admin	fix preview window size.	2012-04-13 16:46:16 +08:00
inc	Merge branch 'design_team' into ldap	2012-04-24 15:28:52 +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	Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD	2011-10-20 10:06:06 +08:00
bootstrap-orbit.css	Ray's changes in css and html	2012-04-30 00:17:18 +08:00
bootstrap.css.erb	Ray's changes in css	2012-04-24 15:15:36 +08:00
design.css	Modify assets	2011-12-05 09:54:41 +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
isotope.css	Ray's changes in css and html	2012-04-30 00:17:18 +08:00
list.css	Ray's changes in css and html	2012-04-30 00:17:18 +08:00
message.css	Ray's changes for css files, sort headers in announcement and pagination	2012-04-24 02:37:51 +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
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 changes for structure and web_links	2012-04-27 11:02:56 +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
style.css.erb	Ray's changes in css and html	2012-04-30 00:17:18 +08:00
widgets.css	Fix css bugs (opacity=) and changes in sign_in page	2012-04-27 15:27:59 +08:00