orbit-4-1/app/assets/stylesheets/desktop.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 bootstrap-orbit
 *= require jquery.miniColors
 *= require jquery.gridster
 *= require jquery-ui
 *= require font-awesome
 *= require icons
 *= require desktop/desktop-component
 *= require desktop/desktop-main
 *= require desktop/desktop-media
 *= require desktop/desktop-select2
 *= require desktop/desktop-timeline
 *= require orbit-bar
*/
Desktop Commit 2012-03-28 10:53:30 +00:00			`/*`
			`*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.`
desktop CSS update 2013-03-05 01:39:01 +00:00			`*= require desktop/desktop-font`
new icons 2012-04-03 10:06:16 +00:00			`*= require bootstrap`
Desktop Commit 2012-03-28 10:53:30 +00:00			`*= require bootstrap-orbit`
custom theme settings 2012-04-10 09:44:36 +00:00			`*= require jquery.miniColors`
desktop CSS update 2013-03-05 01:39:01 +00:00			`*= require jquery.gridster`
autocomplete done 2012-11-27 07:55:32 +00:00			`*= require jquery-ui`
lots of change 2012-05-02 09:04:16 +00:00			`*= require font-awesome`
Add missing icons and css for icons in layout 2012-12-03 14:31:00 +00:00			`*= require icons`
desktop CSS update 2013-03-05 01:39:01 +00:00			`*= require desktop/desktop-component`
			`*= require desktop/desktop-main`
			`*= require desktop/desktop-media`
Lots of Update 1. CSS to SCSS 2. Journal Paper update Conflicts: Gemfile.lock app/assets/javascripts/orbitdesktop.js app/assets/stylesheets/desktop/desktop-main.css vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb 2013-03-25 08:23:07 +00:00			`*= require desktop/desktop-select2`
desktop CSS update 2013-03-05 01:39:01 +00:00			`*= require desktop/desktop-timeline`
			`*= require orbit-bar`
have done conference author filter, journal haven't been done, yet 2013-03-08 11:16:01 +00:00			`*/`