scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-08 07:21:03 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5925 from aignatov-bio/ai-sci-fix-css-bundling-remove-libraries

Browse source 
Fix bundling for deleted files
This commit is contained in:
aignatov-bio 2023-08-07 15:44:09 +02:00 • committed by GitHub
commit 2ae5de1158
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/application.sass.scss
View file

@ -43,7 +43,6 @@
@import "dashboard/recent_work";
@import "dashboard/show";
@import "repository/assign_items_to_task_modal";
@import "repository/bmt_filters";
@import "repository/filters";
@import "repository/index";
@import "repository/print_progress_modal";
@ -76,7 +75,6 @@
@import "shared/action_toolbar";
@import "shared/assets";
@import "shared/avatar";
@import "shared/breadcrumbs";
@import "shared/cards";
@import "shared/comments_sidebar";
@import "shared/comments";

10
app/controllers/result_texts_controller.rb
View file

@ -20,19 +20,9 @@ class ResultTextsController < ApplicationController
)
@result.build_result_text
<<<<<<< HEAD
respond_to do |format|
format.json {
render json: {
html: render_to_string({ partial: 'new', formats: :html })
}, status: :ok
}
end
=======
render json: {
html: render_to_string({ partial: 'new', formats: :html })
}, status: :ok
>>>>>>> develop
end
def create

2
bin/build-css
View file

@ -2,7 +2,7 @@
./node_modules/sass/sass.js \
./app/assets/stylesheets/application.sass.scss:./app/assets/builds/application.css \
./vendor/assets/stylesheets/handsontable.sass.scss:./app/assets/builds/handsontable.css \
./vendor/assets/stylesheets/handsontable.full.sass.scss:./app/assets/builds/handsontable.css \
./vendor/assets/stylesheets/handsontable.formula.sass.scss:./app/assets/builds/handsontable.formula.css \
./app/assets/stylesheets/layouts/print_protocol.sass.scss:./app/assets/builds/print_protocol.css \
./vendor/assets/stylesheets/datatables.sass.scss:./app/assets/builds/datatables.css \