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.

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

CP sidebar UI fixes #14910

Merged
merged 8 commits into from
May 1, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG-WIP.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

### Content Management
- Element index checkboxes no longer have a lag when deselected, except within element selection modals. ([#14896](https://github.com/craftcms/cms/issues/14896))
- Improved mobile styling. ([#14910](https://github.com/craftcms/cms/pull/14910))

### Extensibility
- Added the `waitForDoubleClicks` setting to `Garnish.Select`, `Craft.BaseElementIndex`, and `Craft.BaseElementIndexView`.
7 changes: 2 additions & 5 deletions src/templates/_layouts/cp.twig
Original file line number Diff line number Diff line change
Expand Up @@ -258,11 +258,11 @@ history.replaceState(undefined, undefined, window.location.href.match(/^[^#]*/)[
<button
type="button"
id="sidebar-toggle"
class="btn menubtn"
class="btn menubtn chromeless"
aria-controls="sidebar-container"
aria-expanded="false"
>
{{ 'Show sidebar'|t('app') }}
<span id="content-heading"></span>
</button>
</div>
<div id="sidebar-container">
Expand All @@ -274,9 +274,6 @@ history.replaceState(undefined, undefined, window.location.href.match(/^[^#]*/)[

{# content-container #}
<div id="content-container">
{% if sidebar %}
<h2 id="content-heading"></h2>
{% endif %}
{% block main %}
{% if errorSummary is not empty %}
{{ errorSummary is defined ? errorSummary|raw }}
Expand Down
2 changes: 1 addition & 1 deletion src/web/assets/cp/dist/css/cp.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/web/assets/cp/dist/css/cp.css.map

Large diffs are not rendered by default.

68 changes: 47 additions & 21 deletions src/web/assets/cp/src/css/_cp.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1003,7 +1003,7 @@ li.breadcrumb-toggle-wrapper {
#sidebar {
position: relative;
box-sizing: border-box;
padding: 0 31px var(--m);
padding: 0 40px var(--m);
width: $sidebarWidth;
background-color: transparent;

Expand Down Expand Up @@ -1031,6 +1031,13 @@ li.breadcrumb-toggle-wrapper {
}
}
}
.skip-link {
margin: 0 var(--s);
}

@media only screen and (min-width: $minFullUiWidth) {
padding: 0 31px var(--m);
}
}

#content-container {
Expand All @@ -1043,14 +1050,6 @@ li.breadcrumb-toggle-wrapper {
width: 400px;
}

#content-heading {
margin-top: var(--xl) !important;

@media only screen and (min-width: $minHorizontalUiWidth) {
@include visually-hidden;
}
}

.content-pane {
@include pane;
border-radius: var(--large-border-radius);
Expand Down Expand Up @@ -1224,13 +1223,17 @@ li.breadcrumb-toggle-wrapper {

#main-content {
width: 100vw;
&.has-sidebar {
padding-left: 0;
}
}
}

// Rearrange #main-content to flow vertically at < 999
@media only screen and (max-width: $minHorizontalUiWidth - calc(1rem/16)) {
#header {
display: block;
display: flex;
flex-wrap: wrap;

.flex:not(#toolbar) {
margin-top: 10px;
Expand All @@ -1239,42 +1242,59 @@ li.breadcrumb-toggle-wrapper {

#toolbar {
flex-wrap: wrap !important;
order: 3;
width: 100%;
flex: auto;

& > * {
margin-top: 10px !important;
}
}

#action-buttons {
order: 2;
}

body.fixed-header #header .flex:first-child {
margin-top: 0;
}

#main-content {
display: block;
&.has-sidebar {
padding: 0 var(--padding) 48px;
}
}

#sidebar {
nav {
margin-left: -40px;
margin-right: -40px;
}
.skip-link {
margin: 0;
}
}

#source-actions {
margin-top: var(--s);
margin-left: -9px;
}

#sidebar-toggle-container {
display: block;
margin-bottom: var(--m);
margin-bottom: var(--s);
}

#sidebar-toggle {
&:after {
top: 0;
transform: rotate(-45deg);
transform: rotate(45deg);

body.rtl & {
transform: rotate(135deg);
}
}

body.showing-sidebar & {
background-color: darken($grey200, 10%) !important;

&:after {
transform: rotate(45deg);
}
}
}

#content-container {
Expand All @@ -1294,7 +1314,7 @@ li.breadcrumb-toggle-wrapper {

#sidebar,
#details {
position: static !important;
position: relative !important;
overflow-y: visible !important;
max-height: none !important;
width: auto;
Expand All @@ -1303,6 +1323,12 @@ li.breadcrumb-toggle-wrapper {
#sidebar {
margin-bottom: var(--m);

body.showing-sidebar & {
@include pane;
padding-block: 0.5rem;
border-radius: var(--large-border-radius);
}

body:not(.showing-sidebar) & {
display: none;
}
Expand Down