Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
252 changes: 132 additions & 120 deletions common/config/rush/pnpm-lock.yaml

Large diffs are not rendered by default.

15 changes: 14 additions & 1 deletion packages/presentation/src/components/markup/NodeContent.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,15 @@

return value !== undefined ? (typeof value === 'string' ? parseInt(value) : value) : undefined
}

const checkEmoji = (nodes: MarkupNode[]): boolean => {
const matches: boolean[] = []
nodes.forEach((node) => {
const reg = node.text?.match(/\P{Emoji}/gu)
matches.push(reg != null && reg.length > 0 && [65039, 65038, 8205].every((code) => code !== reg[0].charCodeAt(0)))
})
return matches.every((m) => !m)
}
</script>

{#if node}
Expand All @@ -60,7 +69,7 @@
{:else if node.type === MarkupNodeType.text}
{node.text}
{:else if node.type === MarkupNodeType.paragraph}
<p class="p-inline contrast" class:overflow-label={preview}>
<p class="p-inline contrast" class:overflow-label={preview} class:emojiOnly={checkEmoji(nodes)}>
{#if nodes.length > 0}
{#each nodes as node}
<Node {node} {preview} />
Expand Down Expand Up @@ -204,6 +213,10 @@
.imgContainer {
display: inline;
}
.emojiOnly {
font-size: 2rem;
line-height: 115%;
}

.img {
:global(img) {
Expand Down
4 changes: 4 additions & 0 deletions packages/theme/styles/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@
--theme-checkbox-disabled: #999;
--theme-progress-color: #FFFFFF;
--theme-popup-color: #2A2939;
--theme-popup-trans-color: #2A2939ee;
--theme-popup-trans-gradient: linear-gradient(to bottom, #2A2939ff, #2A293900);
--theme-popup-hover: #333240;
--theme-popup-divider: rgba(255, 255, 255, .09);
--theme-popup-header: #3A3A47;
Expand Down Expand Up @@ -478,6 +480,8 @@
--theme-checkbox-disabled: #999;
--theme-progress-color: rgba(0, 0, 0, .5);
--theme-popup-color: #FFFFFF;
--theme-popup-trans-color: #FFFFFFee;
--theme-popup-trans-gradient: linear-gradient(to bottom, #FFFf, #FFF0);
--theme-popup-hover: #EBEBEB;
--theme-popup-divider: rgba(0, 0, 0, .09);
--theme-popup-header: #EBEBEB;
Expand Down
4 changes: 2 additions & 2 deletions packages/theme/styles/_layouts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ input.search {
.items-baseline { align-items: baseline; }
.items-start { align-items: flex-start; }
.items-end { align-items: flex-end; }
.items-center { align-items: center; }
.items-center { align-items: center !important; }
.items-stretch { align-items: stretch; }
.self-start { align-self: flex-start; }
.self-end { align-self: flex-end; }
Expand Down Expand Up @@ -1046,7 +1046,7 @@ a.no-line {
.tertiary-textColor { color: var(--global-tertiary-TextColor) !important; }

.content-primary-color { color: var(--primary-button-color); }
.red-color { color: var(--highlight-red); }
.red-color { color: var(--highlight-red) !important; }
.error-color { color: var(--theme-error-color); }
.sunshine-text-color { color: var(--tag-accent-SunshineText) !important; }

Expand Down
75 changes: 52 additions & 23 deletions packages/theme/styles/popups.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
.hulyPopup-container {
display: flex;
flex-direction: column;
padding: 1px;
min-width: 15rem;
max-width: 15rem;
max-height: 22.625rem;
background: var(--theme-popup-color); // var(--global-popover-BackgroundColor);
border: 1px solid var(--theme-popup-divider); // var(--global-popover-BorderColor);
Expand All @@ -31,6 +28,11 @@
var(--global-popover-ShadowSpread)
var(--global-popover-ShadowColor);

&:not(.noPadding) { padding: 1px; }
&:not(.autoWidth) {
min-width: 16.5rem;
max-width: 16.5rem;
}
.hulyPopup-row {
display: flex;
justify-content: space-between;
Expand Down Expand Up @@ -97,12 +99,30 @@
border: 1px solid var(--theme-button-border);
border-radius: var(--extra-small-BorderRadius);
}
}
}

&:hover {
&:not(.disabled, :disabled):hover {
background-color: var(--theme-popup-hover); // var(--global-popover-hover-BackgroundColor);
cursor: pointer;
}
&.disabled,
&:disabled {
cursor: default;
.hulyPopup-row__label { opacity: .5; }
}
}
.hulyPopup-group {
display: flex;
flex-direction: column;
flex-shrink: 0;
padding: var(--spacing-0_5);
}
.hulyPopup-divider {
flex-shrink: 0;
width: 100%;
height: 1px;
background-color: var(--theme-popup-divider);
}
}

// ----- //
Expand Down Expand Up @@ -339,12 +359,15 @@
width: auto;
min-height: 0;
min-width: 0;
max-width: 30rem;
background: var(--theme-popup-color);
border: 1px solid var(--theme-popup-divider);
border-radius: .5rem;
box-shadow: var(--theme-popup-shadow);
user-select: none;

&:not(.embedded) {
max-width: 30rem;
background: var(--theme-popup-color);
border-radius: .5rem;
border: 1px solid var(--theme-popup-divider);
box-shadow: var(--theme-popup-shadow);
}

&.isDock {
border-radius: 0;
Expand Down Expand Up @@ -518,7 +541,8 @@
.ap-menuHeader {
display: flex;
flex-direction: column;
border-bottom: 1px solid var(--theme-popup-divider);

&:not(.noBorder) { border-bottom: 1px solid var(--theme-popup-divider); }

.tabs {
display: flex;
Expand All @@ -539,19 +563,24 @@
&:not(:last-child) { margin-right: .375rem; }
&:not(.selected, .disabled) { cursor: pointer; }
&.disabled { color: var(--theme-darker-color); }
&.selected {
color: var(--theme-caption-color);
&.selected { color: var(--theme-caption-color); }
}

&::after {
position: absolute;
content: '';
left: 0;
bottom: -1px;
width: 100%;
height: 2px;
background-color: var(--theme-link-color);
}
}
&:not(.bordered) .tab.selected::after {
position: absolute;
content: '';
left: 0;
bottom: -1px;
width: 100%;
height: 2px;
background-color: var(--theme-link-color);
}
&.bordered .tab {
min-height: 2.25rem;
border: 1px solid transparent;
border-radius: .375rem;

&.selected { border-color: var(--theme-button-border); }
}
}
}
Expand Down
25 changes: 19 additions & 6 deletions packages/ui/lang/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"ShowLess": "Zobrazit méně",
"Search": "Hledat",
"SearchDots": "Hledám...",
"SearchResults": "Výsledky vyhledávání",
"Suggested": "Doporučeno",
"TimeTooltip": "{value}",
"SelectDate": "Vybrat datum",
Expand Down Expand Up @@ -75,14 +76,26 @@
"MM": "MM",
"YYYY": "RRRR",
"HH": "HH",
"GettingWorkDone": "Dokončování práce",
"ExpressYourself": "Vyjádřete se",
"Smileys": "Smajlíci",
"Nature": "Příroda",
"Symbols": "Symboly",
"SmileysAndPeople": "Smajlíky & Lidé",
"Components": "Součást",
"AnimalsAndNature": "Zvířata & Příroda",
"FoodAndDrink": "Jídlo & Pití",
"TravelAndPlaces": "Cestování a místa",
"Activities": "Aktivita",
"Objects": "Objekty",
"Food": "Jídlo",
"Symbols": "Symboly",
"Flags": "Příznak",
"FrequentlyUsed": "Často používané",
"GettingWorkDone": "Dokončování práce",
"DefaultSkinTone": "Výchozí tón pleti",
"NoTone": "Žádný tón",
"Light": "Světlo",
"MediumLight": "Středně světlý",
"Medium": "Střední",
"MediumDark": "Středně tmavý",
"Dark": "Tmavý",
"Remove": "Odstranit",
"NoResults": "Žádné Výsledky",
"MoreCount": "Ještě {count}",
"Spacious": "Prostorný",
"Compact": "Kompaktní",
Expand Down
25 changes: 19 additions & 6 deletions packages/ui/lang/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"ShowLess": "Weniger anzeigen",
"Search": "Suchen",
"SearchDots": "Suchen...",
"SearchResults": "Suchergebnisse",
"Suggested": "Vorgeschlagen",
"TimeTooltip": "{value}",
"SelectDate": "Datum auswählen",
Expand Down Expand Up @@ -74,14 +75,26 @@
"MM": "MM",
"YYYY": "JJJJ",
"HH": "HH",
"GettingWorkDone": "Arbeit erledigen",
"ExpressYourself": "Ausdrücken",
"Smileys": "Smileys",
"Nature": "Natur",
"Symbols": "Symbole",
"SmileysAndPeople": "Smileys & Personen",
"Components": "Hauptkomponenten",
"AnimalsAndNature": "Tiere & Natur",
"FoodAndDrink": "Essen & Trinken",
"TravelAndPlaces": "Reisen & Orte",
"Activities": "Aktivitäten",
"Objects": "Objekte",
"Food": "Essen",
"Symbols": "Symbole",
"Flags": "Flags",
"FrequentlyUsed": "Häufig verwendet",
"GettingWorkDone": "Arbeit erledigen",
"DefaultSkinTone": "Standard-Hautton",
"NoTone": "Kein Ton",
"Light": "Leicht",
"MediumLight": "Mittelhell",
"Medium": "Mittel",
"MediumDark": "Mitteldunkel",
"Dark": "Dunkel",
"Remove": "Entfernen",
"NoResults": "Keine Ergebnisse",
"MoreCount": "{count} weitere",
"Spacious": "Geräumig",
"Compact": "Kompakt",
Expand Down
25 changes: 19 additions & 6 deletions packages/ui/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"ShowLess": "Show less",
"Search": "Search",
"SearchDots": "Search...",
"SearchResults": "Search Results",
"Suggested": "Suggested",
"TimeTooltip": "{value}",
"SelectDate": "Select date",
Expand Down Expand Up @@ -75,14 +76,26 @@
"MM": "MM",
"YYYY": "YYYY",
"HH": "HH",
"GettingWorkDone": "Getting work done",
"ExpressYourself": "Express yourself",
"Smileys": "Smileys",
"Nature": "Nature",
"Symbols": "Symbols",
"SmileysAndPeople": "Smileys & People",
"Components": "Components",
"AnimalsAndNature": "Animals & Nature",
"FoodAndDrink": "Food & Drink",
"TravelAndPlaces": "Travel & Places",
"Activities": "Activities",
"Objects": "Objects",
"Food": "Food",
"Symbols": "Symbols",
"Flags": "Flags",
"FrequentlyUsed": "Frequently used",
"GettingWorkDone": "Getting work done",
"DefaultSkinTone": "Default skin tone",
"NoTone": "No tone",
"Light": "Light",
"MediumLight": "Medium-light",
"Medium": "Medium",
"MediumDark": "Medium-dark",
"Dark": "Dark",
"Remove": "Remove",
"NoResults": "No Results",
"MoreCount": "{count} more",
"Spacious": "Spacious",
"Compact": "Compact",
Expand Down
25 changes: 19 additions & 6 deletions packages/ui/lang/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"ShowLess": "Mostrar menos",
"Search": "Buscar",
"SearchDots": "Buscar...",
"SearchResults": "Resultados de la búsqueda",
"Suggested": "Sugerido",
"TimeTooltip": "{value}",
"SelectDate": "Seleccionar fecha",
Expand Down Expand Up @@ -75,14 +76,26 @@
"MM": "MM",
"YYYY": "AAAA",
"HH": "HH",
"GettingWorkDone": "Haciendo el trabajo",
"ExpressYourself": "Exprésate",
"Smileys": "Emoticonos",
"Nature": "Naturaleza",
"Symbols": "Símbolos",
"SmileysAndPeople": "Emoticonos y Personas",
"Components": "Componentes",
"AnimalsAndNature": "Animales y Naturaleza",
"FoodAndDrink": "Comida y Bebida",
"TravelAndPlaces": "Viajes y lugares",
"Activities": "Actividades",
"Objects": "Objetos",
"Food": "Comida",
"Symbols": "Símbolos",
"Flags": "Banderas",
"FrequentlyUsed": "De uso frecuente",
"GettingWorkDone": "Haciendo el trabajo",
"DefaultSkinTone": "Tono de piel predeterminado",
"NoTone": "Sin tono",
"Light": "Claro",
"MediumLight": "Medio-Сlaro",
"Medium": "Medio",
"MediumDark": "Medio-Oscuro",
"Dark": "Oscuro",
"Remove": "Eliminar",
"NoResults": "Sin Resultados",
"MoreCount": "{count} más",
"Spacious": "Espacioso",
"Compact": "Compacto",
Expand Down
25 changes: 19 additions & 6 deletions packages/ui/lang/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"ShowLess": "Afficher moins",
"Search": "Rechercher",
"SearchDots": "Recherche...",
"SearchResults": "Résultats de la recherche",
"Suggested": "Suggéré",
"TimeTooltip": "{value}",
"SelectDate": "Sélectionner une date",
Expand Down Expand Up @@ -75,14 +76,26 @@
"MM": "MM",
"YYYY": "AAAA",
"HH": "HH",
"GettingWorkDone": "Faire le travail",
"ExpressYourself": "Exprime-toi",
"Smileys": "Émoticônes",
"Nature": "Nature",
"Symbols": "Symboles",
"SmileysAndPeople": "Smileys & Personnes",
"Components": "Composants",
"AnimalsAndNature": "Animaux & Nature",
"FoodAndDrink": "Nourriture & Boissons",
"TravelAndPlaces": "Voyages & Lieux",
"Activities": "Activités",
"Objects": "Objets",
"Food": "Nourriture",
"Symbols": "Symboles",
"Flags": "Drapeaux",
"FrequentlyUsed": "Fréquemment utilisé",
"GettingWorkDone": "Faire le travail",
"DefaultSkinTone": "Teint par défaut",
"NoTone": "Pas de tonalité",
"Light": "Clair",
"MediumLight": "Moyen-clair",
"Medium": "Moyen",
"MediumDark": "Moyen-foncé",
"Dark": "Foncé",
"Remove": "Supprimer",
"NoResults": "Aucun Résultat",
"MoreCount": "{count} de plus",
"Spacious": "Spacieux",
"Compact": "Compact",
Expand Down
Loading