hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'themes3' into shigusegubu-themes3

Browse source
This commit is contained in:
Henry Jameson 2024-04-03 22:58:51 +03:00
commit d925feddfe
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/components/emoji_reactions/emoji_reactions.vue
View file

@ -91,7 +91,6 @@
padding: 0; padding: 0;
.emoji-reaction-count-button { .emoji-reaction-count-button {
background-color: var(--btn);
margin: 0; margin: 0;
height: 100%; height: 100%;
border-top-left-radius: 0; border-top-left-radius: 0;

6
test/unit/specs/services/theme_data/theme_data3.spec.js
View file

@ -9,7 +9,7 @@ import {
basePaletteKeys basePaletteKeys
} from 'src/services/theme_data/theme2_to_theme3.js' } from 'src/services/theme_data/theme2_to_theme3.js'
describe.only('Theme Data 3', () => { describe('Theme Data 3', () => {
describe('getAllPossibleCombinations', () => { describe('getAllPossibleCombinations', () => {
it('test simple 3 values case', () => { it('test simple 3 values case', () => {
const out = getAllPossibleCombinations([1, 2, 3]).map(x => x.sort((a, b) => a - b)) const out = getAllPossibleCombinations([1, 2, 3]).map(x => x.sort((a, b) => a - b))
@ -62,7 +62,9 @@ describe.only('Theme Data 3', () => {
}) })
}) })
describe('init', () => { describe('init', function () {
this.timeout(5000)
it('Test initialization without anything', () => { it('Test initialization without anything', () => {
const out = init([], '#DEADAF') const out = init([], '#DEADAF')