Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove JS layout adjustment and rely on CSS #21226

Draft
wants to merge 3 commits into
base: 5.x-dev
Choose a base branch
from
Draft

Remove JS layout adjustment and rely on CSS #21226

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c965547
Remove JS layout adjustment and rely on CSS
caddoo Sep 6, 2023
87544cd
Add 100% width to admin container
caddoo Sep 7, 2023
388b56c
Move class style to coreHome
caddoo Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion plugins/CoreHome/CoreHome.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ public function getJsFiles(&$jsFiles)
$jsFiles[] = "node_modules/mousetrap/mousetrap.min.js";

$jsFiles[] = "plugins/Morpheus/javascripts/piwikHelper.js";
$jsFiles[] = "plugins/Morpheus/javascripts/layout.js";
$jsFiles[] = "plugins/CoreHome/javascripts/require.js";
$jsFiles[] = "plugins/CoreHome/javascripts/uiControl.js";
$jsFiles[] = "plugins/CoreHome/javascripts/dataTable.js";
Expand Down
23 changes: 0 additions & 23 deletions plugins/Morpheus/javascripts/layout.js
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions plugins/Morpheus/stylesheets/general/_admin.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@

.admin {
width: 100%;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using global classes is always a bit "risky". This specific class would e.g. also apply here:

matomo/plugins/Feedback/templates/index.twig

Line 10 in 9a24d93

<div id="feedback-faq" class="admin">

It doesn't hurt in this case, as it doesn't have an effect, but might also be possible that a plugin might use that class for anything.
As it should only effect the admin content page, it might be better placed here:

matomo/plugins/CoreHome/stylesheets/coreHome.less

Lines 23 to 30 in d13d4c4

#content.admin {
display: inline-block;
max-width: 1300px;
> .row {
margin: 0 -0.75rem;
}
}

}

.ui-state-highlight {
border-color: @color-silver-l80 !important;
background: @color-silver-l95 !important;
Expand Down