Merge branch 'release/v0.1.5'

colour-science · Jun 10, 2018 · ccc4fe1 · ccc4fe1
2 parents f7b7b53 + 66ed484
commit ccc4fe1
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 17 deletions.
diff --git a/app.py b/app.py
@@ -21,7 +21,7 @@
 
 __major_version__ = '0'
 __minor_version__ = '1'
-__change_version__ = '4'
+__change_version__ = '5'
 __version__ = '.'.join(
     (__major_version__,
      __minor_version__,

diff --git a/apps/rgb_colourspace_models_chromatically_adapted_primaries.py b/apps/rgb_colourspace_models_chromatically_adapted_primaries.py
@@ -70,19 +70,22 @@
             id='colourspace-{0}'.format(APP_UID),
             options=RGB_COLOURSPACES_OPTIONS,
             value=RGB_COLOURSPACES_OPTIONS[0]['value'],
-            clearable=False),
+            clearable=False,
+            className='app-widget'),
         H5(children='Illuminant'),
         Dropdown(
             id='illuminant-{0}'.format(APP_UID),
             options=ILLUMINANTS_OPTIONS,
             value=ILLUMINANTS_OPTIONS[0]['value'],
-            clearable=False),
+            clearable=False,
+            className='app-widget'),
         H5(children='Chromatic Adaptation Transform'),
         Dropdown(
             id='chromatic-adaptation-transform-{0}'.format(APP_UID),
             options=CHROMATIC_ADAPTATION_TRANSFORM_OPTIONS,
             value=CHROMATIC_ADAPTATION_TRANSFORM_OPTIONS[0]['value'],
-            clearable=False),
+            clearable=False,
+            className='app-widget'),
         H5(children='Formatter'),
         Dropdown(
             id='formatter-{0}'.format(APP_UID),
@@ -94,7 +97,8 @@
                 'value': 'repr'
             }],
             value='str',
-            clearable=False),
+            clearable=False,
+            className='app-widget'),
         H5(children='Decimals'),
         Slider(
             id='decimals-{0}'.format(APP_UID),
@@ -103,12 +107,13 @@
             step=1,
             value=10,
             marks={i + 1: str(i + 1)
-                   for i in range(15)}),
+                   for i in range(15)},
+            className='app-widget'),
         Pre([Code(id='primaries-{0}'.format(APP_UID), className='code shell')],
-            className='app-output'),
+            className='app-widget app-output'),
         Ul([
             Li([Link('Back to index...', href='/')],
-               className='list-inline-item'),
+               className='app-link list-inline-item'),
             Li([
                 A('Permalink',
                   href=urlparse.urljoin(SERVER_URL, APP_PATH),

diff --git a/apps/rgb_colourspace_models_transformation_matrix.py b/apps/rgb_colourspace_models_transformation_matrix.py
@@ -71,19 +71,22 @@
             id='input-colourspace-{0}'.format(APP_UID),
             options=RGB_COLOURSPACES_OPTIONS,
             value=RGB_COLOURSPACES_OPTIONS[0]['value'],
-            clearable=False),
+            clearable=False,
+            className='app-widget'),
         H5(children='Output Colourspace'),
         Dropdown(
             id='output-colourspace-{0}'.format(APP_UID),
             options=RGB_COLOURSPACES_OPTIONS,
             value=RGB_COLOURSPACES_OPTIONS[0]['value'],
-            clearable=False),
+            clearable=False,
+            className='app-widget'),
         H5(children='Chromatic Adaptation Transform'),
         Dropdown(
             id='chromatic-adaptation-transform-{0}'.format(APP_UID),
             options=CHROMATIC_ADAPTATION_TRANSFORM_OPTIONS,
             value=CHROMATIC_ADAPTATION_TRANSFORM_OPTIONS[0]['value'],
-            clearable=False),
+            clearable=False,
+            className='app-widget'),
         H5(children='Formatter'),
         Dropdown(
             id='formatter-{0}'.format(APP_UID),
@@ -98,7 +101,8 @@
                 'value': 'Nuke'
             }],
             value='str',
-            clearable=False),
+            clearable=False,
+            className='app-widget'),
         H5(children='Decimals'),
         Slider(
             id='decimals-{0}'.format(APP_UID),
@@ -107,16 +111,17 @@
             step=1,
             value=10,
             marks={i + 1: str(i + 1)
-                   for i in range(15)}),
+                   for i in range(15)},
+            className='app-widget'),
         Pre([
             Code(
                 id='RGB-transformation-matrix-{0}'.format(APP_UID),
                 className='code shell')
         ],
-            className='app-output'),
+            className='app-widget app-output'),
         Ul([
             Li([Link('Back to index...', href='/')],
-               className='list-inline-item'),
+               className='app-link list-inline-item'),
             Li([
                 A('Permalink',
                   href=urlparse.urljoin(SERVER_URL, APP_PATH),

diff --git a/index.py b/index.py
@@ -59,9 +59,15 @@ def load_app(app):
                   href='https://github.com/colour-science/colour',
                   target='_blank'), '.'
             ]),
-            H3([Link(app_1.APP_NAME, href=app_1.APP_PATH)]),
+            H3([
+                Link(
+                    app_1.APP_NAME, href=app_1.APP_PATH, className='app-link')
+            ]),
             Markdown(app_1.APP_DESCRIPTION.replace('This app c', 'C')),
-            H3([Link(app_2.APP_NAME, href=app_2.APP_PATH)]),
+            H3([
+                Link(
+                    app_2.APP_NAME, href=app_2.APP_PATH, className='app-link')
+            ]),
             Markdown(app_2.APP_DESCRIPTION.replace('This app c', 'C')),
         ])