From c24251e8f2dba6666abb77ae7459a314442773e1 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 30 May 2018 14:22:13 -0600 Subject: [PATCH 1/4] Fixed double encoding --- views/auth-callback.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/auth-callback.njk b/views/auth-callback.njk index 7119a62554..cfd439ea05 100644 --- a/views/auth-callback.njk +++ b/views/auth-callback.njk @@ -4,7 +4,7 @@ {% include "partials/data.njk" %} - + From c98830aa63bc6caeb4cd83ea96b2a17fb841bc04 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Wed, 30 May 2018 22:23:52 +0200 Subject: [PATCH 2/4] Fix DropDown display bug --- .../src/routes/Community/components/People.css | 1 + .../src/routes/Community/components/People.js | 2 +- .../src/routes/Stories/components/Stories.css | 5 +---- .../src/routes/Stories/components/Stories.js | 14 +++----------- client/coral-ui/components/Dropdown.css | 1 + client/coral-ui/components/Option.css | 1 + 6 files changed, 8 insertions(+), 16 deletions(-) diff --git a/client/coral-admin/src/routes/Community/components/People.css b/client/coral-admin/src/routes/Community/components/People.css index 669da480df..ac565c8f8a 100644 --- a/client/coral-admin/src/routes/Community/components/People.css +++ b/client/coral-admin/src/routes/Community/components/People.css @@ -133,6 +133,7 @@ th.header:nth-child(2), th.header:nth-child(3) { .roleDropdown { width: 150px; + text-align: left; } .roleOption { diff --git a/client/coral-admin/src/routes/Community/components/People.js b/client/coral-admin/src/routes/Community/components/People.js index ce9a8b75a6..d152f83e39 100644 --- a/client/coral-admin/src/routes/Community/components/People.js +++ b/client/coral-admin/src/routes/Community/components/People.js @@ -202,7 +202,7 @@ class People extends React.Component { this.props.onStatusChange(value, id)} > - ); }; diff --git a/client/coral-ui/components/Dropdown.css b/client/coral-ui/components/Dropdown.css index 3128a8be42..400654f944 100644 --- a/client/coral-ui/components/Dropdown.css +++ b/client/coral-ui/components/Dropdown.css @@ -1,4 +1,5 @@ .dropdown { + display: inline-block; position: relative; } diff --git a/client/coral-ui/components/Option.css b/client/coral-ui/components/Option.css index eb76df93d3..cc5ac1263b 100644 --- a/client/coral-ui/components/Option.css +++ b/client/coral-ui/components/Option.css @@ -1,4 +1,5 @@ .option { + min-width: 100px; width: 100%; padding: 10px; outline: none; From 9d752685cdecfcb63eb1da778f33168d517ba799 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Thu, 31 May 2018 11:27:02 -0600 Subject: [PATCH 3/4] resolved custom css loading issue --- views/embed/stream.njk | 3 +++ views/login.njk | 3 +++ views/templates/account.njk | 3 +++ views/templates/base.njk | 1 - 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/views/embed/stream.njk b/views/embed/stream.njk index ddc620f8ee..c9504b3d0e 100644 --- a/views/embed/stream.njk +++ b/views/embed/stream.njk @@ -5,6 +5,9 @@ {% block css %} + +{# Custom CSS is included after the CSS block so that it's overrides will apply #} +{% include "partials/custom-css.njk" %} {% endblock %} {% block html %} diff --git a/views/login.njk b/views/login.njk index 6a3c1112fd..55e4ef45b6 100644 --- a/views/login.njk +++ b/views/login.njk @@ -4,6 +4,9 @@ {% block css %} + +{# Custom CSS is included after the CSS block so that it's overrides will apply #} +{% include "partials/custom-css.njk" %} {% endblock %} {% block html %} diff --git a/views/templates/account.njk b/views/templates/account.njk index 7e1b6e6c99..0ff558c9d9 100644 --- a/views/templates/account.njk +++ b/views/templates/account.njk @@ -3,4 +3,7 @@ {% block css %} + +{# Custom CSS is included after the CSS block so that it's overrides will apply #} +{% include "partials/custom-css.njk" %} {% endblock %} diff --git a/views/templates/base.njk b/views/templates/base.njk index 23048151e2..3a5331a1d8 100644 --- a/views/templates/base.njk +++ b/views/templates/base.njk @@ -19,7 +19,6 @@ - {% include "partials/custom-css.njk" %} {% block css %}{% endblock %} {# Static data injection #} From 135f0e300f0039d7031b9f782c96b9f4fe6dc43e Mon Sep 17 00:00:00 2001 From: Kim Gardner Date: Thu, 31 May 2018 13:33:34 -0400 Subject: [PATCH 4/4] Small typo --- views/embed/stream.njk | 2 +- views/login.njk | 2 +- views/templates/account.njk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/views/embed/stream.njk b/views/embed/stream.njk index c9504b3d0e..9b237b5c2c 100644 --- a/views/embed/stream.njk +++ b/views/embed/stream.njk @@ -6,7 +6,7 @@ -{# Custom CSS is included after the CSS block so that it's overrides will apply #} +{# Custom CSS is included after the CSS block so that its overrides will apply #} {% include "partials/custom-css.njk" %} {% endblock %} diff --git a/views/login.njk b/views/login.njk index 55e4ef45b6..7198dbdff5 100644 --- a/views/login.njk +++ b/views/login.njk @@ -5,7 +5,7 @@ {% block css %} -{# Custom CSS is included after the CSS block so that it's overrides will apply #} +{# Custom CSS is included after the CSS block so that its overrides will apply #} {% include "partials/custom-css.njk" %} {% endblock %} diff --git a/views/templates/account.njk b/views/templates/account.njk index 0ff558c9d9..bcda22a67b 100644 --- a/views/templates/account.njk +++ b/views/templates/account.njk @@ -4,6 +4,6 @@ -{# Custom CSS is included after the CSS block so that it's overrides will apply #} +{# Custom CSS is included after the CSS block so that its overrides will apply #} {% include "partials/custom-css.njk" %} {% endblock %}