Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse source
This commit is contained in:
Claire 2021-02-22 15:23:46 +01:00
commit 679642e26c
56 changed files with 761 additions and 359 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/javascript/mastodon/components/autosuggest_input.js
View file

@ -6,7 +6,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import ImmutablePureComponent from 'react-immutable-pure-component';
import classNames from 'classnames';
import { List as ImmutableList } from 'immutable';
const textAtCursorMatchesToken = (str, caretPosition, searchTokens) => {
let word;
@ -55,7 +54,7 @@ export default class AutosuggestInput extends ImmutablePureComponent {
static defaultProps = {
autoFocus: true,
searchTokens: ImmutableList(['@', ':', '#']),
searchTokens: ['@', ':', '#'],
};
state = {

21
app/javascript/styles/mastodon/about.scss
View file

@ -884,3 +884,24 @@ $small-breakpoint: 960px;
}
}
.rules-list {
background: darken($ui-base-color, 2%);
border: 1px solid darken($ui-base-color, 8%);
border-radius: 4px;
padding: 0.5em 2.5em !important;
margin-top: 1.85em !important;
li {
border-bottom: 1px solid lighten($ui-base-color, 4%);
color: $dark-text-color;
padding: 1em;
&:last-child {
border-bottom: 0;
}
}
&__text {
color: $primary-text-color;
}
}