Christophe Vilayphiou a1e74987dc Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry ...

Conflicts:
	Gemfile.lock
	app/assets/javascripts/.DS_Store
	app/assets/stylesheets/style.css.erb
	app/views/layouts/_orbit_bar.html.erb

2012-06-29 16:10:29 +08:00

..

admin

fix preview window size.

2012-04-13 16:46:16 +08:00

inc

Ray's changes for front-end banner

2012-05-08 17:21:26 +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_back_end.css.erb

Ray's modification before redesign

2012-01-24 11:57:27 +08:00

admin.css.erb

Ray's back_end modification before sub_roles

2011-12-23 18:02:45 +08:00

application.css

Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD

2011-10-20 10:06:06 +08:00

banner_nav.css

Ray's changes for front-end banner

2012-05-08 17:21:26 +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 fix

2012-05-02 16:20:59 +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

timeline updates major ones..

2012-06-26 21:09:33 +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

lots of change

2012-05-02 17:04:16 +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 fix

2012-05-02 16:20:59 +08:00

message.css

Add mandatory fields to assets

2012-05-17 16:40:09 +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

timeline updates major ones..

2012-06-26 21:09:33 +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

style.css.erb

Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry

2012-06-29 16:10:29 +08:00

widgets.css

Fix css bugs (opacity=) and changes in sign_in page

2012-04-27 15:27:59 +08:00