Skip to content

Commit

Permalink
refactor: ♻️ follow commit 980d2ff
Browse files Browse the repository at this point in the history
Signed-off-by: WaitSpring <[email protected]>
  • Loading branch information
WaitSpringQW committed Nov 18, 2023
1 parent 1ff42a7 commit d78ba0c
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 14 deletions.
6 changes: 5 additions & 1 deletion resources/skins.citizen.styles/Drawer.less
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,14 @@

&__menu {
// Fallback
display: flex;
flex-direction: column;
max-height: 46.25vh;
// End fallback
overflow-y: auto;
/* stylelint-disable-next-line declaration-block-no-duplicate-properties */
display: grid;
max-width: 92.5vw;
max-height: 46.25vh;
justify-content: center;
padding: var(--space-xs) var(--space-md);
font-size: 0.875rem; // TODO: Make this a variable
Expand Down
3 changes: 1 addition & 2 deletions resources/skins.citizen.styles/Header.less
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@
}

&__button {
// Fallback
justify-content: center;
display: flex;
justify-content: center;
width: var(--header-button-size);
height: var(--header-button-size);
border-radius: var(--border-radius--small);
Expand Down
9 changes: 6 additions & 3 deletions resources/skins.citizen.styles/Pagetools.less
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
// TODO: Merge this with header__button
&__button {
// Fallback
display: flex;
justify-content: center;
// End fallback
/* stylelint-disable-next-line declaration-block-no-duplicate-properties */
display: grid;
width: 2.75rem; // Same width as other buttons
height: 2.25rem; // Same height as other buttons
Expand Down Expand Up @@ -121,7 +124,7 @@
// Language counter badge
// TODO: Maybe this should be in a mixin
#citizen-languages__buttonCheckbox {
position: relative; // So that the badge doesn't take a stroll to the far left
position: relative; // So that the badge doesn't take a stroll to the far left

&::after {
position: absolute;
Expand All @@ -143,7 +146,7 @@

.citizen-languages {
// Special handling for ULS
// ULS won't be triggered by the label button
// ULS won't be triggered by the label button
// so we need to overlay the checkbox on top of it
.mw-interlanguage-selector {
position: absolute;
Expand Down Expand Up @@ -210,7 +213,7 @@
}
}

// VE styles shouldn't be core but it is just a few lines :/
// VE styles shouldn't be core but it is just a few lines :/
#ca-ve-edit {
order: 98; // Before source edit

Expand Down
7 changes: 5 additions & 2 deletions resources/skins.citizen.styles/layout.less
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,15 @@

.citizen-body-container {
// Fallback
display: flex;
flex-direction: column;
// End fallback
/* stylelint-disable-next-line declaration-block-no-duplicate-properties */
display: grid;
justify-content: center;
padding: var(--space-xl) var(--padding-page);
gap: var(--space-md) var(--space-md);
grid-template-areas:
grid-template-areas:
'header'
'content'
'footer';
Expand Down Expand Up @@ -61,7 +64,7 @@ a.image {
.citizen-toc-enabled {
.citizen-body-container {
display: grid;
grid-template-areas:
grid-template-areas:
'header header'
'content toc'
'footer .';
Expand Down
14 changes: 8 additions & 6 deletions skinStyles/extensions/MultimediaViewer/mmv.less
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*
/*
* Citizen
*
* SkinStyles for Extension:MultimediaViewer
* Module: mmv
* Version: REL1_39 (1b97775)
*
* Date: 2022-11-26
* Date: 2022-11-26
*/

@import '../../../resources/variables.less';
Expand Down Expand Up @@ -277,7 +277,7 @@
background-position: left 8px center;

&:hover {
// Changing margin is expensive and we don't want to move the hover background
// Changing margin is expensive and we don't want to move the hover background
margin-left: 0;
background-position: left 4px center;
}
Expand All @@ -288,7 +288,7 @@
background-position: right 8px center;

&:hover {
// Changing margin is expensive and we don't want to move the hover background
// Changing margin is expensive and we don't want to move the hover background
margin-right: 0;
background-position: right 4px center;
}
Expand Down Expand Up @@ -500,17 +500,19 @@

.mw-mmv-image-metadata {
// Fallback
display: flex;
flex-wrap: wrap;
justify-content: space-between;
// Use grid instead
/* stylelint-disable-next-line declaration-block-no-duplicate-properties */
display: grid;
width: auto;
padding: 0 var(--space-md) var(--space-md) var(--space-md);
border-top: 0;
margin-top: -4px;
// Sync with title
gap: var(--space-xs);
grid-template-areas:
grid-template-areas:
'desc links'
'about about';
grid-template-columns: 2fr 1fr;
Expand All @@ -521,7 +523,7 @@
gap: var(--space-xl);

@media (max-width: @width-breakpoint-tablet) {
grid-template-areas:
grid-template-areas:
'desc desc'
'links links'
'about about';
Expand Down

0 comments on commit d78ba0c

Please sign in to comment.