Merge branch 'master' into reject-username

2026-07-31 12:50:48 +08:00 · 2018-05-31 11:23:21 -04:00
parent b7768ccaf6 a638dafd85
commit c5a6f8a0b3
7 changed files with 9 additions and 17 deletions
@@ -133,6 +133,7 @@ th.header:nth-child(2), th.header:nth-child(3) {

 .roleDropdown {
  width: 150px;
+  text-align: left;
 }

 .roleOption {
@@ -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
                            )}
@@ -92,9 +92,6 @@

 .statusDropdown {
  width: 150px;
-}
-
-.statusDropdownOption {
-  min-width: 100px;
+  text-align: left;
 }

@@ -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>
    );
  };
@@ -1,4 +1,5 @@
 .dropdown {
+  display: inline-block;
  position: relative;
 }

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