From 882c3faf7a8fc93c6d2a1133d7f81f637f22c0a0 Mon Sep 17 00:00:00 2001 From: Paul Mesnilgrente Date: Wed, 9 Mar 2022 21:33:40 +0100 Subject: [PATCH] fix: moved the datatable css to a block and fixed the images links All the sort_*.png images are for datatables and shouldn't need to put them in public/images, the ones from the datatables.net-zf package should be used. I opened a bug on sprockets-rails: https://github.com/rails/sprockets-rails/issues/503 --- app/assets/stylesheets/application.scss | 22 ++---------------- .../stylesheets/blocks/_datatables.scss | 21 +++++++++++++++++ app/assets/stylesheets/blocks/_parsers.scss | 7 ------ {app/assets => public}/images/sort_asc.png | Bin .../images/sort_asc_disabled.png | Bin {app/assets => public}/images/sort_both.png | Bin {app/assets => public}/images/sort_desc.png | Bin .../images/sort_desc_disabled.png | Bin 8 files changed, 23 insertions(+), 27 deletions(-) create mode 100644 app/assets/stylesheets/blocks/_datatables.scss rename {app/assets => public}/images/sort_asc.png (100%) rename {app/assets => public}/images/sort_asc_disabled.png (100%) rename {app/assets => public}/images/sort_both.png (100%) rename {app/assets => public}/images/sort_desc.png (100%) rename {app/assets => public}/images/sort_desc_disabled.png (100%) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 2ef346d4..966b05bf 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -2,7 +2,7 @@ @import 'jquery-datetimepicker/jquery.datetimepicker'; @import 'codemirror/lib/codemirror'; @import 'codemirror/theme/monokai'; -@import 'datatables.net-zf/css/dataTables.foundation'; +@import 'datatables.net-zf/css/dataTables.foundation.min'; // foundation related @import 'foundation/foundation_and_overrides'; @@ -12,6 +12,7 @@ // custom forms @import 'blocks/base'; +@import 'blocks/datatables'; @import 'blocks/details'; @import 'blocks/forms'; @import 'blocks/top_nav'; @@ -27,22 +28,3 @@ @import 'blocks/home'; @import 'blocks/codemirror'; @import 'blocks/devise'; - -.data-tables { - .pagination-previous a::before, .pagination-previous.disabled::before, - .pagination-next a::after, .pagination-next.disabled::after { - display: none; - } -} - -.pagination-previous.disabled, .pagination-next.disabled { - a { - padding: 0.1875rem 0.625rem; - color: $medium-gray; - cursor: not-allowed; - - &:hover { - background-color: transparent; - } - } -} diff --git a/app/assets/stylesheets/blocks/_datatables.scss b/app/assets/stylesheets/blocks/_datatables.scss new file mode 100644 index 00000000..5683e1cd --- /dev/null +++ b/app/assets/stylesheets/blocks/_datatables.scss @@ -0,0 +1,21 @@ +.data-tables, .dataTable { + .pagination-previous a::before, + .pagination-previous.disabled::before, + .pagination-next a::after, + .pagination-next.disabled::after { + display: none; + } + + .pagination-previous.disabled, + .pagination-next.disabled { + a { + padding: 0.1875rem 0.625rem; + color: $medium-gray; + cursor: not-allowed; + + &:hover { + background-color: transparent; + } + } + } +} diff --git a/app/assets/stylesheets/blocks/_parsers.scss b/app/assets/stylesheets/blocks/_parsers.scss index 2345916d..87abb522 100644 --- a/app/assets/stylesheets/blocks/_parsers.scss +++ b/app/assets/stylesheets/blocks/_parsers.scss @@ -80,13 +80,6 @@ ul.tagging { } } -.sorting { background: image-url('/images/sort_both.png') no-repeat center right; } -.sorting_asc { background: image-url('/images/sort_asc.png') no-repeat center right; } -.sorting_desc { background: image-url('/images/sort_desc.png') no-repeat center right; } - -.sorting_asc_disabled { background: image-url('/images/sort_asc_disabled.png') no-repeat center right; } -.sorting_desc_disabled { background: image-url('/images/sort_desc_disabled.png') no-repeat center right; } - $arrowSize: 18px; .arrow { diff --git a/app/assets/images/sort_asc.png b/public/images/sort_asc.png similarity index 100% rename from app/assets/images/sort_asc.png rename to public/images/sort_asc.png diff --git a/app/assets/images/sort_asc_disabled.png b/public/images/sort_asc_disabled.png similarity index 100% rename from app/assets/images/sort_asc_disabled.png rename to public/images/sort_asc_disabled.png diff --git a/app/assets/images/sort_both.png b/public/images/sort_both.png similarity index 100% rename from app/assets/images/sort_both.png rename to public/images/sort_both.png diff --git a/app/assets/images/sort_desc.png b/public/images/sort_desc.png similarity index 100% rename from app/assets/images/sort_desc.png rename to public/images/sort_desc.png diff --git a/app/assets/images/sort_desc_disabled.png b/public/images/sort_desc_disabled.png similarity index 100% rename from app/assets/images/sort_desc_disabled.png rename to public/images/sort_desc_disabled.png