Merge branch 'master' into use-talk-linting-preset

Conflicts: package.json
2026-07-13 17:12:51 +08:00 · 2017-09-29 23:55:33 +07:00
parent 799a21fecd 09ee854302
commit d396f43fe3
47 changed files with 536 additions and 398 deletions
@@ -73,7 +73,9 @@ export default class PermalinkButton extends React.Component {
            ref={(ref) => this.linkButton = ref}
            onClick={this.toggle}
            className={cn(`${name}-button`, styles.button)}>
-            {t('permalink')}
+            <span className='talk-plugin-permalink-button-label'>
+              {t('permalink')}
+            </span>
            <Icon name="link" className={styles.icon}/>
          </button>