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 |
||
|---|---|---|
| .. | ||
| _desktop-helper.scss | ||
| desktop-compatibility.css | ||
| desktop-component.css | ||
| desktop-font.css | ||
| desktop-main.css | ||
| desktop-main.scss | ||
| desktop-media.css | ||
| desktop-select2.css | ||
| desktop-select2.scss | ||
| desktop-timeline.css.erb | ||