Skip to content

Commit bc64c18

Browse files
authored
Merge pull request #4122 from AlchemyCMS/new-panel-style
New panel style
2 parents 22a8438 + 94fdf21 commit bc64c18

14 files changed

Lines changed: 57 additions & 41 deletions

File tree

app/assets/builds/alchemy/admin.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/assets/builds/alchemy/alchemy_admin.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/assets/builds/alchemy/alchemy_admin.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/assets/builds/alchemy/dark-theme.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/assets/builds/alchemy/light-theme.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/assets/builds/alchemy/theme.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/components/alchemy/admin/dashboard/widgets/system_info.html.erb

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,13 @@
2828
<span class="label-with-icon license">
2929
<%= render_icon("certificate-2") %>
3030
<%= link_to_dialog(
31-
license,
32-
alchemy.dashboard_license_path,
33-
{title: Alchemy.t(:license), size: "600x500"}
34-
) %>
31+
license,
32+
alchemy.dashboard_license_path,
33+
{
34+
title: Alchemy.t(:license),
35+
size: "620x470"
36+
}
37+
) %>
3538
</span>
3639
</div>
3740
</div>

app/javascript/alchemy_admin/dialog.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,10 @@ export class Dialog {
263263
e.preventDefault()
264264
this.close()
265265
})
266+
this.dialog_container.addEventListener("close", (e) => {
267+
e.preventDefault()
268+
this.close()
269+
})
266270
this.dialog_container.classList.add("closable")
267271
// Use pointerdown, not click: a click whose mousedown and mouseup land on
268272
// different nodes is dispatched to their common ancestor — this element for

app/stylesheets/alchemy/_themes.scss

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,10 @@
152152
--pagination-disabled-text-color: var(--a-light-grey);
153153

154154
/* Panels */
155-
--panel-background-color: var(--a-darker-grey);
155+
--panel-background-color: var(--body-background-color);
156156
--panel-border-color: var(--a-grey);
157+
--panel-box-shadow: 0 var(--spacing-0) var(--spacing-2)
158+
hsla(0deg, 0%, 0%, 0.5);
157159

158160
--picture-thumbnail-background-color: var(--a-dark-grey);
159161
--picture-thumbnail-toolbar-bg-color: var(--a-darker-grey);
@@ -428,8 +430,9 @@
428430
--pagination-disabled-text-color: #c0c0c0;
429431

430432
/* Panels */
431-
--panel-background-color: var(--color-grey_light);
432-
--panel-border-color: var(--border-color);
433+
--panel-background-color: var(--body-background-color);
434+
--panel-border-color: var(--color-grey_light);
435+
--panel-box-shadow: var(--dashboard-widget-box-shadow);
433436

434437
--picture-tool-background-color: var(--color-white);
435438
--picture-tool-hover-background-color: var(--color-grey_very_light);

app/stylesheets/alchemy/admin/base.scss

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,13 @@ hr {
9292
}
9393

9494
.panel {
95-
width: 80%;
9695
max-width: 500px;
97-
margin: 2em auto;
96+
margin: auto;
9897
padding: var(--spacing-4);
9998
background: var(--panel-background-color);
100-
border-radius: var(--border-radius_medium);
101-
border: var(--border-default);
102-
border-color: var(--panel-border-color);
99+
border-radius: var(--border-radius_large);
100+
border: 1px solid var(--panel-border-color);
101+
box-shadow: var(--panel-box-shadow);
103102
}
104103

105104
.float_right {

0 commit comments

Comments
 (0)