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
27 changes: 14 additions & 13 deletions src/css/crowdin-bootstrap.scss
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
#crowdin-language-picker .cr-picker-button,
#crowdin-language-picker .cr-picker-submenu {
background-color: var(--navbar-col) !important;
border: 1px solid var(--navbar-border-col) !important;
color: var(--navbar-text-col) !important;
// Outrank Crowdin's injected state selectors regardless of stylesheet order.
body #crowdin-language-picker.cr-position-bottom-left .cr-picker-button,
body #crowdin-language-picker.cr-position-bottom-left .cr-picker-submenu {
background-color: var(--navbar-col);
border: 1px solid var(--navbar-border-col);
color: var(--navbar-text-col);
}

#crowdin-language-picker .cr-picker-button:hover,
#crowdin-language-picker .cr-picker-submenu > a:hover {
background-color: var(--navbar-text-col) !important;
color: var(--navbar-col) !important;
body #crowdin-language-picker.cr-position-bottom-left .cr-picker-button:hover,
body #crowdin-language-picker.cr-position-bottom-left .cr-picker-submenu > a:hover {
background-color: var(--navbar-text-col);
color: var(--navbar-col);
}

#crowdin-language-picker .cr-picker-submenu > a {
color: var(--navbar-text-col) !important;
body #crowdin-language-picker.cr-position-bottom-left .cr-picker-submenu > a {
color: var(--navbar-text-col);
}

#crowdin-language-picker .cr-picker-submenu > a.cr-selected {
color: var(--navbar-border-col) !important;
body #crowdin-language-picker.cr-position-bottom-left .cr-picker-submenu > a.cr-selected {
color: var(--navbar-border-col);
}
49 changes: 25 additions & 24 deletions src/css/crowdin-dockle.scss
Original file line number Diff line number Diff line change
@@ -1,42 +1,43 @@
#crowdin-language-picker.dockle-crowdin-picker {
bottom: 1rem !important;
left: var(--dockle-sidebar-padding, 1.25rem) !important;
position: fixed !important;
width: calc(var(--dockle-sidebar-width, 18rem) - (2 * var(--dockle-sidebar-padding, 1.25rem))) !important;
body #crowdin-language-picker.dockle-crowdin-picker {
bottom: 1rem;
left: var(--dockle-sidebar-padding, 1.25rem);
position: fixed;
width: calc(var(--dockle-sidebar-width, 18rem) - (2 * var(--dockle-sidebar-padding, 1.25rem)));
z-index: 200;
}

#crowdin-language-picker.dockle-crowdin-picker .cr-picker-button {
body #crowdin-language-picker.dockle-crowdin-picker .cr-picker-button {
box-sizing: border-box;
width: 100%;
}

#crowdin-language-picker .cr-picker-button,
#crowdin-language-picker .cr-picker-submenu {
background-color: var(--dockle-background-secondary) !important;
border: 1px solid var(--dockle-border) !important;
border-radius: var(--dockle-radius) !important;
color: var(--dockle-content) !important;
// Outrank Crowdin's injected state selectors regardless of stylesheet order.
body #crowdin-language-picker.dockle-crowdin-picker .cr-picker-button,
body #crowdin-language-picker.dockle-crowdin-picker .cr-picker-submenu {
background-color: var(--dockle-background-secondary);
border: 1px solid var(--dockle-border);
border-radius: var(--dockle-radius);
color: var(--dockle-content);
}

#crowdin-language-picker .cr-picker-button:hover,
#crowdin-language-picker .cr-picker-submenu > a:hover {
background-color: var(--dockle-primary) !important;
color: white !important;
body #crowdin-language-picker.dockle-crowdin-picker .cr-picker-button:hover,
body #crowdin-language-picker.dockle-crowdin-picker .cr-picker-submenu > a:hover {
background-color: var(--dockle-primary);
color: white;
}

#crowdin-language-picker .cr-picker-submenu > a {
color: var(--dockle-content) !important;
body #crowdin-language-picker.dockle-crowdin-picker .cr-picker-submenu > a {
color: var(--dockle-content);
}

#crowdin-language-picker .cr-picker-submenu > a.cr-selected {
color: var(--dockle-primary) !important;
body #crowdin-language-picker.dockle-crowdin-picker .cr-picker-submenu > a.cr-selected {
color: var(--dockle-primary);
}

@media (max-width: 50rem) {
#crowdin-language-picker.dockle-crowdin-picker {
bottom: 1rem !important;
left: 1rem !important;
width: min(18rem, calc(100vw - 2rem)) !important;
body #crowdin-language-picker.dockle-crowdin-picker {
bottom: 1rem;
left: 1rem;
width: min(18rem, calc(100vw - 2rem));
}
}
20 changes: 12 additions & 8 deletions src/css/lizardbyte.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,15 @@ body {
}

.bg-dark {
// Bootstrap's background utility reads this variable.
--bs-dark-rgb: 21, 21, 21;
--bs-bg-opacity: 1;
background-color: #151515 !important;
background-color: #151515;
}

.bg-dark-gray {
--bs-bg-opacity: 1;
background-color: #303436 !important;
background-color: #303436;
}

.carousel-overlay-title {
Expand All @@ -66,13 +68,13 @@ body {
}

.carousel-item.active, .carousel-item .view {
height: 50vh !important;
height: 50vh;
}

.carousel-item img {
object-fit: cover;
width:100% !important;
height: 100% !important;
width: 100%;
height: 100%;
}

.content h1 {
Expand Down Expand Up @@ -156,8 +158,10 @@ iframe.feedback {
overflow: hidden;
}

.hover-zoom img {
transition: all 1.5s ease;
@media (prefers-reduced-motion: no-preference) {
.hover-zoom img {
transition: transform 1.5s ease;
}
}

.hover-zoom:hover img {
Expand All @@ -167,5 +171,5 @@ iframe.feedback {
/*custom text colors*/
.text-purple {
--bs-text-opacity: 1;
color: var(--bs-purple) !important;
color: var(--bs-purple);
}
7 changes: 4 additions & 3 deletions src/js/crowdin.js
Original file line number Diff line number Diff line change
Expand Up @@ -282,9 +282,10 @@ function _applyCrowdinPlatformStyling(platform, attempt = 0) {

container.classList.remove('cr-position-bottom-left');
container.classList.add('dockle-crowdin-picker');
container.style.position = 'fixed';
container.style.left = 'auto';
container.style.bottom = 'auto';
// Let the Dockle stylesheet control desktop and mobile positioning.
container.style.removeProperty('position');
container.style.removeProperty('left');
container.style.removeProperty('bottom');
document.body.appendChild(container);
}

Expand Down
17 changes: 12 additions & 5 deletions tests/crowdin.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ const loadScript = require('../src/js/load-script');
const initCrowdIn = require('../src/js/crowdin');

const delayedPickerMarkup = `
<div id="crowdin-language-picker" class="cr-position-bottom-left">
<div id="crowdin-language-picker" class="cr-position-bottom-left"
style="position: absolute; left: auto; bottom: auto;">
<div class="cr-picker-button"></div>
<div class="cr-picker-submenu"></div>
</div>
Expand Down Expand Up @@ -308,14 +309,18 @@ describe('initCrowdIn', () => {
});

it('should apply consistent Dockle styling', () => {
const container = document.getElementById('crowdin-language-picker');
container.style.cssText = 'position: absolute; left: auto; bottom: auto; top: 2px;';

initCrowdIn('LizardByte', 'dockle');
jest.runAllTimers();

const container = document.getElementById('crowdin-language-picker');

expect(container.classList.contains('cr-position-bottom-left')).toBe(false);
expect(container.classList.contains('dockle-crowdin-picker')).toBe(true);
expect(container.style.position).toBe('fixed');
expect(container.style.position).toBe('');
expect(container.style.left).toBe('');
expect(container.style.bottom).toBe('');
expect(container.style.top).toBe('2px');
expect(document.body.lastElementChild).toBe(container);
});

Expand All @@ -329,7 +334,9 @@ describe('initCrowdIn', () => {

const container = document.getElementById('crowdin-language-picker');
expect(container.classList.contains('dockle-crowdin-picker')).toBe(true);
expect(container.style.position).toBe('fixed');
expect(container.style.position).toBe('');
expect(container.style.left).toBe('');
expect(container.style.bottom).toBe('');
});

it('should stop retrying platform styling after the retry limit', () => {
Expand Down
Loading