random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
mgabdev 2020-05-12 12:19:12 -04:00
parent 2fc18e41e1
commit a028ac2180
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/javascript/gabsocial/components/emoji/emoji_compressed.js
View File

@ -55,16 +55,16 @@ Object.keys(emojiMap).forEach(key => {
if (unicodeToFilename(key) !== filename) { if (unicodeToFilename(key) !== filename) {
// filename can't be derived using unicodeToFilename // filename can't be derived using unicodeToFilename
filenameData.push(filename); // filenameData.push(filename);
} }
if (typeof shortcode === 'undefined') { if (typeof shortcode === 'undefined') {
emojisWithoutShortCodes.push(filenameData); // emojisWithoutShortCodes.push(filenameData);
} else { } else {
if (!Array.isArray(shortCodesToEmojiData[shortcode])) { if (!Array.isArray(shortCodesToEmojiData[shortcode])) {
shortCodesToEmojiData[shortcode] = [[]]; shortCodesToEmojiData[shortcode] = [[]];
} }
shortCodesToEmojiData[shortcode][0].push(filenameData); // shortCodesToEmojiData[shortcode][0].push(filenameData);
} }
}); });
@ -82,10 +82,10 @@ Object.keys(emojiIndex.emojis).forEach(key => {
const searchData = [native, short_names, search]; const searchData = [native, short_names, search];
if (unicodeToUnifiedName(native) !== unified) { if (unicodeToUnifiedName(native) !== unified) {
// unified name can't be derived from unicodeToUnifiedName // unified name can't be derived from unicodeToUnifiedName
searchData.push(unified); // searchData.push(unified);
} }
shortCodesToEmojiData[key].push(searchData); // shortCodesToEmojiData[key].push(searchData);
}); });
// JSON.parse/stringify is to emulate what @preval is doing and avoid any // JSON.parse/stringify is to emulate what @preval is doing and avoid any

11
app/javascript/styles/global.css
View File

@ -1,5 +1,4 @@
:root { :root {
--color_highlight: #CCF3DF;
--color_brand-dark: #378e61; --color_brand-dark: #378e61;
--color_brand-light: #63DA9D; --color_brand-light: #63DA9D;
--color_brand-light-opaque: rgb(54, 233, 145, .125); --color_brand-light-opaque: rgb(54, 233, 145, .125);
@ -95,14 +94,6 @@
--navigation_brand: var(--color_brand) !important; --navigation_brand: var(--color_brand) !important;
} }
::selection {
background: var(--color_highlight);
}
::-moz-selection {
background: var(--color_highlight);
}
html, html,
body { body {
height: 100%; height: 100%;
@ -678,7 +669,7 @@ body {
.mb5 { margin-bottom: 5px; } .mb5 { margin-bottom: 5px; }
.mbNeg5PX { margin-bottom: -5px; } .mbNeg5PX { margin-bottom: -5px; }
.mt15 { margin-top: 10px; } .mt15 { margin-top: 15px; }
.mt10 { margin-top: 10px; } .mt10 { margin-top: 10px; }
.mt5 { margin-top: 5px; } .mt5 { margin-top: 5px; }
.mt2 { margin-top: 2px; } .mt2 { margin-top: 2px; }