From 24fb5d75725f584b0f8d12c8331b15f724ff847d Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 21 Feb 2021 19:50:12 +0100 Subject: [Glitch] Add server rules Port SCSS changes from 8331fdf7e0ea85ecc6d7dbff00b784bb6aa1f7d4 to glitch-soc Signed-off-by: Claire --- app/javascript/flavours/glitch/styles/about.scss | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'app/javascript/flavours/glitch') diff --git a/app/javascript/flavours/glitch/styles/about.scss b/app/javascript/flavours/glitch/styles/about.scss index de821fbe4..cdf2d116b 100644 --- a/app/javascript/flavours/glitch/styles/about.scss +++ b/app/javascript/flavours/glitch/styles/about.scss @@ -886,3 +886,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; + } +} -- cgit From 6ae04d990c50c12e171fc2a3d2593fa42d9c4c9c Mon Sep 17 00:00:00 2001 From: abcang Date: Mon, 22 Feb 2021 19:26:08 +0900 Subject: [Glitch] Fix default searchTokens Port 2127f40e6bf6deab62f48030263c459d14fed364 to glitch-soc Signed-off-by: Claire --- app/javascript/flavours/glitch/components/autosuggest_input.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/javascript/flavours/glitch') diff --git a/app/javascript/flavours/glitch/components/autosuggest_input.js b/app/javascript/flavours/glitch/components/autosuggest_input.js index cc0ff7dea..b40a2ff35 100644 --- a/app/javascript/flavours/glitch/components/autosuggest_input.js +++ b/app/javascript/flavours/glitch/components/autosuggest_input.js @@ -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 = { -- cgit