commit: b739edb5090a81f477cb78081f40504a3e341abd
parent: c1a0e23947ade814b648e2f38fbc6453725e2570
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date: Sun, 15 Dec 2019 17:59:27 +0000
Merge branch 'fix-sticker-height' into 'develop'
fix sticker picker height in emojo picker
See merge request pleroma/pleroma-fe!1022
Diffstat:
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/components/sticker_picker/sticker_picker.vue b/src/components/sticker_picker/sticker_picker.vue
@@ -36,23 +36,23 @@
.sticker-picker {
width: 100%;
- position: relative;
- .tab-switcher {
- position: absolute;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
- }
- .sticker-picker-content {
- .sticker {
- display: inline-block;
- width: 20%;
- height: 20%;
- img {
- width: 100%;
- &:hover {
- filter: drop-shadow(0 0 5px var(--link, $fallback--link));
+ .contents {
+ min-height: 250px;
+ .sticker-picker-content {
+ display: flex;
+ flex-wrap: wrap;
+ padding: 0 4px;
+ .sticker {
+ display: flex;
+ flex: 1 1 auto;
+ margin: 4px;
+ width: 56px;
+ height: 56px;
+ img {
+ height: 100%;
+ &:hover {
+ filter: drop-shadow(0 0 5px var(--link, $fallback--link));
+ }
}
}
}