bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'emojireacts' into 'master'

Browse source 
Emoji reactions

See merge request soapbox-pub/soapbox-fe!18
This commit is contained in:
Alex Gleason 2020-05-24 01:39:17 +00:00
commit 963c68c642
20 changed files with 222 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/gabsocial/actions/emoji_reacts.js Normal file
View file

Binary file not shown.

BIN
app/gabsocial/components/emoji_selector.js Normal file
View file

Binary file not shown.

BIN
app/gabsocial/components/icon_button.js
View file

Binary file not shown.

BIN
app/gabsocial/components/sidebar_menu.js
View file

Binary file not shown.

BIN
app/gabsocial/components/status_action_bar.js
View file

Binary file not shown.

BIN
app/gabsocial/features/notifications/components/notification.js
View file

Binary file not shown.

BIN
app/gabsocial/features/status/components/action_bar.js
View file

Binary file not shown.

BIN
app/gabsocial/features/status/components/detailed_status.js
View file

Binary file not shown.

BIN
app/gabsocial/features/status/components/status_interaction_bar.js Normal file
View file

Binary file not shown.

BIN
app/gabsocial/features/status/index.js
View file

Binary file not shown.

BIN
app/gabsocial/reducers/notifications.js
View file

Binary file not shown.

BIN
app/gabsocial/reducers/statuses.js
View file

Binary file not shown.

BIN
app/gabsocial/utils/__tests__/emoji_reacts-test.js Normal file
View file

Binary file not shown.

BIN
app/gabsocial/utils/emoji_reacts.js Normal file
View file

Binary file not shown.

2
app/styles/application.scss
View file

@ -32,6 +32,8 @@
@import 'gabsocial/components/group-sidebar-panel';
@import 'gabsocial/components/sidebar-menu';
@import 'gabsocial/components/hotkeys-modal';
@import 'gabsocial/components/emoji-reacts';
@import 'gabsocial/components/detailed-status';
@import 'gabsocial/polls';
@import 'gabsocial/introduction';

78
app/styles/gabsocial/components.scss
View file

@ -119,7 +119,7 @@
display: inline-block;
padding: 0;
color: $gab-secondary-text;
border: none;
border: 0;
background: transparent;
cursor: pointer;
transition: color 100ms ease-in;
@ -718,82 +718,6 @@
width: 23.15px;
}
.detailed-status__action-bar-dropdown {
flex: 1 1 auto;
display: flex;
align-items: center;
justify-content: center;
position: relative;
}
.detailed-status {
background: lighten($ui-base-color, 4%);
padding: 14px 10px;
&--flex {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
align-items: flex-start;
.status__content,
.detailed-status__meta {
flex: 100%;
}
}
.status__content {
font-size: 19px;
line-height: 24px;
.emojione {
width: 24px;
height: 24px;
margin: -1px 0 0;
}
.status__content__spoiler-link {
line-height: 24px;
margin: -1px 0 0;
}
}
.video-player {
margin-top: 8px;
}
}
.detailed-status__meta {
margin-top: 15px;
color: $dark-text-color;
font-size: 14px;
line-height: 18px;
}
.detailed-status__action-bar {
background: lighten($ui-base-color, 4%);
border-top: 1px solid lighten($ui-base-color, 8%);
border-bottom: 1px solid lighten($ui-base-color, 8%);
display: flex;
flex-direction: row;
padding: 10px 0;
}
.detailed-status__link {
color: $action-button-color;
cursor: pointer;
text-decoration: none;
font-size: 13px;
}
.detailed-status__favorites,
.detailed-status__reblogs {
display: inline-block;
font-weight: 500;
font-size: 12px;
margin-left: 6px;
}
.reply-indicator__content {
color: $gab-default-text-light;
font-size: 14px;

94
app/styles/gabsocial/components/detailed-status.scss Normal file
View file

@ -0,0 +1,94 @@
.detailed-status__action-bar-dropdown {
flex: 1 1 auto;
display: flex;
align-items: center;
justify-content: center;
position: relative;
}
.detailed-status {
background: lighten($ui-base-color, 4%);
padding: 14px 10px;
&--flex {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
align-items: flex-start;
.status__content,
.detailed-status__meta {
flex: 100%;
}
}
.status__content {
font-size: 19px;
line-height: 24px;
.emojione {
width: 24px;
height: 24px;
margin: -1px 0 0;
}
.status__content__spoiler-link {
line-height: 24px;
margin: -1px 0 0;
}
}
.video-player {
margin-top: 8px;
}
}
.detailed-status__meta {
margin-top: 15px;
color: $dark-text-color;
font-size: 14px;
line-height: 18px;
display: flex;
}
.detailed-status__action-bar {
background: lighten($ui-base-color, 4%);
border-top: 1px solid lighten($ui-base-color, 8%);
border-bottom: 1px solid lighten($ui-base-color, 8%);
display: flex;
flex-direction: row;
}
.detailed-status__link {
color: $action-button-color;
cursor: pointer;
text-decoration: none;
font-size: 13px;
}
.detailed-status__favorites,
.detailed-status__reblogs {
display: inline-block;
font-weight: 500;
font-size: 12px;
margin-left: 6px;
}
.detailed-status__button {
padding: 10px 0;
.icon-button {
display: inline-flex;
align-items: center;
.icon_button__text {
font-size: 14px;
padding-left: 3px;
transform: translateY(-1px);
}
}
}
.detailed-status__wrapper {
position: relative;
}

120
app/styles/gabsocial/components/emoji-reacts.scss Normal file
View file

@ -0,0 +1,120 @@
.emoji-react {
display: inline-block;
transition: 0.1s;
&__emoji {
img {
width: 20px;
height: 20px;
filter: drop-shadow(2px 0 0 #fff); // FIXME: Use theme color
}
}
&__count {
display: none;
}
+ .emoji-react {
margin-right: -8px;
}
}
.emoji-reacts {
display: inline-flex;
flex-direction: row-reverse;
}
.status-interaction-bar {
margin-right: auto;
min-height: 20px;
}
.emoji-reacts-container {
display: inline-flex;
margin-right: auto;
&:hover {
.emoji-react {
margin: 0;
&__count {
display: inline;
}
}
.emoji-reacts__count {
display: none;
}
}
}
.emoji-reacts__count,
.emoji-react__count {
font-size: 12px;
font-weight: bold;
}
.emoji-react-selector {
position: absolute;
display: flex;
background-color: #fff;
padding: 5px 8px;
border-radius: 9999px;
box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.1);
opacity: 0;
pointer-events: none;
transition: 0.1s;
z-index: 999;
&--visible {
opacity: 1;
pointer-events: all;
}
&__emoji {
display: block;
padding: 0;
margin: 0;
border: 0;
background: transparent;
img {
width: 30px;
height: 30px;
padding: 3px;
transition: 0.1s;
}
&:hover {
img {
width: 36px;
height: 36px;
padding: 0;
}
}
}
}
.status__action-bar__counter--favourite {
position: relative;
@media(max-width: 455px) {
position: static;
}
}
.detailed-status__wrapper .emoji-react-selector {
bottom: 40px;
right: 10px;
}
.status .emoji-react-selector {
bottom: 100%;
left: -20px;
@media(max-width: 455px) {
bottom: 31px;
right: 10px;
left: auto;
}
}

2
package.json
View file

@ -74,7 +74,7 @@
"html-webpack-harddisk-plugin": "^1.0.1",
"html-webpack-plugin": "^4.3.0",
"http-link-header": "^1.0.2",
"immutable": "^3.8.2",
"immutable": "^4.0.0-rc.12",
"imports-loader": "^0.8.0",
"intersection-observer": "^0.7.0",
"intl": "^1.2.5",

8
yarn.lock
View file

@ -5167,10 +5167,10 @@ ignore@^4.0.6:
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
immutable@^3.8.2:
version "3.8.2"
resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
immutable@^4.0.0-rc.12:
version "4.0.0-rc.12"
resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0-rc.12.tgz#ca59a7e4c19ae8d9bf74a97bdf0f6e2f2a5d0217"
integrity sha512-0M2XxkZLx/mi3t8NVwIm1g8nHoEmM9p9UBl/G9k4+hm0kBgOVdMV/B3CY5dQ8qG8qc80NN4gDV4HQv6FTJ5q7A==
import-cwd@^2.0.0:
version "2.1.0"