wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-15 11:26:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into translations

Browse Source
This commit is contained in:
Wyatt Johnson
2018-05-31 12:26:26 -06:00
committed by GitHub
parent f7899bc670 375ef09d78
commit 250a8ec2f1
11 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-admin/src/routes/Community/components/People.css
+1
View File
@@ -133,6 +133,7 @@ th.header:nth-child(2), th.header:nth-child(3) {
.roleDropdown {
width: 150px;
text-align: left;
}
.roleOption {
client/coral-admin/src/routes/Community/components/People.js
+1 -1
View File
@@ -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
)}
client/coral-admin/src/routes/Stories/components/Stories.css
+1 -4
View File
@@ -92,9 +92,6 @@
.statusDropdown {
width: 150px;
}
.statusDropdownOption {
min-width: 100px;
text-align: left;
}
client/coral-admin/src/routes/Stories/components/Stories.js
+3 -11
View File
@@ -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>
);
};
client/coral-ui/components/Dropdown.css
+1
View File
@@ -1,4 +1,5 @@
.dropdown {
display: inline-block;
position: relative;
}
client/coral-ui/components/Option.css
+1
View File
@@ -1,4 +1,5 @@
.option {
min-width: 100px;
width: 100%;
padding: 10px;
outline: none;
views/auth-callback.njk
+1 -1
View File
@@ -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>
views/embed/stream.njk
+3
View File
@@ -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 %}
views/login.njk
+3
View File
@@ -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 %}
views/templates/account.njk
+3
View File
@@ -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 %}
views/templates/base.njk
-1
View File
@@ -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 #}