Files
orbit-basic/app/assets/Archive/stylesheets/desktop.css
T
harrybomrah 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

20 lines
732 B
CSS

/*
*This is a manifest file that'll automatically include all the stylesheets available in this directory
*and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
*the top of the compiled file, but it's generally better to create a new file per style scope.
*= require desktop/desktop-font
*= require bootstrap
*= require orbit_bar_bootstrap
*= require basic/orbit_bar
*= require jquery.miniColors
*= require jquery.gridster
*= require jquery-ui
*= require font-awesome
*= require basic/icon
*= require desktop/desktop-component
*= require desktop/desktop-main
*= require desktop/desktop-media
*= require desktop/desktop-select2
*= require desktop/desktop-timeline
*/