Progress
This commit is contained in:
mgabdev
parent
4acc21944c
commit
0626928899
@ -16,7 +16,7 @@ const AngleLeftIcon = ({
|
||||
aria-label={title}
|
||||
>
|
||||
<g>
|
||||
<path d='M 25.835938 32.011719 L 49.777344 8.070312 C 50.4375 7.414062 50.800781 6.535156 50.800781 5.59375 C 50.800781 4.65625 50.4375 3.777344 49.777344 3.121094 L 47.679688 1.023438 C 47.019531 0.363281 46.140625 0 45.203125 0 C 44.265625 0 43.386719 0.363281 42.730469 1.023438 L 14.222656 29.53125 C 13.558594 30.191406 13.199219 31.074219 13.199219 32.011719 C 13.199219 32.953125 13.558594 33.835938 14.222656 34.5 L 42.703125 62.976562 C 43.359375 63.636719 44.238281 64 45.179688 64 C 46.117188 64 46.996094 63.636719 47.652344 62.976562 L 49.75 60.878906 C 51.117188 59.515625 51.117188 57.292969 49.75 55.929688 Z M 25.835938 32.011719' />
|
||||
<path d='M 25.84 32.01 L 49.78 8.07 C 50.44 7.41 50.8 6.54 50.8 5.59 C 50.8 4.66 50.44 3.78 49.78 3.12 L 47.68 1.02 C 47.02 0.36 46.14 0 45.2 0 C 44.27 0 43.39 0.36 42.73 1.02 L 14.22 29.53 C 13.56 30.19 13.2 31.07 13.2 32.01 C 13.2 32.95 13.56 33.84 14.22 34.5 L 42.7 62.98 C 43.36 63.64 44.24 64 45.18 64 C 46.12 64 47 63.64 47.65 62.98 L 49.75 60.88 C 51.12 59.52 51.12 57.29 49.75 55.93 Z M 25.84 32.01' />
|
||||
</g>
|
||||
</svg>
|
||||
)
|
||||
|
||||
@ -16,7 +16,7 @@ const BlockIcon = ({
|
||||
aria-label={title}
|
||||
>
|
||||
<g>
|
||||
<path d='M 24 0 C 10.800781 0 0 10.800781 0 24 C 0 37.199219 10.800781 48 24 48 C 37.199219 48 48 37.199219 48 24 C 48 10.800781 37.199219 0 24 0 Z M 4.800781 24 C 4.800781 13.441406 13.441406 4.800781 24 4.800781 C 28.320312 4.800781 32.398438 6.238281 35.761719 8.878906 L 8.878906 35.761719 C 6.238281 32.398438 4.800781 28.320312 4.800781 24 Z M 24 43.199219 C 19.679688 43.199219 15.601562 41.761719 12.238281 39.121094 L 39.121094 12.238281 C 41.761719 15.601562 43.199219 19.679688 43.199219 24 C 43.199219 34.558594 34.558594 43.199219 24 43.199219 Z M 24 43.199219' />
|
||||
<path d='M 24 0 C 10.8 0 0 10.8 0 24 C 0 37.2 10.8 48 24 48 C 37.2 48 48 37.2 48 24 C 48 10.8 37.2 0 24 0 Z M 4.8 24 C 4.8 13.44 13.44 4.8 24 4.8 C 28.32 4.8 32.4 6.24 35.76 8.88 L 8.88 35.76 C 6.24 32.4 4.8 28.32 4.8 24 Z M 24 43.2 C 19.68 43.2 15.6 41.76 12.24 39.12 L 39.12 12.24 C 41.76 15.6 43.2 19.68 43.2 24 C 43.2 34.56 34.56 43.2 24 43.2 Z M 24 43.2' />
|
||||
</g>
|
||||
</svg>
|
||||
)
|
||||
|
||||
@ -16,8 +16,8 @@ const BlockQuoteIcon = ({
|
||||
aria-label={title}
|
||||
>
|
||||
<g>
|
||||
<path d='M 0 18.285156 L 6.855469 18.285156 L 2.285156 27.429688 L 9.144531 27.429688 L 13.714844 18.285156 L 13.714844 4.570312 L 0 4.570312 Z M 0 18.285156' />
|
||||
<path d='M 18.285156 4.570312 L 18.285156 18.285156 L 25.144531 18.285156 L 20.570312 27.429688 L 27.429688 27.429688 L 32 18.285156 L 32 4.570312 Z M 18.285156 4.570312' />
|
||||
<path d='M 0 18.29 L 6.86 18.29 L 2.29 27.43 L 9.14 27.43 L 13.71 18.29 L 13.71 4.57 L 0 4.57 Z M 0 18.29' />
|
||||
<path d='M 18.29 4.57 L 18.29 18.29 L 25.14 18.29 L 20.57 27.43 L 27.43 27.43 L 32 18.29 L 32 4.57 Z M 18.29 4.57' />
|
||||
</g>
|
||||
</svg>
|
||||
)
|
||||
|
||||
@ -16,7 +16,7 @@ const BoldIcon = ({
|
||||
aria-label={title}
|
||||
>
|
||||
<g>
|
||||
<path d='M 23.371094 15.519531 C 25.578125 13.976562 27.144531 11.484375 27.144531 9.144531 C 27.144531 3.988281 23.152344 0 18 0 L 3.714844 0 L 3.714844 32 L 19.804688 32 C 24.59375 32 28.285156 28.113281 28.285156 23.335938 C 28.285156 19.863281 26.308594 16.902344 23.371094 15.519531 Z M 10.570312 5.714844 L 17.429688 5.714844 C 19.324219 5.714844 20.855469 7.246094 20.855469 9.144531 C 20.855469 11.039062 19.324219 12.570312 17.429688 12.570312 L 10.570312 12.570312 Z M 18.570312 26.285156 L 10.570312 26.285156 L 10.570312 19.429688 L 18.570312 19.429688 C 20.46875 19.429688 22 20.960938 22 22.855469 C 22 24.753906 20.46875 26.285156 18.570312 26.285156 Z M 18.570312 26.285156' />
|
||||
<path d='M 23.37 15.52 C 25.58 13.98 27.14 11.48 27.14 9.14 C 27.14 3.99 23.15 0 18 0 L 3.71 0 L 3.71 32 L 19.8 32 C 24.59 32 28.29 28.11 28.29 23.34 C 28.29 19.86 26.31 16.9 23.37 15.52 Z M 10.57 5.71 L 17.43 5.71 C 19.32 5.71 20.86 7.25 20.86 9.14 C 20.86 11.04 19.32 12.57 17.43 12.57 L 10.57 12.57 Z M 18.57 26.29 L 10.57 26.29 L 10.57 19.43 L 18.57 19.43 C 20.47 19.43 22 20.96 22 22.86 C 22 24.75 20.47 26.29 18.57 26.29 Z M 18.57 26.29' />
|
||||
</g>
|
||||
</svg>
|
||||
)
|
||||
|
||||
19
app/javascript/gabsocial/assets/pro_icon.js
Normal file
19
app/javascript/gabsocial/assets/pro_icon.js
Normal file
@ -0,0 +1,19 @@
|
||||
const ProIcon = ({
|
||||
className = '',
|
||||
size = '32px',
|
||||
}) => (
|
||||
<svg
|
||||
className={className}
|
||||
xmlns='http://www.w3.org/2000/svg'
|
||||
width={size}
|
||||
height={size}
|
||||
viewBox='0 0 32 32'
|
||||
preserveAspectRatio='xMidYMid'
|
||||
>
|
||||
<g>
|
||||
<path d='M 29.28 12.36 C 29.22 12.27 29.15 12.19 29.08 12.12 L 17.63 0.67 C 16.74 -0.22 15.29 -0.22 14.39 0.67 C 14.39 0.67 14.39 0.67 14.39 0.67 L 2.95 12.12 C 2.05 13.02 2.05 14.46 2.95 15.36 C 3.02 15.43 3.1 15.49 3.18 15.55 C 4.13 16.2 5.41 16.05 6.21 15.22 L 12.55 8.9 C 12.89 8.57 13.17 8.18 13.39 7.76 L 13.7 7.07 L 13.7 29.55 C 13.65 30.72 14.47 31.75 15.62 31.97 C 16.87 32.17 18.04 31.32 18.25 30.08 C 18.27 29.95 18.28 29.81 18.28 29.68 L 18.28 7.11 L 18.5 7.6 C 18.73 8.08 19.04 8.52 19.42 8.89 L 25.75 15.22 C 26.55 16.05 27.83 16.2 28.79 15.55 C 29.8 14.81 30.03 13.38 29.28 12.36 Z M 29.28 12.36' />
|
||||
</g>
|
||||
</svg>
|
||||
)
|
||||
|
||||
export default ProIcon
|
||||
@ -16,7 +16,7 @@ const UnlockFilledIcon = ({
|
||||
aria-label={title}
|
||||
>
|
||||
<g>
|
||||
<path d='M 21.246094 0.3125 C 17.761719 0.753906 14.890625 1.9375 13.246094 3.589844 C 12.570312 4.265625 12.160156 4.90625 11.867188 5.75 L 11.644531 6.355469 L 11.644531 18.84375 L 9.21875 18.84375 C 6.460938 18.84375 6.195312 18.890625 5.03125 19.484375 C 4.054688 19.992188 3.191406 20.851562 2.683594 21.832031 C 2.007812 23.15625 2.042969 22.453125 2.042969 33.316406 C 2.042969 44.195312 2.007812 43.511719 2.691406 44.84375 C 3.183594 45.796875 4.054688 46.667969 5.023438 47.171875 C 6.382812 47.875 4.792969 47.820312 24.027344 47.820312 C 36.042969 47.820312 41.378906 47.796875 41.707031 47.722656 C 41.964844 47.671875 42.550781 47.449219 43.011719 47.226562 C 44.1875 46.667969 44.976562 45.867188 45.539062 44.703125 C 45.761719 44.238281 45.980469 43.679688 46.035156 43.449219 C 46.179688 42.863281 46.179688 23.804688 46.035156 23.21875 C 45.980469 22.988281 45.761719 22.425781 45.539062 21.972656 C 45.023438 20.878906 44.195312 20.027344 43.15625 19.492188 C 41.804688 18.800781 42.863281 18.84375 28.542969 18.84375 L 15.734375 18.84375 L 15.734375 13.023438 C 15.734375 6.496094 15.6875 6.960938 16.398438 6.328125 C 17.796875 5.101562 20.765625 4.328125 24.089844 4.335938 C 26.4375 4.335938 28.230469 4.640625 30.027344 5.332031 C 31.367188 5.847656 32.117188 6.460938 32.621094 7.476562 C 33.28125 8.765625 34.054688 9.191406 35.148438 8.871094 C 35.625 8.730469 36.3125 8.042969 36.4375 7.589844 C 36.773438 6.375 36.140625 4.773438 34.828125 3.503906 C 33.253906 1.972656 30.871094 0.960938 27.554688 0.390625 C 26.390625 0.195312 22.523438 0.140625 21.246094 0.3125 Z M 21.246094 0.3125' />
|
||||
<path d='M 21.25 0.31 C 17.76 0.75 14.89 1.94 13.25 3.59 C 12.57 4.27 12.16 4.91 11.87 5.75 L 11.64 6.36 L 11.64 18.84 L 9.22 18.84 C 6.46 18.84 6.2 18.89 5.03 19.48 C 4.05 19.99 3.19 20.85 2.68 21.83 C 2.01 23.16 2.04 22.45 2.04 33.32 C 2.04 44.2 2.01 43.51 2.69 44.84 C 3.18 45.8 4.05 46.67 5.02 47.17 C 6.38 47.88 4.79 47.82 24.03 47.82 C 36.04 47.82 41.38 47.8 41.71 47.72 C 41.96 47.67 42.55 47.45 43.01 47.23 C 44.19 46.67 44.98 45.87 45.54 44.7 C 45.76 44.24 45.98 43.68 46.04 43.45 C 46.18 42.86 46.18 23.8 46.04 23.22 C 45.98 22.99 45.76 22.43 45.54 21.97 C 45.02 20.88 44.2 20.03 43.16 19.49 C 41.8 18.8 42.86 18.84 28.54 18.84 L 15.73 18.84 L 15.73 13.02 C 15.73 6.5 15.69 6.96 16.4 6.33 C 17.8 5.1 20.77 4.33 24.09 4.34 C 26.44 4.34 28.23 4.64 30.03 5.33 C 31.37 5.85 32.12 6.46 32.62 7.48 C 33.28 8.77 34.05 9.19 35.15 8.87 C 35.63 8.73 36.31 8.04 36.44 7.59 C 36.77 6.38 36.14 4.77 34.83 3.5 C 33.25 1.97 30.87 0.96 27.55 0.39 C 26.39 0.2 22.52 0.14 21.25 0.31 Z M 21.25 0.31' />
|
||||
</g>
|
||||
</svg>
|
||||
)
|
||||
|
||||
@ -16,7 +16,7 @@ const VerifiedIcon = ({
|
||||
aria-label={title}
|
||||
>
|
||||
<g>
|
||||
<path fill='#3E99ED' d='M 27.3125 4.6875 C 24.292969 1.664062 20.273438 0 16 0 C 11.726562 0 7.707031 1.664062 4.6875 4.6875 C 1.664062 7.707031 0 11.726562 0 16 C 0 20.273438 1.664062 24.292969 4.6875 27.3125 C 7.707031 30.335938 11.726562 32 16 32 C 20.273438 32 24.292969 30.335938 27.3125 27.3125 C 30.335938 24.292969 32 20.273438 32 16 C 32 11.726562 30.335938 7.707031 27.3125 4.6875 Z M 23.644531 12.191406 L 14.703125 21.132812 C 14.519531 21.316406 14.28125 21.410156 14.039062 21.410156 C 13.800781 21.410156 13.558594 21.316406 13.375 21.132812 L 8.355469 16.113281 C 7.988281 15.746094 7.988281 15.152344 8.355469 14.785156 C 8.722656 14.421875 9.316406 14.421875 9.683594 14.785156 L 14.039062 19.144531 L 22.316406 10.867188 C 22.683594 10.5 23.277344 10.5 23.644531 10.867188 C 24.011719 11.230469 24.011719 11.824219 23.644531 12.191406 Z M 23.644531 12.191406' />
|
||||
<path fill='#3E99ED' d='M 27.31 4.69 C 24.29 1.66 20.27 0 16 0 C 11.73 0 7.71 1.66 4.69 4.69 C 1.66 7.71 0 11.73 0 16 C 0 20.27 1.66 24.29 4.69 27.31 C 7.71 30.34 11.73 32 16 32 C 20.27 32 24.29 30.34 27.31 27.31 C 30.34 24.29 32 20.27 32 16 C 32 11.73 30.34 7.71 27.31 4.69 Z M 23.64 12.19 L 14.7 21.13 C 14.52 21.32 14.28 21.41 14.04 21.41 C 13.8 21.41 13.56 21.32 13.38 21.13 L 8.36 16.11 C 7.99 15.75 7.99 15.15 8.36 14.79 C 8.72 14.42 9.32 14.42 9.68 14.79 L 14.04 19.14 L 22.32 10.87 C 22.68 10.5 23.28 10.5 23.64 10.87 C 24.01 11.23 24.01 11.82 23.64 12.19 Z M 23.64 12.19' />
|
||||
</g>
|
||||
</svg>
|
||||
)
|
||||
|
||||
@ -16,8 +16,8 @@ const WebsiteIcon = ({
|
||||
aria-label={title}
|
||||
>
|
||||
<g>
|
||||
<path d="M 42.507812 45.09375 L 5.445312 45.09375 C 2.441406 45.09375 0 42.652344 0 39.648438 L 0 8.222656 C 0 5.222656 2.441406 2.78125 5.445312 2.78125 L 42.507812 2.78125 C 45.511719 2.78125 47.953125 5.222656 47.953125 8.222656 L 47.953125 39.648438 C 47.953125 42.652344 45.511719 45.09375 42.507812 45.09375 Z M 5.445312 4.402344 C 3.335938 4.402344 1.621094 6.117188 1.621094 8.222656 L 1.621094 39.648438 C 1.621094 41.757812 3.335938 43.472656 5.445312 43.472656 L 42.507812 43.472656 C 44.617188 43.472656 46.332031 41.757812 46.332031 39.648438 L 46.332031 8.222656 C 46.332031 6.117188 44.617188 4.402344 42.507812 4.402344 Z M 5.445312 4.402344" />
|
||||
<path d="M 47.144531 13.636719 L 0.8125 13.636719 C 0.363281 13.636719 0 13.273438 0 12.824219 C 0 12.378906 0.363281 12.015625 0.8125 12.015625 L 47.144531 12.015625 C 47.589844 12.015625 47.953125 12.378906 47.953125 12.824219 C 47.953125 13.273438 47.589844 13.636719 47.144531 13.636719 Z M 47.144531 13.636719" />
|
||||
<path d='M 42.51 45.09 L 5.45 45.09 C 2.44 45.09 0 42.65 0 39.65 L 0 8.22 C 0 5.22 2.44 2.78 5.45 2.78 L 42.51 2.78 C 45.51 2.78 47.95 5.22 47.95 8.22 L 47.95 39.65 C 47.95 42.65 45.51 45.09 42.51 45.09 Z M 5.45 4.4 C 3.34 4.4 1.62 6.12 1.62 8.22 L 1.62 39.65 C 1.62 41.76 3.34 43.47 5.45 43.47 L 42.51 43.47 C 44.62 43.47 46.33 41.76 46.33 39.65 L 46.33 8.22 C 46.33 6.12 44.62 4.4 42.51 4.4 Z M 5.45 4.4' />
|
||||
<path d='M 47.14 13.64 L 0.81 13.64 C 0.36 13.64 0 13.27 0 12.82 C 0 12.38 0.36 12.02 0.81 12.02 L 47.14 12.02 C 47.59 12.02 47.95 12.38 47.95 12.82 C 47.95 13.27 47.59 13.64 47.14 13.64 Z M 47.14 13.64' />
|
||||
<rect x='7' y='20' width='33' height='2' />
|
||||
<rect x='7' y='27' width='33' height='2' />
|
||||
<rect x='7' y='35' width='33' height='2' />
|
||||
|
||||
@ -1,5 +1,16 @@
|
||||
import { defineMessages, injectIntl } from 'react-intl'
|
||||
import { defineMessages, FormattedMessage, injectIntl } from 'react-intl'
|
||||
import {
|
||||
source_url,
|
||||
version,
|
||||
} from '../initial_state'
|
||||
import {
|
||||
APP_NAME,
|
||||
DEFAULT_REL,
|
||||
} from '../constants'
|
||||
import Button from './button'
|
||||
import Divider from './divider'
|
||||
import Icon from './icon'
|
||||
import Text from './text'
|
||||
|
||||
const messages = defineMessages({
|
||||
title: { id: 'bundle_column_error.title', defaultMessage: 'Network error' },
|
||||
@ -24,9 +35,71 @@ class BundleColumnError extends PureComponent {
|
||||
const { intl: { formatMessage } } = this.props
|
||||
|
||||
return (
|
||||
<div className='error-column'>
|
||||
<Button title={formatMessage(messages.retry)} icon='refresh' onClick={this.handleRetry} size={64} />
|
||||
{formatMessage(messages.body)}
|
||||
<div className={[_s.default, _s.heightMin100VH, _s.width100PC, _s.alignItemsCenter, _s.justifyContentCenter].join(' ')}>
|
||||
<div className={[_s.default, _s.height53PX, _s.bgBrand, _s.alignItemsCenter, _s.z3, _s.top0, _s.right0, _s.left0, _s.posFixed].join(' ')} >
|
||||
<div className={[_s.default, _s.flexRow, _s.width1255PX].join(' ')}>
|
||||
|
||||
<div className={[_s.default, _s.flexRow].join(' ')}>
|
||||
|
||||
<h1 className={[_s.default, _s.mr15].join(' ')}>
|
||||
<Button href='/' isText aria-label='Gab' className={[_s.default, _s.justifyContentCenter, _s.noSelect, _s.noUnderline, _s.height53PX, _s.cursorPointer, _s.px10, _s.mr15].join(' ')}>
|
||||
<Icon id='logo' className={_s.fillWhite} />
|
||||
</Button>
|
||||
</h1>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className={[_s.default, _s.maxWidth640PX, _s.px15, _s.py10].join(' ')}>
|
||||
|
||||
<Icon id='warning' size='28px' className={[_s.default, _s.fillSecondary, _s.mb15].join(' ')} />
|
||||
|
||||
<Text size='medium' className={_s.pt15}>
|
||||
{formatMessage(messages.body)}
|
||||
</Text>
|
||||
|
||||
<div className={[_s.default, _s.py10, _s.my10].join(' ')}>
|
||||
<Text>
|
||||
{APP_NAME} ({version})
|
||||
</Text>
|
||||
|
||||
<div className={[_s.default, _s.flexRow, _s.mt10, _s.alignItemsCenter].join(' ')}>
|
||||
<Button
|
||||
isText
|
||||
href={source_url}
|
||||
rel={DEFAULT_REL}
|
||||
target='_blank'
|
||||
backgroundColor='tertiary'
|
||||
color='primary'
|
||||
radiusSmall
|
||||
className={[_s.py2, _s.px10].join(' ')}
|
||||
>
|
||||
<Text color='inherit'>
|
||||
<FormattedMessage
|
||||
id='errors.unexpected_crash.report_issue'
|
||||
defaultMessage='Report issue'
|
||||
/>
|
||||
</Text>
|
||||
</Button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<Divider />
|
||||
|
||||
<div className={[_s.default, _s.flexRow].join(' ')}>
|
||||
<Button
|
||||
icon='repost'
|
||||
onClick={this.handleRetry} size={64}
|
||||
>
|
||||
<Text align='center' color='inherit' className={_s.ml5}>
|
||||
{formatMessage(messages.retry)}
|
||||
</Text>
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
export default class CardView extends PureComponent {
|
||||
|
||||
static propTypes = {
|
||||
children: PropTypes.any,
|
||||
}
|
||||
|
||||
render() {
|
||||
const { children } = this.props
|
||||
|
||||
return (
|
||||
<div title='cardview' className={[_s.default].join(' ')}>
|
||||
{children}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
@ -10,11 +10,16 @@ const emojify = (str, customEmojis = {}) => {
|
||||
const tagCharsWithoutEmojis = '<&';
|
||||
const tagCharsWithEmojis = Object.keys(customEmojis).length ? '<&:' : '<&';
|
||||
let rtn = '', tagChars = tagCharsWithEmojis, invisible = 0;
|
||||
|
||||
for (;;) {
|
||||
let match, i = 0, tag;
|
||||
while (i < str.length && (tag = tagChars.indexOf(str[i])) === -1 && (invisible || !(match = trie.search(str.slice(i))))) {
|
||||
i += str.codePointAt(i) < 65536 ? 1 : 2;
|
||||
}
|
||||
|
||||
let size = 16;
|
||||
let mt = -3;
|
||||
|
||||
let rend, replacement = '';
|
||||
if (i === str.length) {
|
||||
break;
|
||||
@ -29,7 +34,7 @@ const emojify = (str, customEmojis = {}) => {
|
||||
// if you want additional emoji handler, add statements below which set replacement and return true.
|
||||
if (shortname in customEmojis) {
|
||||
const filename = autoPlayGif ? customEmojis[shortname].url : customEmojis[shortname].static_url;
|
||||
replacement = `<img draggable="false" style="height:16px;width:16px;margin:-3px 0 0;font-family: 'object-fit:contain',inherit;vertical-align: middle;-o-object-fit: contain;object-fit: contain;" alt="${shortname}" title="${shortname}" src="${filename}" />`;
|
||||
replacement = `<img draggable="false" style="height:${size}px;width:${size}px;margin:${mt}px 0 0;font-family:'object-fit:contain',inherit;vertical-align:middle;-o-object-fit:contain;object-fit:contain;" alt="${shortname}" title="${shortname}" src="${filename}" />`;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@ -60,7 +65,7 @@ const emojify = (str, customEmojis = {}) => {
|
||||
} else { // matched to unicode emoji
|
||||
const { filename, shortCode } = unicodeMapping[match];
|
||||
const title = shortCode ? `:${shortCode}:` : '';
|
||||
replacement = `<img draggable="false" style="height:16px;width:16px;margin:-3px 0 0;font-family: 'object-fit:contain',inherit;vertical-align: middle;-o-object-fit: contain;object-fit: contain;" alt="${match}" title="${title}" src="${assetHost}/emoji/${filename}.svg" />`;
|
||||
replacement = `<img draggable="false" style="height:${size}px;width:${size}px;margin:${mt}px 0 0;font-family:'object-fit:contain',inherit;vertical-align:middle;-o-object-fit:contain;object-fit:contain;" alt="${match}" title="${title}" src="${assetHost}/emoji/${filename}.svg" />`;
|
||||
rend = i + match.length;
|
||||
// If the matched character was followed by VS15 (for selecting text presentation), skip it.
|
||||
if (str.codePointAt(rend) === 65038) {
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import { defineMessages, injectIntl } from 'react-intl'
|
||||
import { me } from '../initial_state'
|
||||
import { openModal } from '../actions/modal'
|
||||
import Button from './button'
|
||||
|
||||
@ -14,6 +15,7 @@ export default
|
||||
@injectIntl
|
||||
@connect(null, mapDispatchToProps)
|
||||
class FloatingActionButton extends PureComponent {
|
||||
|
||||
static propTypes = {
|
||||
intl: PropTypes.object.isRequired,
|
||||
onOpenCompose: PropTypes.func.isRequired,
|
||||
@ -26,6 +28,8 @@ class FloatingActionButton extends PureComponent {
|
||||
render() {
|
||||
const { intl, onOpenCompose } = this.props
|
||||
|
||||
if (!me) return null
|
||||
|
||||
const message = intl.formatMessage(messages.gab)
|
||||
|
||||
return (
|
||||
@ -39,4 +43,5 @@ class FloatingActionButton extends PureComponent {
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
@ -53,6 +53,7 @@ import PencilIcon from '../assets/pencil_icon'
|
||||
import PinIcon from '../assets/pin_icon'
|
||||
import PlayIcon from '../assets/play_icon'
|
||||
import PollIcon from '../assets/poll_icon'
|
||||
import ProIcon from '../assets/pro_icon'
|
||||
import RepostIcon from '../assets/repost_icon'
|
||||
import RichTextIcon from '../assets/rich_text_icon'
|
||||
import SearchIcon from '../assets/search_icon'
|
||||
@ -127,6 +128,7 @@ const ICONS = {
|
||||
'pin': PinIcon,
|
||||
'play': PlayIcon,
|
||||
'poll': PollIcon,
|
||||
'pro': ProIcon,
|
||||
'repost': RepostIcon,
|
||||
'rich-text': RichTextIcon,
|
||||
'search': SearchIcon,
|
||||
|
||||
@ -42,7 +42,7 @@ export default class LoggedOutNavigationBar extends PureComponent {
|
||||
|
||||
<ResponsiveClassesComponent
|
||||
classNames={[_s.default, _s.flexRow, _s.py5, _s.px10, _s.width330PX, _s.mlAuto].join(' ')}
|
||||
classNamesXS={[_s.default, _s.flexRow, _s.py5, _s.px10, _s.width100PC].join(' ')}
|
||||
classNamesXS={[_s.default, _s.flexRow, _s.pb5, _s.px10, _s.width100PC].join(' ')}
|
||||
>
|
||||
|
||||
<Button
|
||||
@ -51,7 +51,7 @@ export default class LoggedOutNavigationBar extends PureComponent {
|
||||
color='white'
|
||||
backgroundColor='none'
|
||||
href='/auth/log_in'
|
||||
className={[_s.borderColorWhite, _s.mr5, _s.flexGrow1, _s.alignItemsCenter, _s.justifyContentCenter, _s.py5].join(' ')}
|
||||
className={[_s.borderColorWhite, _s.mr5, _s.flexGrow1, _s.alignItemsCenter, _s.justifyContentCenter, _s.py7].join(' ')}
|
||||
>
|
||||
<Text color='inherit' weight='medium' align='center'>
|
||||
Log in
|
||||
@ -63,7 +63,7 @@ export default class LoggedOutNavigationBar extends PureComponent {
|
||||
color='brand'
|
||||
backgroundColor='white'
|
||||
href='/auth/sign_up'
|
||||
className={[_s.justifyContentCenter, _s.alignItemsCenter, _s.ml5, _s.flexGrow1, _s.py5].join(' ')}
|
||||
className={[_s.justifyContentCenter, _s.alignItemsCenter, _s.ml5, _s.flexGrow1, _s.py7].join(' ')}
|
||||
>
|
||||
<Text color='inherit' weight='bold' align='center'>
|
||||
Sign up
|
||||
|
||||
@ -1,11 +1,15 @@
|
||||
import { Fragment } from 'react'
|
||||
import { injectIntl, FormattedMessage, defineMessages } from 'react-intl'
|
||||
import classNames from 'classnames/bind'
|
||||
import { getWindowDimension } from '../../utils/is_mobile'
|
||||
import { openModal } from '../../actions/modal'
|
||||
import { cancelReplyCompose } from '../../actions/compose'
|
||||
import { BREAKPOINT_EXTRA_SMALL } from '../../constants'
|
||||
import {
|
||||
CX,
|
||||
BREAKPOINT_EXTRA_SMALL,
|
||||
} from '../../constants'
|
||||
import Responsive from '../../features/ui/util/responsive_component'
|
||||
import CardView from '../card_view'
|
||||
|
||||
const initialState = getWindowDimension()
|
||||
|
||||
const messages = defineMessages({
|
||||
confirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
|
||||
@ -26,8 +30,6 @@ const mapDispatchToProps = (dispatch) => ({
|
||||
},
|
||||
})
|
||||
|
||||
const cx = classNames.bind(_s)
|
||||
|
||||
export default
|
||||
@connect(mapStateToProps, mapDispatchToProps)
|
||||
@injectIntl
|
||||
@ -42,10 +44,12 @@ class ModalBase extends PureComponent {
|
||||
composeId: PropTypes.string,
|
||||
composeText: PropTypes.string,
|
||||
type: PropTypes.string,
|
||||
isCenteredXS: PropTypes.bool,
|
||||
}
|
||||
|
||||
state = {
|
||||
revealed: !!this.props.children,
|
||||
width: initialState.width,
|
||||
}
|
||||
|
||||
activeElement = this.state.revealed ? document.activeElement : null
|
||||
@ -74,7 +78,9 @@ class ModalBase extends PureComponent {
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
this.handleResize()
|
||||
window.addEventListener('keyup', this.handleKeyUp, false)
|
||||
window.addEventListener('resize', this.handleResize, false)
|
||||
}
|
||||
|
||||
componentWillReceiveProps(nextProps) {
|
||||
@ -104,8 +110,15 @@ class ModalBase extends PureComponent {
|
||||
}
|
||||
}
|
||||
|
||||
handleResize = () => {
|
||||
const { width } = getWindowDimension()
|
||||
|
||||
this.setState({ width })
|
||||
}
|
||||
|
||||
componentWillUnmount() {
|
||||
window.removeEventListener('keyup', this.handleKeyUp)
|
||||
window.removeEventListener('resize', this.handleResize, false)
|
||||
}
|
||||
|
||||
getSiblings = () => {
|
||||
@ -121,11 +134,13 @@ class ModalBase extends PureComponent {
|
||||
}
|
||||
|
||||
render() {
|
||||
const { children } = this.props
|
||||
const { children, isCenteredXS } = this.props
|
||||
const { width } = this.state
|
||||
|
||||
const isXS = width <= BREAKPOINT_EXTRA_SMALL
|
||||
const visible = !!children
|
||||
|
||||
const containerClasses = cx({
|
||||
const containerClasses = CX({
|
||||
default: 1,
|
||||
z4: 1,
|
||||
height100PC: visible,
|
||||
@ -133,6 +148,21 @@ class ModalBase extends PureComponent {
|
||||
displayNone: !visible,
|
||||
})
|
||||
|
||||
const dialogClasses = CX({
|
||||
default: 1,
|
||||
posFixed: 1,
|
||||
alignItemsCenter: 1,
|
||||
justifyContentCenter: !isXS || isCenteredXS,
|
||||
justifyContentEnd: isXS && !isCenteredXS,
|
||||
z4: 1,
|
||||
width100PC: 1,
|
||||
height100PC: 1,
|
||||
top0: 1,
|
||||
rightAuto: 1,
|
||||
bottomAuto: 1,
|
||||
left0: 1,
|
||||
})
|
||||
|
||||
return (
|
||||
<div ref={this.setRef} className={containerClasses}>
|
||||
{
|
||||
@ -142,26 +172,14 @@ class ModalBase extends PureComponent {
|
||||
role='presentation'
|
||||
className={[_s.default, _s.bgBlackOpaque, _s.posFixed, _s.z3, _s.top0, _s.right0, _s.bottom0, _s.left0].join(' ')}
|
||||
/>
|
||||
<Responsive min={BREAKPOINT_EXTRA_SMALL}>
|
||||
<div
|
||||
ref={this.setDialog}
|
||||
role='dialog'
|
||||
onClick={this.handleOnClose}
|
||||
className={[_s.default, _s.posFixed, _s.alignItemsCenter, _s.justifyContentCenter, _s.z4, _s.width100PC, _s.height100PC, _s.top0, _s.rightAuto, _s.bottomAuto, _s.left0].join(' ')}
|
||||
>
|
||||
{children}
|
||||
</div>
|
||||
</Responsive>
|
||||
<Responsive max={BREAKPOINT_EXTRA_SMALL}>
|
||||
<div
|
||||
ref={this.setDialog}
|
||||
role='dialog'
|
||||
onClick={this.handleOnClose}
|
||||
className={[_s.default, _s.posFixed, _s.alignItemsCenter, _s.justifyContentEnd, _s.z4, _s.width100PC, _s.height100PC, _s.top0, _s.rightAuto, _s.bottomAuto, _s.left0].join(' ')}
|
||||
>
|
||||
{children}
|
||||
</div>
|
||||
</Responsive>
|
||||
<div
|
||||
ref={this.setDialog}
|
||||
role='dialog'
|
||||
onClick={this.handleOnClose}
|
||||
className={dialogClasses}
|
||||
>
|
||||
{children}
|
||||
</div>
|
||||
</Fragment>
|
||||
}
|
||||
</div>
|
||||
|
||||
@ -13,6 +13,7 @@ const messages = defineMessages({
|
||||
export default
|
||||
@injectIntl
|
||||
class ModalLayout extends PureComponent {
|
||||
|
||||
static propTypes = {
|
||||
title: PropTypes.string,
|
||||
children: PropTypes.node,
|
||||
@ -20,6 +21,7 @@ class ModalLayout extends PureComponent {
|
||||
width: PropTypes.number,
|
||||
hideClose: PropTypes.bool,
|
||||
noPadding: PropTypes.bool,
|
||||
isXS: PropTypes.bool,
|
||||
}
|
||||
|
||||
static defaultProps = {
|
||||
@ -37,7 +39,8 @@ class ModalLayout extends PureComponent {
|
||||
intl,
|
||||
width,
|
||||
hideClose,
|
||||
noPadding
|
||||
noPadding,
|
||||
isXS,
|
||||
} = this.props
|
||||
|
||||
const childrenContainerClasses = cx({
|
||||
@ -49,14 +52,14 @@ class ModalLayout extends PureComponent {
|
||||
})
|
||||
|
||||
return (
|
||||
<div style={{width: `${width}px`}} className={_s.modal}>
|
||||
<div style={{width: `${width}px`}} className={[_s.default, _s.modal].join(' ')}>
|
||||
<Block>
|
||||
<div className={[_s.default, _s.flexRow, _s.alignItemsCenter, _s.justifyContentCenter, _s.borderBottom1PX, _s.borderColorSecondary, _s.height53PX, _s.px15].join(' ')}>
|
||||
<Heading size='h2'>
|
||||
{title}
|
||||
</Heading>
|
||||
{
|
||||
!hideClose &&
|
||||
!hideClose && !isXS &&
|
||||
<Button
|
||||
backgroundColor='none'
|
||||
title={intl.formatMessage(messages.close)}
|
||||
|
||||
@ -107,6 +107,17 @@ MODAL_COMPONENTS[MODAL_UNAUTHORIZED] = UnauthorizedModal
|
||||
MODAL_COMPONENTS[MODAL_UNFOLLOW] = UnfollowModal
|
||||
MODAL_COMPONENTS[MODAL_VIDEO] = VideoModal
|
||||
|
||||
const CENTERED_XS_MODALS = [
|
||||
MODAL_BLOCK_ACCOUNT,
|
||||
MODAL_BLOCK_DOMAIN,
|
||||
MODAL_CONFIRM,
|
||||
MODAL_GROUP_DELETE,
|
||||
MODAL_LIST_DELETE,
|
||||
MODAL_MUTE,
|
||||
MODAL_UNAUTHORIZED,
|
||||
MODAL_UNFOLLOW,
|
||||
]
|
||||
|
||||
const mapStateToProps = (state) => ({
|
||||
type: state.getIn(['modal', 'modalType']),
|
||||
props: state.getIn(['modal', 'modalProps'], {}),
|
||||
@ -161,7 +172,11 @@ class ModalRoot extends PureComponent {
|
||||
const visible = !!type
|
||||
|
||||
return (
|
||||
<ModalBase onClose={this.onClickClose} type={type}>
|
||||
<ModalBase
|
||||
onClose={this.onClickClose}
|
||||
isCenteredXS={CENTERED_XS_MODALS.indexOf(type) > -1}
|
||||
type={type}
|
||||
>
|
||||
{
|
||||
visible &&
|
||||
<Bundle
|
||||
|
||||
@ -47,6 +47,7 @@ class UnfollowModal extends PureComponent {
|
||||
render() {
|
||||
const { account, intl } = this.props
|
||||
|
||||
// : TODO :
|
||||
// , {
|
||||
// message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
|
||||
// confirm: intl.formatMessage(messages.unfollowConfirm),
|
||||
|
||||
@ -37,6 +37,11 @@ class NavigationBar extends ImmutablePureComponent {
|
||||
onOpenSidebar: PropTypes.func.isRequired,
|
||||
}
|
||||
|
||||
handleProfileClick = () => {
|
||||
// : todo :
|
||||
// open menu
|
||||
}
|
||||
|
||||
render() {
|
||||
const {
|
||||
title,
|
||||
|
||||
@ -31,15 +31,16 @@ class ProPanel extends PureComponent {
|
||||
<Button
|
||||
isBlock
|
||||
href={URL_GAB_PRO}
|
||||
icon='arrow-up'
|
||||
className={[_s.justifyContentCenter].join(' ')}
|
||||
icon='bold'
|
||||
iconSize='14px'
|
||||
className={[_s.justifyContentCenter, _s.alignItemsCenter].join(' ')}
|
||||
>
|
||||
<Text
|
||||
color='inherit'
|
||||
weight='medium'
|
||||
size='medium'
|
||||
align='center'
|
||||
className={_s.ml5}
|
||||
className={_s.ml10}
|
||||
>
|
||||
{intl.formatMessage(messages.title)}
|
||||
</Text>
|
||||
|
||||
@ -14,6 +14,7 @@ import {
|
||||
import { muteAccount } from '../../actions/accounts'
|
||||
import { initReport } from '../../actions/reports'
|
||||
import { openModal } from '../../actions/modal'
|
||||
import { closePopover } from '../../actions/popover'
|
||||
import { blockDomain, unblockDomain } from '../../actions/domain_blocks'
|
||||
import { unfollowModal, autoPlayGif, me, isStaff } from '../../initial_state'
|
||||
import { makeGetAccount } from '../../selectors'
|
||||
@ -83,6 +84,8 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
|
||||
},
|
||||
|
||||
onBlock(account) {
|
||||
dispatch(closePopover())
|
||||
|
||||
if (account.getIn(['relationship', 'blocking'])) {
|
||||
dispatch(unblockAccount(account.get('id')));
|
||||
} else {
|
||||
@ -93,10 +96,12 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
|
||||
},
|
||||
|
||||
onMention(account) {
|
||||
dispatch(closePopover())
|
||||
dispatch(mentionCompose(account));
|
||||
},
|
||||
|
||||
onRepostToggle(account) {
|
||||
dispatch(closePopover())
|
||||
if (account.getIn(['relationship', 'showing_reblogs'])) {
|
||||
dispatch(followAccount(account.get('id'), false));
|
||||
} else {
|
||||
@ -105,10 +110,12 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
|
||||
},
|
||||
|
||||
onReport(account) {
|
||||
dispatch(closePopover())
|
||||
dispatch(initReport(account));
|
||||
},
|
||||
|
||||
onMute(account) {
|
||||
dispatch(closePopover())
|
||||
if (account.getIn(['relationship', 'muting'])) {
|
||||
dispatch(unmuteAccount(account.get('id')));
|
||||
} else {
|
||||
@ -119,16 +126,19 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
|
||||
},
|
||||
|
||||
onBlockDomain(domain) {
|
||||
dispatch(closePopover())
|
||||
dispatch(openModal('BLOCK_DOMAIN', {
|
||||
domain,
|
||||
}));
|
||||
},
|
||||
|
||||
onUnblockDomain(domain) {
|
||||
dispatch(closePopover())
|
||||
dispatch(unblockDomain(domain));
|
||||
},
|
||||
|
||||
onAddToList(account) {
|
||||
dispatch(closePopover())
|
||||
dispatch(openModal('LIST_ADDER', {
|
||||
accountId: account.get('id'),
|
||||
}));
|
||||
|
||||
@ -94,6 +94,7 @@ class StatusVisibilityDropdown extends PureComponent {
|
||||
const iconClasses = cx({
|
||||
ml10: 1,
|
||||
mt2: 1,
|
||||
fillPrimary: !isActive,
|
||||
fillWhite: isActive,
|
||||
})
|
||||
|
||||
|
||||
@ -224,19 +224,22 @@ class ProfileHeader extends ImmutablePureComponent {
|
||||
<AccountActionButton account={account} />
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<Button
|
||||
isOutline
|
||||
icon='ellipsis'
|
||||
iconSize='18px'
|
||||
iconClassName={_s.inheritFill}
|
||||
color='brand'
|
||||
backgroundColor='none'
|
||||
className={[_s.justifyContentCenter, _s.alignItemsCenter, _s.px10].join(' ')}
|
||||
onClick={this.handleOpenMore}
|
||||
buttonRef={this.setOpenMoreNodeRef}
|
||||
/>
|
||||
</div>
|
||||
{
|
||||
!!me &&
|
||||
<div>
|
||||
<Button
|
||||
isOutline
|
||||
icon='ellipsis'
|
||||
iconSize='18px'
|
||||
iconClassName={_s.inheritFill}
|
||||
color='brand'
|
||||
backgroundColor='none'
|
||||
className={[_s.justifyContentCenter, _s.alignItemsCenter, _s.px10].join(' ')}
|
||||
onClick={this.handleOpenMore}
|
||||
buttonRef={this.setOpenMoreNodeRef}
|
||||
/>
|
||||
</div>
|
||||
}
|
||||
|
||||
</div>
|
||||
}
|
||||
@ -321,19 +324,22 @@ class ProfileHeader extends ImmutablePureComponent {
|
||||
{
|
||||
account && account.get('id') !== me &&
|
||||
<div className={[_s.default, _s.flexRow, _s.mlAuto, _s.py5].join(' ')}>
|
||||
<div>
|
||||
<Button
|
||||
isOutline
|
||||
icon='ellipsis'
|
||||
iconSize='18px'
|
||||
iconClassName={_s.inheritFill}
|
||||
color='brand'
|
||||
backgroundColor='none'
|
||||
className={[_s.justifyContentCenter, _s.alignItemsCenter, _s.mr10, _s.px10].join(' ')}
|
||||
onClick={this.handleOpenMore}
|
||||
buttonRef={this.setOpenMoreNodeRef}
|
||||
/>
|
||||
</div>
|
||||
{
|
||||
!!me &&
|
||||
<div>
|
||||
<Button
|
||||
isOutline
|
||||
icon='ellipsis'
|
||||
iconSize='18px'
|
||||
iconClassName={_s.inheritFill}
|
||||
color='brand'
|
||||
backgroundColor='none'
|
||||
className={[_s.justifyContentCenter, _s.alignItemsCenter, _s.mr10, _s.px10].join(' ')}
|
||||
onClick={this.handleOpenMore}
|
||||
buttonRef={this.setOpenMoreNodeRef}
|
||||
/>
|
||||
</div>
|
||||
}
|
||||
|
||||
<form action='https://chat.gab.com/private-message' method='POST'>
|
||||
<Button
|
||||
|
||||
@ -128,12 +128,13 @@ class Search extends PureComponent {
|
||||
default: 1,
|
||||
searchNavigation: (!highlighted && isInNav && theme === 'light') || (isInNav && theme !== 'light'),
|
||||
bgWhite: (highlighted && isInNav && theme === 'light'),
|
||||
bgPrimary: !isInNav,
|
||||
flexRow: 1,
|
||||
radiusSmall: 1,
|
||||
alignItemsCenter: 1,
|
||||
})
|
||||
|
||||
const prependIconColor = highlighted ? 'brand' : 'white'
|
||||
const prependIconColor = (highlighted || !isInNav) ? 'brand' : 'white'
|
||||
const placeholder = !me ? 'Search Gab' : 'Search for people, groups or news'
|
||||
const id = 'nav-search'
|
||||
|
||||
|
||||
@ -13,6 +13,7 @@ import Heading from './heading'
|
||||
import Text from './text'
|
||||
import List from './list'
|
||||
import { closeSidebar } from '../actions/sidebar'
|
||||
import { openModal } from '../actions/modal'
|
||||
import { shortNumberFormat } from '../utils/numbers'
|
||||
import { me } from '../initial_state'
|
||||
import { makeGetAccount } from '../selectors'
|
||||
@ -46,6 +47,9 @@ const mapStateToProps = (state) => ({
|
||||
|
||||
const mapDispatchToProps = (dispatch) => ({
|
||||
onCloseSidebar: () => dispatch(closeSidebar()),
|
||||
onOpenDisplayModel() {
|
||||
dispatch(openModal())
|
||||
}
|
||||
})
|
||||
|
||||
export default @connect(mapStateToProps, mapDispatchToProps)
|
||||
@ -109,7 +113,7 @@ class SidebarXS extends ImmutablePureComponent {
|
||||
},
|
||||
{
|
||||
icon: 'shop',
|
||||
href: 'https://shop.gab.com',
|
||||
href: 'https://shop.dissenter.com',
|
||||
onClick: this.handleSidebarClose,
|
||||
title: intl.formatMessage(messages.shop),
|
||||
},
|
||||
@ -173,6 +177,19 @@ class SidebarXS extends ImmutablePureComponent {
|
||||
onClick: this.handleSidebarClose,
|
||||
title: intl.formatMessage(messages.filters),
|
||||
},
|
||||
{
|
||||
// : todo :
|
||||
icon: 'user',
|
||||
onClick: this.handleSidebarClose, //on open display model
|
||||
title: intl.formatMessage(messages.filters),
|
||||
},
|
||||
{
|
||||
// : todo :
|
||||
icon: 'user',
|
||||
href: 'https://help.gab.com',
|
||||
onClick: this.handleSidebarClose,
|
||||
title: intl.formatMessage(messages.filters),
|
||||
},
|
||||
{
|
||||
icon: 'user',
|
||||
href: '/auth/sign_out',
|
||||
|
||||
@ -417,6 +417,7 @@ class Status extends ImmutablePureComponent {
|
||||
})
|
||||
|
||||
const containerClasses = cx({
|
||||
default: 1,
|
||||
radiusSmall: !isChild && !compactMode,
|
||||
bgPrimary: !isChild,
|
||||
boxShadowBlock: !isChild && !compactMode,
|
||||
|
||||
@ -84,6 +84,7 @@ class GroupCreate extends ImmutablePureComponent {
|
||||
onSetGroup: PropTypes.func.isRequired,
|
||||
onSubmit: PropTypes.func.isRequired,
|
||||
isSubmitting: PropTypes.bool,
|
||||
onClose: PropTypes.func,
|
||||
}
|
||||
|
||||
updateOnProps = [
|
||||
@ -114,6 +115,7 @@ class GroupCreate extends ImmutablePureComponent {
|
||||
|
||||
handleSubmit = (e) => {
|
||||
e.preventDefault()
|
||||
if (this.props.onClose) this.props.onClose()
|
||||
this.props.onSubmit(this.context.router.history)
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
import Sticky from 'react-stickynode'
|
||||
import { BREAKPOINT_EXTRA_SMALL } from '../constants'
|
||||
import {
|
||||
CX,
|
||||
BREAKPOINT_EXTRA_SMALL,
|
||||
} from '../constants'
|
||||
import { me } from '../initial_state'
|
||||
import Sidebar from '../components/sidebar'
|
||||
import SidebarXS from '../components/sidebar_xs'
|
||||
@ -38,6 +41,16 @@ export default class Layout extends PureComponent {
|
||||
title,
|
||||
} = this.props
|
||||
|
||||
const mainBlockClasses = CX({
|
||||
default: 1,
|
||||
width1015PX: 1,
|
||||
flexRow: 1,
|
||||
justifyContentEnd: 1,
|
||||
py15: 1,
|
||||
mlAuto: !me,
|
||||
mrAuto: !me,
|
||||
})
|
||||
|
||||
return (
|
||||
<div className={[_s.default, _s.width100PC, _s.heightMin100VH, _s.bgTertiary].join(' ')}>
|
||||
|
||||
@ -80,7 +93,7 @@ export default class Layout extends PureComponent {
|
||||
<main role='main'>
|
||||
|
||||
<ResponsiveClassesComponent
|
||||
classNames={[_s.default, _s.width1015PX, _s.flexRow, _s.justifyContentEnd, _s.py15].join(' ')}
|
||||
classNames={mainBlockClasses}
|
||||
classNamesXS={[_s.default, _s.width1015PX, _s.justifyContentEnd, _s.pb15].join(' ')}
|
||||
>
|
||||
|
||||
|
||||
@ -639,6 +639,11 @@ body {
|
||||
min-width: 100% !important;
|
||||
}
|
||||
|
||||
.modal > div {
|
||||
border-bottom-left-radius: 0 !important;
|
||||
border-bottom-right-radius: 0 !important;
|
||||
}
|
||||
|
||||
.modal:after {
|
||||
content: '';
|
||||
display: block;
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
%head
|
||||
%meta{ charset: 'utf-8' }/
|
||||
|
||||
%meta{ name: 'viewport', content: 'width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no', 'viewport-fit': 'cover' }/
|
||||
%meta{ name: 'viewport', content: 'width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover' }/
|
||||
|
||||
- if cdn_host?
|
||||
%link{ rel: 'dns-prefetch', href: cdn_host }/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user