orbit-basic/app/assets/stylesheets
Harry Bomrah 79c7f8e90f new orbit bar fixed..
Conflicts:
	app/assets/javascripts/orbit_js_1.0.1-front-end.js
	app/assets/stylesheets/basic/orbit_bar.css.erb
	app/assets/stylesheets/orbit_bar_bootstrap.css
	app/views/layouts/_left_menu.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_right_menu.html.erb
	app/views/layouts/desktop.html.erb
2013-07-30 16:43:35 +08:00
..
admin New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
basic new orbit bar fixed.. 2013-07-30 16:43:35 +08:00
lib Remove some css causing errors in precompile 2013-07-25 13:15:49 +08:00
.gitkeep adding files not commited from previous commit 2011-07-12 16:02:41 +08:00
ask.css ask module update css 2013-06-07 13:04:00 +08:00
back_end.css New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
banner_nav.css Ika's changes for orbit bar 2012-07-20 15:41:27 +08:00
basic.css New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
default_widget.css change *default* to *defulat* 2013-01-10 09:40:52 +08:00
devise.css New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
icon-ie7.min.css New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
jquery.miniColors.css mini colors in new ui fixed 2013-07-23 12:12:46 +08:00
orbit_bar_bootstrap.css new orbit bar fixed.. 2013-07-30 16:43:35 +08:00
page_layout.css New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
questionnaire.css Remove non resolved conflict 2013-06-07 13:02:47 +08:00
standalone.css standalone css and icon 2013-06-06 18:41:27 +08:00
structure.css Ray's changes for css and js 2013-07-22 16:31:44 +08:00