orbit-basic/app/assets/stylesheets
Christophe Vilayphiou 2eeb530422 Merge branch 'master' into ldap
Conflicts:
	app/assets/stylesheets/new_admin.css.erb
2012-04-23 14:13:37 +08:00
..
admin fix preview window size. 2012-04-13 16:46:16 +08:00
inc Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap 2012-04-19 14:06: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 Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD 2011-10-20 10:06:06 +08:00
bootstrap-orbit.css Ray's fix for columns width in bulletins 2012-04-12 07:01:34 +08:00
bootstrap.css.erb Changes for nccu 2012-02-29 16:01:50 +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 Add isotope, categories for announcement page, sort for announcement 2012-02-23 15:52:58 +08:00
list.css changes before Chirs and Ray's trip 2012-04-19 11:50:54 +08:00
message.css Modify assets 2011-12-05 09:54:41 +08:00
new_admin.css.erb realtime preview is working. but save to object when preview 2012-04-23 14:06:37 +08:00
reset.css.erb Ray's changes in announcenment back-end 2012-03-27 18:58:03 +08:00
scroll_style.css Orbit-bar in front-end and back-end, side-bar and drop-down menu 2012-02-15 00:34:22 +08:00
sidebar.css.erb changes before Chirs and Ray's trip 2012-04-19 11:50:54 +08:00
site_assets.css.erb Ray's back_end modification before sub_roles 2011-12-23 18:02:45 +08:00
site_designs.css.erb Ray's back_end modification before sub_roles 2011-12-23 18:02:45 +08:00
site_editor.css.erb Ray's back_end modification before sub_roles 2011-12-23 18:02:45 +08:00
site_items.css.erb changes before Chirs and Ray's trip 2012-04-19 11:50:54 +08:00
style.css.erb changes before Chirs and Ray's trip 2012-04-19 11:50:54 +08:00
widget.css Merge branch 'master' into ldap 2012-04-23 14:13:37 +08:00
widgets.css changes before Chirs and Ray's trip 2012-04-19 11:50:54 +08:00