Skip to content

Commit

Permalink
Merge branch 'release/v0.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
KelSolaar committed Jun 5, 2018
2 parents 15e169a + 80787cb commit b7f2b40
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 10 deletions.
2 changes: 1 addition & 1 deletion app.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

__major_version__ = '0'
__minor_version__ = '1'
__change_version__ = '0'
__change_version__ = '1'
__version__ = '.'.join(
(__major_version__,
__minor_version__,
Expand Down
12 changes: 10 additions & 2 deletions apps/rgb_colourspace_models_chromatically_adapted_primaries.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,16 @@
className='app-output'),
Ul([
Li([Link('Back to index...', href='/')]),
Li([A('Permalink', href=urlparse.urljoin(SERVER_URL, APP_PATH))]),
Li([A('colour-science.org', href='http://colour-science.org')]),
Li([
A('Permalink',
href=urlparse.urljoin(SERVER_URL, APP_PATH),
target='_blank')
]),
Li([
A('colour-science.org',
href='http://colour-science.org',
target='_blank')
]),
],
className='list-inline text-center'),
],
Expand Down
12 changes: 10 additions & 2 deletions apps/rgb_colourspace_models_transformation_matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,16 @@
className='app-output'),
Ul([
Li([Link('Back to index...', href='/')]),
Li([A('Permalink', href=urlparse.urljoin(SERVER_URL, APP_PATH))]),
Li([A('colour-science.org', href='http://colour-science.org')]),
Li([
A('Permalink',
href=urlparse.urljoin(SERVER_URL, APP_PATH),
target='_blank')
]),
Li([
A('colour-science.org',
href='http://colour-science.org',
target='_blank')
]),
],
className='list-inline text-center'),
],
Expand Down
15 changes: 10 additions & 5 deletions index.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

from dash.dependencies import Input, Output
from dash_core_components import Link, Location, Markdown
from dash_html_components import Div, H3
from dash_html_components import A, Div, H3, P

import apps.rgb_colourspace_models_transformation_matrix as app_1
import apps.rgb_colourspace_models_chromatically_adapted_primaries as app_2
Expand Down Expand Up @@ -53,10 +53,15 @@ def load_app(app):
return Div(
[
Div([
Markdown(
'Various colour science '
'[Dash](https://dash.plot.ly/) apps built on top of '
'[Colour](https://github.com/colour-science/colour).'),
P([
'Various colour science ',
A('Dash',
href='https://dash.plot.ly/',
target='_blank'), ' apps built on top of \n',
A('Colour',
href='https://github.com/colour-science/colour',
target='_blank'), '.'
]),
H3([Link(app_1.APP_NAME, href=app_1.APP_PATH)]),
Markdown(app_1.APP_DESCRIPTION.replace('This app c', 'C')),
H3([Link(app_2.APP_NAME, href=app_2.APP_PATH)]),
Expand Down

0 comments on commit b7f2b40

Please sign in to comment.