-
{children}
diff --git a/app/javascript/gabsocial/components/emoji/emoji.js b/app/javascript/gabsocial/components/emoji/emoji.js
index 988cea25..ada12cfc 100644
--- a/app/javascript/gabsocial/components/emoji/emoji.js
+++ b/app/javascript/gabsocial/components/emoji/emoji.js
@@ -29,7 +29,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 = `
`;
+ replacement = `
`;
return true;
}
return false;
@@ -60,7 +60,7 @@ const emojify = (str, customEmojis = {}) => {
} else { // matched to unicode emoji
const { filename, shortCode } = unicodeMapping[match];
const title = shortCode ? `:${shortCode}:` : '';
- replacement = `
`;
+ replacement = `
`;
rend = i + match.length;
// If the matched character was followed by VS15 (for selecting text presentation), skip it.
if (str.codePointAt(rend) === 65038) {
diff --git a/app/javascript/gabsocial/components/modal/modal_base.js b/app/javascript/gabsocial/components/modal/modal_base.js
index 23ee4beb..1b39762e 100644
--- a/app/javascript/gabsocial/components/modal/modal_base.js
+++ b/app/javascript/gabsocial/components/modal/modal_base.js
@@ -120,6 +120,8 @@ class ModalBase extends PureComponent {
const containerClasses = cx({
default: 1,
z4: 1,
+ height100PC: visible,
+ width100PC: visible,
displayNone: !visible,
})
@@ -135,7 +137,7 @@ class ModalBase extends PureComponent {
/>
{children}
diff --git a/app/javascript/gabsocial/components/panel/notification_filter_panel.js b/app/javascript/gabsocial/components/panel/notification_filter_panel.js
index ac7d866e..30c3015d 100644
--- a/app/javascript/gabsocial/components/panel/notification_filter_panel.js
+++ b/app/javascript/gabsocial/components/panel/notification_filter_panel.js
@@ -33,7 +33,11 @@ class NotificationFilterPanel extends ImmutablePureComponent {
return (
-
+ Date
+ Verified
+ Users
+ Status Id
+ Only People I Follow
)
}
diff --git a/app/javascript/gabsocial/components/poll/poll.js b/app/javascript/gabsocial/components/poll.js
similarity index 94%
rename from app/javascript/gabsocial/components/poll/poll.js
rename to app/javascript/gabsocial/components/poll.js
index 26e130a4..c680f760 100644
--- a/app/javascript/gabsocial/components/poll/poll.js
+++ b/app/javascript/gabsocial/components/poll.js
@@ -5,13 +5,13 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'
import classNames from 'classnames/bind'
import escapeTextContentForBrowser from 'escape-html'
import spring from 'react-motion/lib/spring'
-import Motion from '../../features/ui/util/optional_motion'
-import { vote } from '../../actions/polls'
-import emojify from '../emoji/emoji'
-import RelativeTimestamp from '../relative_timestamp'
-import Button from '../button'
-import DotTextSeperator from '../dot_text_seperator'
-import Text from '../text'
+import Motion from '../features/ui/util/optional_motion'
+import { vote } from '../actions/polls'
+import emojify from './emoji/emoji'
+import RelativeTimestamp from './relative_timestamp'
+import Button from './button'
+import DotTextSeperator from './dot_text_seperator'
+import Text from './text'
const cx = classNames.bind(_s)
@@ -159,7 +159,10 @@ class Poll extends ImmutablePureComponent {
!showResults &&
}
-
+
{
showResults &&
diff --git a/app/javascript/gabsocial/components/poll/index.js b/app/javascript/gabsocial/components/poll/index.js
deleted file mode 100644
index 89d61718..00000000
--- a/app/javascript/gabsocial/components/poll/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './poll'
\ No newline at end of file
diff --git a/app/javascript/gabsocial/components/poll/poll.scss b/app/javascript/gabsocial/components/poll/poll.scss
deleted file mode 100644
index 834874c4..00000000
--- a/app/javascript/gabsocial/components/poll/poll.scss
+++ /dev/null
@@ -1,147 +0,0 @@
-.poll {
- margin-top: 16px;
-
- &__list {
- display: block;
- }
-
- &__chart {
- height: 100%;
- display: inline-block;
- border-radius: 4px;
- background: rgba($gab-placeholder-accent, .3);
-
- @include abs-position(0, auto, auto, 0);
-
- &--leading {
- background: rgba($gab-placeholder-accent, .6);
- }
- }
-
- &__text {
- position: relative;
- display: inline-block;
- padding: 6px 0;
- line-height: 18px;
- cursor: default;
- color: #fff;
-
- @include text-overflow(nowrap);
-
- body.theme-gabsocial-light & {
- color: $gab-default-text-light;
- }
-
- input[type=radio],
- input[type=checkbox] {
- display: none;
- }
-
- .autossugest-input {
- flex: 1 1 auto;
- }
-
- input[type=text] {
- display: block;
- box-sizing: border-box;
- width: 100%;
- font-size: 14px;
- color: $inverted-text-color;
- display: block;
- outline: 0;
- font-family: inherit;
- background: $simple-background-color;
- padding: 6px 10px;
-
- @include border-design(darken($simple-background-color, 14%), 1px, 4px);
-
- &:focus {
- border-color: $highlight-text-color;
- }
- }
-
- &.selectable {
- cursor: pointer;
- }
-
- &.editable {
- display: flex;
- align-items: center;
- overflow: visible;
- }
- }
-
- &__input {
- display: inline-block;
- position: relative;
- border: 1px solid $ui-primary-color;
- box-sizing: border-box;
- flex: 0 0 auto;
- margin-right: 10px;
- top: -1px;
- vertical-align: middle;
-
- @include circle(18px);
-
- &--checkbox {
- border-radius: 4px;
- }
-
- &--active {
- border-color: $valid-value-color;
- background: $valid-value-color;
- }
- }
-
- &__footer {
- color: $dark-text-color;
-
- @include vertical-padding(6px, 5px);
-
- span {
- font-size: 14px;
- }
- }
-
- &__link {
- display: inline;
- background: transparent;
- padding: 0;
- margin: 0;
- border: 0;
- color: $dark-text-color;
- text-decoration: underline;
- font-size: inherit;
-
- &:hover {
- text-decoration: none;
- }
-
- &:active,
- &:focus {
- background-color: rgba($dark-text-color, .1);
- }
- }
-
- &__button {
- margin-right: 10px;
- }
-}
-
-.poll-item {
- position: relative;
- margin-bottom: 10px;
- height: 30px;
-
- &__number {
- display: inline-block;
- width: 36px;
- padding: 0 10px;
-
- @include text-sizing(14px, 700, 1, right);
- }
-
- &__text {
- @include text-sizing(14px, 400);
- }
-}
\ No newline at end of file
diff --git a/app/javascript/gabsocial/components/sidebar_section_item.js b/app/javascript/gabsocial/components/sidebar_section_item.js
index ebdee42d..22f11ba6 100644
--- a/app/javascript/gabsocial/components/sidebar_section_item.js
+++ b/app/javascript/gabsocial/components/sidebar_section_item.js
@@ -63,7 +63,7 @@ export default class SidebarSectionItem extends PureComponent {
const iconClasses = cx({
fillColorBlack: shouldShowActive,
- fillColorSecondary: !hovering && !active,
+ fillcolorSecondary: !hovering && !active,
})
const countClasses = cx({
diff --git a/app/javascript/gabsocial/components/status/status.js b/app/javascript/gabsocial/components/status/status.js
index 1f76a5c7..6ca47db2 100644
--- a/app/javascript/gabsocial/components/status/status.js
+++ b/app/javascript/gabsocial/components/status/status.js
@@ -8,6 +8,7 @@ import classNames from 'classnames/bind'
import { displayMedia } from '../../initial_state';
import Card from '../../features/status/components/card';
import { MediaGallery, Video } from '../../features/ui/util/async-components';
+import ComposeFormContainer from '../../features/compose/containers/compose_form_container'
import Avatar from '../avatar';
import StatusQuote from '../status_quote';
import RelativeTimestamp from '../relative_timestamp';
@@ -496,7 +497,9 @@ class Status extends ImmutablePureComponent {
) */ }
- { /* : todo : comment bar, comments */ }
+ {/*
+
+
*/}