diff --git a/README.rst b/README.rst index e7ffdeb..dc697ea 100644 --- a/README.rst +++ b/README.rst @@ -18,8 +18,8 @@ Glue is a simple command line tool to generate sprites:: $ glue source output -* The latest documentation is available at: http://glue.readthedocs.org -* Installation instructions: http://glue.readthedocs.org/en/latest/installation.html +* The latest documentation is available at: https://glue.readthedocs.io +* Installation instructions: https://glue.readthedocs.io/en/latest/installation.html * Glue-users mailing list: https://groups.google.com/forum/#!forum/glue-users Features @@ -31,18 +31,18 @@ Features - json (array, hash) - CAAT -* Automatic multi-dpi `retina `_ sprite creation. +* Automatic multi-dpi `retina `_ sprite creation. * Support for multi-sprite projects. * Create sprites from multiple folders (recursively). -* Multiple `algorithms `_ available. -* Automatic `crop of unnecessary transparent borders `_ around source images. -* Configurable `paddings and margin per image, sprite or project `_. +* Multiple `algorithms `_ available. +* Automatic `crop of unnecessary transparent borders `_ around source images. +* Configurable `paddings and margin per image, sprite or project `_. * Watch option to keep glue running watching for file changes. * Project-, Sprite- and Image-level configuration via static config files. -* Customizable `output `_ using jinja templates. +* Customizable `output `_ using jinja templates. * CSS: Optional .less/.scss output format. -* CSS: Configurable `cache busting for sprite images `_. -* CSS: Customizable `class names `_. +* CSS: Configurable `cache busting for sprite images `_. +* CSS: Customizable `class names `_. * Python ``2.6``, ``2.7`` and ``3.3+`` supported. * Really `well tested `_. @@ -63,7 +63,7 @@ And also an ``icons.css`` with all the necessary CSS classes for this sprite:: ... -Do you want to know more? Visit the quickstart guide: http://glue.readthedocs.org/en/latest/quickstart.html +Do you want to know more? Visit the quickstart guide: https://glue.readthedocs.io/en/latest/quickstart.html Contribute ----------- diff --git a/docs/changelog.rst b/docs/changelog.rst index 3fad1cd..ba068b5 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -53,10 +53,10 @@ Changelog * ``--margin`` now supports more than only one margin, you can now use it with (e.g.) ``--margin=10 20 10 20``. Fixes #101 * New ``setup.py`` fixing #110 * New options ``--source`` and ``--output`` will now complement the first and second positional argument. -* New option ``--css-template`` will allow you to choose your own css output `jinja template `_. +* New option ``--css-template`` will allow you to choose your own css output `jinja template `_. * New option ``--scss`` will use ``scss`` as file extension instead of ``css``. Fixing #86 * New option ``--json-format`` will allow to customize the json structure generated by ``--json``. -* New feature: Every settting is now configurable using `environment variables `_ and `configuration files `_. +* New feature: Every settting is now configurable using `environment variables `_ and `configuration files `_. * New option ``--pseudo-class-separator=_``. * Glue now support multiple css pseudo-classes applied to the same image #87. * Glue css pseudo-class separator is now ``__`` instead of ``_``. If you want to make ``glue`` work in legacy mode use the new option ``--pseudo-class-separator=_``. @@ -66,7 +66,7 @@ Changelog * This version includes **several** backward incompatible changes - **read this document carefully before upgrading**. - - Glue will **not** extract padding information from filenames. If you want to customize paddings individualy (per image), you should use `configuration files `_. + - Glue will **not** extract padding information from filenames. If you want to customize paddings individualy (per image), you should use `configuration files `_. - ``--imagemagick`` and ``--imagemagickpath`` are now deprecated. These options were introduced as a workaround in order to solve some scaling glitches caused by ``PIL``. Pillow ``2.2.0`` solves these issues. - ``--each-template``, ``--global-template`` and ``--ratio-template`` are now deprecated. CSS output customization can be easily done now using ``--css-template=template.jinja``. - ``--ignore-filename-paddings`` is now deprecated. Per-file customization can be easily (and more scalably) done now using configuration files. diff --git a/docs/files.rst b/docs/files.rst index e6f2cf3..3759863 100644 --- a/docs/files.rst +++ b/docs/files.rst @@ -40,7 +40,7 @@ If the ``remove.png`` image needs to have ``10px`` margin and ``0px`` padding yo This will override any previous setting about ``margin`` or ``padding`` affecting ``remove.png``. .. note:: - project-level, sprite-level and image-level settings override any environmnet or command-line settings. More information in the `settings section `_ + project-level, sprite-level and image-level settings override any environmnet or command-line settings. More information in the `settings section `_ Available configuration ----------------------- diff --git a/docs/index.rst b/docs/index.rst index 866f899..ad6a37a 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -12,18 +12,18 @@ Glue is a simple command line tool to generate sprites:: - json (array, hash) - CAAT -* Automatic multi-dpi `retina `_ sprite creation. +* Automatic multi-dpi `retina `_ sprite creation. * Support for multi-sprite projects. * Create sprites from multiple folders (recursively). -* Multiple `algorithms `_ available. -* Automatic `crop of unnecessary transparent borders `_ around source images. +* Multiple `algorithms `_ available. +* Automatic `crop of unnecessary transparent borders `_ around source images. * Configurable paddings and margin per image, sprite or project. * Watch option to keep glue running watching for file changes. * Project-, Sprite- and Image-level configuration via static config files. -* Customizable `output `_ using jinja templates. +* Customizable `output `_ using jinja templates. * CSS: Optional .less/.scss output format. -* CSS: Configurable `cache busting for sprite images `_. -* CSS: Customizable `class names `_. +* CSS: Configurable `cache busting for sprite images `_. +* CSS: Customizable `class names `_. Documentation -------------