Skip to content

Commit

Permalink
Merge pull request ckan#6287 from ckan/update_sass_documentation
Browse files Browse the repository at this point in the history
Update documentation and cli command to refer sass
  • Loading branch information
amercader authored Aug 19, 2021
2 parents 8fb4629 + ee55ff5 commit 37b3966
Show file tree
Hide file tree
Showing 22 changed files with 30 additions and 1,871 deletions.
1 change: 1 addition & 0 deletions changes/6287.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLI command less is now renamed to sass as the preprocessor was changed in #6175.
4 changes: 2 additions & 2 deletions ckan/cli/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
plugin_info,
notify,
tracking,
less,
sass,
generate,
user
)
Expand Down Expand Up @@ -211,6 +211,6 @@ def ckan():
ckan.add_command(plugin_info.plugin_info)
ckan.add_command(notify.notify)
ckan.add_command(tracking.tracking)
ckan.add_command(less.less)
ckan.add_command(sass.sass)
ckan.add_command(generate.generate)
ckan.add_command(user.user)
10 changes: 5 additions & 5 deletions ckan/cli/less.py → ckan/cli/sass.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@


@click.command(
name=u'less',
short_help=u'Compile all root less documents into their CSS counterparts')
def less():
name=u'sass',
short_help=u'Compile all root sass documents into their CSS counterparts')
def sass():
command = (u'npm', u'run', u'build')

public = config.get(u'ckan.base_public_folder')

root = os.path.join(os.path.dirname(__file__), u'..', public, u'base')
root = os.path.abspath(root)
_compile_less(root, command, u'main')
_compile_sass(root, command, u'main')


def _compile_less(root, command, color):
def _compile_sass(root, command, color):
click.echo(u'compile {}.css'.format(color))
command = command + (u'--', u'--' + color)

Expand Down
34 changes: 0 additions & 34 deletions ckan/public/base/vendor/font-awesome/less/animated.less

This file was deleted.

25 changes: 0 additions & 25 deletions ckan/public/base/vendor/font-awesome/less/bordered-pulled.less

This file was deleted.

12 changes: 0 additions & 12 deletions ckan/public/base/vendor/font-awesome/less/core.less

This file was deleted.

6 changes: 0 additions & 6 deletions ckan/public/base/vendor/font-awesome/less/fixed-width.less

This file was deleted.

18 changes: 0 additions & 18 deletions ckan/public/base/vendor/font-awesome/less/font-awesome.less

This file was deleted.

789 changes: 0 additions & 789 deletions ckan/public/base/vendor/font-awesome/less/icons.less

This file was deleted.

13 changes: 0 additions & 13 deletions ckan/public/base/vendor/font-awesome/less/larger.less

This file was deleted.

19 changes: 0 additions & 19 deletions ckan/public/base/vendor/font-awesome/less/list.less

This file was deleted.

60 changes: 0 additions & 60 deletions ckan/public/base/vendor/font-awesome/less/mixins.less

This file was deleted.

15 changes: 0 additions & 15 deletions ckan/public/base/vendor/font-awesome/less/path.less

This file was deleted.

20 changes: 0 additions & 20 deletions ckan/public/base/vendor/font-awesome/less/rotated-flipped.less

This file was deleted.

5 changes: 0 additions & 5 deletions ckan/public/base/vendor/font-awesome/less/screen-reader.less

This file was deleted.

20 changes: 0 additions & 20 deletions ckan/public/base/vendor/font-awesome/less/stacked.less

This file was deleted.

Loading

0 comments on commit 37b3966

Please sign in to comment.