11@import ' @wordpress/base-styles/colors' ;
22
3- $admin-bar-height : 32 px ;
3+ $admin-bar-height : 33 px ;
44$layout-spacing : 16px ;
55$sidebar-width : 350px ;
66$chat-header-height : 38px ;
@@ -50,6 +50,17 @@ $transition-timing: $transition-duration cubic-bezier( 0.4, 0, 0.2, 1 );
5050 }
5151}
5252
53+ // Reposition the notice panel
54+ @mixin notice-panel-open ( $notice-panel-selector ) {
55+ #{$notice-panel-selector } {
56+ right : $sidebar-width !important ;
57+ top : $layout-spacing + $admin-bar-height !important ;
58+ bottom : $layout-spacing !important ;
59+ border-bottom-right-radius : $main-border-radius !important ;
60+ overflow : hidden ;
61+ }
62+ }
63+
5364// Reposition the editor's template save confirmation panel
5465@mixin editor-save-panel-open ( $save-panel-selector ) {
5566 #{$save-panel-selector } {
@@ -66,19 +77,32 @@ $transition-timing: $transition-duration cubic-bezier( 0.4, 0, 0.2, 1 );
6677 }
6778}
6879
69- // TODO: AI-679 will fix it...
7080/* WP Admin */
7181$admin-menu-width-unified : 272px ;
7282$admin-menu-width-classic : 160px ;
7383$admin-menu-width-folded : 37px ;
7484$admin-content-top : calc ( $admin-bar-height + $layout-spacing );
75- $admin-content-height : calc ( 100vh - $admin-bar-height - ( $layout-spacing * 2 ) );
76- $border-color : #545454 ;
7785$admin-background-color : #f1f1f1 ;
86+ $border-color : #545454 ;
7887
7988// Mixin for wp-admin sidebar open styles
80- // Used by both body-level and #wpwrap-level containers
81- @mixin wp-admin-sidebar-open-general () {
89+ @mixin wp-admin-sidebar-open-specific ( $admin-menu-width ) {
90+ #wpcontent {
91+ margin-left : calc ( $admin-menu-width + $layout-spacing ) !important ;
92+ }
93+
94+ #wpbody {
95+ left : calc ( $admin-menu-width + $layout-spacing );
96+ width : calc ( 100% - $admin-menu-width - $layout-spacing - $sidebar-width ) !important ;
97+ }
98+ }
99+
100+ body .wp-admin.agents-manager-sidebar-container--sidebar-open {
101+ @include wp-admin-sidebar-open-specific ( $admin-menu-width-classic );
102+ @include notice-panel-open ( ' #wpnt-notes-panel2' );
103+
104+ background-color : $gray-900 ;
105+
82106 #wpadminbar {
83107 position : fixed !important ;
84108 top : $layout-spacing ;
@@ -88,18 +112,18 @@ $admin-background-color: #f1f1f1;
88112 border-radius : $main-border-radius $main-border-radius 0 0 ;
89113 border : 1px solid $border-color ;
90114 border-bottom : none ;
115+ overflow : hidden ;
91116 }
92117
93118 #adminmenuback ,
94119 #adminmenuwrap {
95120 position : fixed !important ;
96121 top : $admin-content-top ;
97122 left : $layout-spacing ;
98- bottom : $layout-spacing ;
99- height : $admin-content-height !important ;
123+ height : calc ( 100vh - $admin-bar-height - ( $layout-spacing * 2 ) ) !important ;
100124 border-left : 1px solid $border-color ;
101125 border-bottom : 1px solid $border-color ;
102- border-radius : 0 0 0 $main-border-radius ;
126+ border-bottom-left- radius : $main-border-radius ;
103127 overflow : scroll ;
104128 }
105129
@@ -111,27 +135,23 @@ $admin-background-color: #f1f1f1;
111135 position : fixed !important ;
112136 top : $admin-content-top ;
113137 right : $sidebar-width ;
114- bottom : $layout-spacing ;
115- height : $admin-content-height !important ;
116- max-height : $admin-content-height !important ;
117- min-height : 0 ;
118- box-sizing : border-box ;
119138 padding-left : $layout-spacing ;
120- border-radius : 0 0 $main-border-radius 0 ;
121- border : 1px solid $border-color ;
122- border-top : none ;
139+ bottom : $layout-spacing - 1px ;
140+ border-bottom-right-radius : $main-border-radius ;
141+ border-right : 1px solid $border-color ;
142+ border-bottom : 1px solid $border-color ;
123143 overflow-y : auto ;
124144 overflow-x : hidden ;
125145 background-color : $admin-background-color ;
126- margin : 0 !important ;
146+ box-sizing : border-box ;
127147 }
128148
129149 #wpfooter {
130150 margin-right : calc ( $sidebar-width + 1px ) !important ;
131- bottom : 17px ;
132- left : 18px ;
151+ left : $layout-spacing - 2px ;
152+ bottom : $layout-spacing ;
153+ border-bottom-right-radius : $main-border-radius ;
133154 background-color : $admin-background-color ;
134- border-radius : 0 0 $main-border-radius 0 ;
135155 }
136156
137157 .agents-manager-chat--docked {
@@ -144,61 +164,18 @@ $admin-background-color: #f1f1f1;
144164 .agents-manager-sidebar-fab {
145165 display : none ;
146166 }
147- }
148167
149- @mixin wp-admin-sidebar-open-specific ( $admin-menu-width ) {
150- #wpcontent {
151- margin-left : calc ( $admin-menu-width + $layout-spacing ) !important ;
168+ & .is-nav-unification {
169+ @include wp-admin-sidebar-open-specific ( $admin-menu-width-unified );
152170 }
153171
154- #wpbody {
155- left : calc ( $admin-menu-width + $layout-spacing );
156- width : calc ( 100% - $admin-menu-width - $layout-spacing - $sidebar-width ) !important ;
172+ & .folded {
173+ @include wp-admin-sidebar-open-specific ( $admin-menu-width-folded );
157174 }
158175}
159176
160- // When container is body (legacy behavior)
161- body .wp-admin :has ( #wpwrap .agents-manager-sidebar-container--sidebar-open ),
162- body .is-nav-unification.wp-admin.agents-manager-sidebar-container--sidebar-open ,
163- body .folded.wp-admin.agents-manager-sidebar-container--sidebar-open ,
164- body .wp-admin.agents-manager-sidebar-container--sidebar-open {
165- background-color : $gray-900 ;
166- @include wp-admin-sidebar-open-general ();
167- }
168-
169- body .is-nav-unification.wp-admin.agents-manager-sidebar-container--sidebar-open {
170- @include wp-admin-sidebar-open-specific ( $admin-menu-width-unified );
171- }
172-
173- body .folded.wp-admin.agents-manager-sidebar-container--sidebar-open {
174- @include wp-admin-sidebar-open-specific ( $admin-menu-width-folded );
175- }
176-
177- body .wp-admin.agents-manager-sidebar-container--sidebar-open {
178- @include wp-admin-sidebar-open-specific ( $admin-menu-width-classic );
179- }
180-
181- body .is-nav-unification #wpwrap .agents-manager-sidebar-container--sidebar-open {
182- @include wp-admin-sidebar-open-specific ( $admin-menu-width-unified );
183- }
184-
185- body #wpwrap .agents-manager-sidebar-container--sidebar-open {
186- @include wp-admin-sidebar-open-general ();
187- @include wp-admin-sidebar-open-specific ( $admin-menu-width-classic );
188- }
189-
190- body .folded #wpwrap .agents-manager-sidebar-container--sidebar-open {
191- @include wp-admin-sidebar-open-general ();
192- @include wp-admin-sidebar-open-specific ( $admin-menu-width-folded );
193- }
194-
195- #wp-admin-bar-top-secondary {
196- border-radius : $main-border-radius $main-border-radius 0 0 !important ;
197- }
198-
199- // TODO: This solution will impact other pages, we need to find a better way in AI-679...
200177/* Calypso */
201- body :not ( .wp-admin ).agents-manager-sidebar-container {
178+ body :is( [ class *= ' is-group- ' ], [ class *= ' is-section- ' ] ).agents-manager-sidebar-container {
202179 @include sidebar-base ( ' #wpcom #content' );
203180
204181 #content {
@@ -207,15 +184,15 @@ body:not( .wp-admin ).agents-manager-sidebar-container {
207184
208185 & .agents-manager-sidebar-container--sidebar-open {
209186 @include sidebar-open-base ( ' #wpcom #content' );
187+ @include notice-panel-open ( ' #wpnc-panel' );
210188
211189 #header {
212190 top : $layout-spacing ;
213191 left : $layout-spacing ;
214192 right : $sidebar-width ;
215193 width : auto ;
216194 overflow : hidden ;
217- border-top-left-radius : $main-border-radius ;
218- border-top-right-radius : $main-border-radius ;
195+ border-radius : $main-border-radius $main-border-radius 0 0 ;
219196 }
220197
221198 #content {
@@ -231,15 +208,13 @@ body:not( .wp-admin ).agents-manager-sidebar-container {
231208 left : $layout-spacing ;
232209 bottom : $layout-spacing ;
233210 overflow : hidden ;
234- border-top-left-radius : $main-border-radius ;
235- border-bottom-left-radius : $main-border-radius ;
211+ border-radius : $main-border-radius 0 0 $main-border-radius ;
236212 }
237213 }
238214}
239215
240- // TODO: AI-679 will fix it...
241216/* Next Admin editor */
242- .next-admin.agents-manager-sidebar-container {
217+ body .next-admin.agents-manager-sidebar-container {
243218 @include sidebar-base ( ' .next-admin-layout__canvas.is-full-canvas' );
244219
245220 & .agents-manager-sidebar-container--sidebar-open {
@@ -250,9 +225,8 @@ body:not( .wp-admin ).agents-manager-sidebar-container {
250225 }
251226}
252227
253- // TODO: AI-679 will fix it...
254228/* Site editor */
255- # site-editor .agents-manager-sidebar-container {
229+ body . site-editor-php .agents-manager-sidebar-container {
256230 @include sidebar-base ( ' .edit-site-layout__canvas' );
257231
258232 // Delay to prevent flickering when closing the left navigation sidebar
@@ -265,12 +239,17 @@ body:not( .wp-admin ).agents-manager-sidebar-container {
265239 @include editor-save-panel-open (
266240 ' .interface-navigable-region.interface-interface-skeleton__actions'
267241 );
242+
243+ // Override canvas styles when the site editor navigation menu is open
244+ .edit-site-layout :not ( .is-full-canvas ) .edit-site-layout__canvas {
245+ width : calc ( 100% - $sidebar-width ) !important ;
246+ margin : 0 !important ;
247+ }
268248 }
269249}
270250
271- // TODO: AI-679 will fix it...
272251/* Page editor */
273- .block-editor .agents-manager-sidebar-container {
252+ body .post-php .agents-manager-sidebar-container {
274253 @include sidebar-base ( ' .edit-post-layout' );
275254
276255 .edit-post-layout {
0 commit comments