devin
c8aa50ee87
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
20 lines
717 B
CSS
20 lines
717 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 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
|
|
*/
|