Merge branch 'master' into translations

chetan-jain · May 31, 2018 · 250a8ec · 250a8ec
2 parents f7899bc + 375ef09
commit 250a8ec
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git 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
@@ -202,7 +202,7 @@ class People extends React.Component {
                         </td>
                         <td className="mdl-data-table__cell--non-numeric">
                           <Dropdown
-                            className={cn(
+                            toggleClassName={cn(
                               'talk-admin-community-people-dd-role',
                               styles.roleDropdown
                             )}

diff --git a/client/coral-admin/src/routes/Stories/components/Stories.css b/client/coral-admin/src/routes/Stories/components/Stories.css
@@ -92,9 +92,6 @@
 
 .statusDropdown {
   width: 150px;
-}
-
-.statusDropdownOption {
-  min-width: 100px;
+  text-align: left;
 }
 
diff --git a/client/coral-admin/src/routes/Stories/components/Stories.js b/client/coral-admin/src/routes/Stories/components/Stories.js
@@ -22,20 +22,12 @@ class Stories extends Component {
     const closed = !!(closedAt && new Date(closedAt).getTime() < Date.now());
     return (
       <Dropdown
-        className={styles.statusDropdown}
+        toggleClassName={styles.statusDropdown}
         value={closed}
         onChange={value => this.props.onStatusChange(value, id)}
       >
-        <Option
-          value={false}
-          label={t('streams.open')}
-          className={styles.statusDropdownOption}
-        />
-        <Option
-          value={true}
-          label={t('streams.closed')}
-          className={styles.statusDropdownOption}
-        />
+        <Option value={false} label={t('streams.open')} />
+        <Option value={true} label={t('streams.closed')} />
       </Dropdown>
     );
   };

diff --git 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
@@ -1,4 +1,5 @@
 .option {
+  min-width: 100px;
   width: 100%;
   padding: 10px;
   outline: none;

diff --git a/views/auth-callback.njk b/views/auth-callback.njk
@@ -4,7 +4,7 @@
     {% include "partials/data.njk" %}
   </head>
   <body>
-    <script type="application/json" id="auth">{{ encodeJSONForHTML(auth) }}</script>
+    <script type="application/json" id="auth">{{ encodeJSONForHTML(auth) | safe }}</script>
     <script type="text/javascript" src="{{ resolve('coral-auth-callback/bundle.js') }}"></script>
   </body>
 </html>
diff --git a/views/embed/stream.njk b/views/embed/stream.njk
@@ -5,6 +5,9 @@
 {% block css %}
 <link href="{{ resolve('embed/stream/default.css')}}" rel="stylesheet">
 <link href="{{ resolve('embed/stream/bundle.css')}}" rel="stylesheet">
+
+{# Custom CSS is included after the CSS block so that its overrides will apply #}
+{% include "partials/custom-css.njk" %}
 {% endblock %}
 
 {% block html %}

diff --git a/views/login.njk b/views/login.njk
@@ -4,6 +4,9 @@
 
 {% block css %}
 <link href="{{ resolve('coral-login/bundle.css')}}" rel="stylesheet">
+
+{# Custom CSS is included after the CSS block so that its overrides will apply #}
+{% include "partials/custom-css.njk" %}
 {% endblock %}
 
 {% block html %}

diff --git a/views/templates/account.njk b/views/templates/account.njk
@@ -3,4 +3,7 @@
 {% block css %}
 <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
 <link rel="stylesheet" href="{{ BASE_PATH }}public/css/admin.css">
+
+{# 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/base.njk b/views/templates/base.njk
@@ -19,7 +19,6 @@
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600" rel="stylesheet">
-    {% include "partials/custom-css.njk" %}
     {% block css %}{% endblock %}
 
     {# Static data injection #}