Merge branch 'master' into LIKA-627_upgrade_bootstrap

ansible/deploy-all.yml

@@ -28,7 +28,6 @@
     - postgres
     - postgres-backup
     - { role: ckan-extension, ckanext: ckanext-sentry }
-
     - { role: ckan-extension, ckanext: ckanext-apicatalog }
     - { role: ckan-extension, ckanext: ckanext-scheming }
     - { role: ckan-extension, ckanext: ckanext-fluent }

ansible/roles/ckan-ui/tasks/main.yml

@@ -1,8 +1,8 @@
-- name: rebuild ckanext-apicatalog less
-  shell: lessc "{{ apicatalog_path }}/less/main.less" "{{ apicatalog_ckanext_path }}/fanstatic/apicatalog/main.css"
+- name: rebuild ckanext-apicatalog sass
+  shell: sass "{{ apicatalog_path }}/scss/main.scss"  "{{ apicatalog_ckanext_path }}/fanstatic/apicatalog/main.css"
 
-- name: rebuild ckanext-openapi_view less
-  shell: lessc "{{ apicatalog_path }}/less/openapi_view.less" "{{ apicatalog_ckanext_path }}/fanstatic/openapi_view.css"
+- name: rebuild ckanext-openapi_view sass
+  shell: sass "{{ apicatalog_path }}/scss/openapi_view.scss"  "{{ apicatalog_ckanext_path }}/fanstatic/openapi_view.css"
 
 - name: Restart CKAN
   shell: supervisorctl restart "{{ ckan_supervisor_name }}"

ansible/roles/os-base/tasks/main.yml

@@ -43,11 +43,23 @@
       - supervisor
       - libxml2-dev
       - libxslt1-dev
-      - node-less
       - acl
-      - npm
       - gulp
 
+
+- name: Download sass
+  unarchive:
+    src: https://github.com/sass/dart-sass/releases/download/{{sass_version}}/dart-sass-{{sass_version}}-linux-x64.tar.gz
+    dest: /tmp
+    remote_src: yes
+
+- name: Link sass binary
+  file:
+    src: /tmp/dart-sass/sass
+    dest: /usr/local/bin/sass
+    state: link
+
+
 # Note: psycopg2 requires postgresql-server-dev
 
 - name: Enable automatic installation of security upgrades

ansible/roles/os-base/vars/main.yml

@@ -7,3 +7,4 @@ timezone: UTC
 # Apt repository configuration
 apt_source_url: http://archive.ubuntu.com
 
+sass_version: 1.81.0

ckanext/ckanext-apicatalog/buildsass.sh

@@ -0,0 +1,3 @@
+sass scss/main.scss  --source-map=ckanext/apicatalog/public/base/main.css.map --source-map-url=/base/main.css.map --source-map-less-inline > ckanext/apicatalog/fanstatic/apicatalog/main.css
+sass scss/openapi_view.scss  --source-map=ckanext/apicatalog/public/base/openapi_view.css.map --source-map-url=/base/openapi_view.css.map --source-map-less-inline > ckanext/apicatalog/fanstatic/openapi_view.css
+echo $(date): Compiled sass

ckanext/ckanext-apicatalog/ckanext/apicatalog/fanstatic/.gitignore

@@ -1,5 +1,7 @@
 main.css
+main.css.map
 openapi_view.css
+openapi_view.css.map
 /font-awesome/
 /cookieconsent/cookieconsent.js
 /cookieconsent/cookieconsent.css

ckanext/ckanext-apicatalog/gulpfile.js

@@ -30,20 +30,20 @@ function bootstrapDatepickerCss() {
 
 }
 
-const bootstrapLessPath = './node_modules/bootstrap/less';
-function bootstrapLess() {
-    return src(bootstrapLessPath + '/**/*')
-        .pipe(dest("vendor/bootstrap/less"))
+const bootstrapSassPath = './node_modules/bootstrap-sass/assets/stylesheets';
+function bootstrapSass() {
+    return src(bootstrapSassPath + '/**/*')
+        .pipe(dest("vendor/bootstrap-sass/stylesheets"))
 }
 
 exports.fontAwesomeCss = fontAwesomeCss;
 exports.fontAwesomeFonts = fontAwesomeFonts;
 exports.bootstrapDatepickerJs = bootstrapDatepickerJs;
 exports.bootstrapDatepickerCss = bootstrapDatepickerCss;
-exports.bootstrapLess = bootstrapLess;
+exports.bootstrapLess = bootstrapSass;
 
 exports.default = parallel(
   fontAwesomeCss, fontAwesomeFonts,
   bootstrapDatepickerJs, bootstrapDatepickerCss,
-  bootstrapLess
+  bootstrapSass
 );