Skip to content

Commit 3d089ac

Browse files
committed
Adjust styling of page definitions
1 parent 39ba865 commit 3d089ac

File tree

7 files changed

+65
-24
lines changed

7 files changed

+65
-24
lines changed

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/stylesheets/alchemy/admin/page_definitions.scss

Lines changed: 45 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
aside {
2222
position: sticky;
2323
top: calc(var(--top-menu-height) + var(--spacing-2));
24-
background-color: var(--sidebar-background-color);
24+
background-color: var(--panel-background-color);
2525
border-radius: var(--border-radius_medium);
2626
padding: var(--spacing-4);
2727
margin-bottom: var(--spacing-2);
@@ -31,20 +31,22 @@
3131
flex-direction: column;
3232
gap: var(--spacing-2);
3333
list-style-position: outside;
34-
margin-left: var(--spacing-1);
34+
margin: 0 var(--spacing-1);
3535
}
3636

3737
li {
38-
padding: var(--spacing-1);
38+
margin: var(--spacing-1) 0;
39+
padding: var(--spacing-2);
3940
font-weight: bold;
4041
}
4142
}
4243

4344
details {
44-
padding: var(--spacing-2);
45-
margin: var(--spacing-2) 0;
45+
padding: var(--spacing-2) var(--spacing-2);
46+
margin: var(--spacing-4) 0;
4647
background-color: var(--element-header-bg-color);
4748
border-radius: var(--border-radius_medium);
49+
border: 1px solid hsla(0, 0%, 45%, 0.15);
4850

4951
summary {
5052
display: flex;
@@ -53,6 +55,7 @@
5355
padding: var(--spacing-1) 0;
5456
font-weight: bold;
5557
gap: var(--spacing-1);
58+
transition: margin var(--transition-duration) ease-out;
5659

5760
header {
5861
display: flex;
@@ -62,8 +65,6 @@
6265
gap: var(--spacing-1);
6366

6467
.label {
65-
padding: var(--spacing-0) var(--spacing-2);
66-
background-color: hsla(0, 0%, 45%, 0.15);
6768
margin-left: auto;
6869
font-weight: normal;
6970

@@ -83,24 +84,43 @@
8384
}
8485
}
8586

86-
&[open] > summary:before {
87-
content: "";
87+
&[open] {
88+
> summary {
89+
&:before {
90+
content: "";
91+
}
92+
93+
margin-bottom: var(
94+
--spacing-1
95+
); // necessary for the detail opening transition to work
96+
}
8897
}
8998

9099
> div {
91100
padding: var(--spacing-1) 0 var(--spacing-1) var(--spacing-5);
92101
}
93102

94103
ol {
95-
list-style-type: none;
96-
padding-left: 0;
104+
list-style-type: square;
105+
margin: var(--spacing-4) 0;
106+
padding-left: var(--spacing-3);
97107

98108
li {
99-
margin: var(--spacing-4) 0;
109+
margin: var(--spacing-6) 0;
110+
111+
&:only-child {
112+
margin-top: 0;
113+
margin-bottom: 0;
114+
}
100115

101116
header {
102117
gap: var(--spacing-2);
103118
}
119+
120+
p.description {
121+
margin: var(--spacing-2) 0;
122+
padding: var(--spacing-2);
123+
}
104124
}
105125
}
106126

@@ -113,7 +133,7 @@
113133
.page-definition {
114134
padding: var(--spacing-4);
115135
margin-bottom: var(--spacing-2);
116-
background-color: var(--sidebar-background-color);
136+
background-color: var(--panel-background-color);
117137
border-radius: var(--border-radius_medium);
118138

119139
> img {
@@ -124,6 +144,18 @@
124144

125145
p {
126146
margin: var(--spacing-4) 0;
147+
padding: var(--spacing-4);
148+
background-color: hsla(0, 0%, 45%, 0.05);
149+
border-radius: var(--border-radius_medium);
150+
151+
&:first-child {
152+
margin-top: var(--spacing-2);
153+
}
154+
}
155+
156+
.label {
157+
padding: var(--spacing-0) var(--spacing-2);
158+
background-color: hsla(0, 0%, 45%, 0.15);
127159
}
128160
}
129161
}

app/views/alchemy/admin/page_definitions/_element.html.erb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@
1313
</header>
1414
</summary>
1515
<div>
16-
<% if element.deprecated %>
17-
<alchemy-message type="warning">
18-
<%= element.deprecation_notice %>
19-
</alchemy-message>
20-
<% end %>
21-
<% if element.has_hint? %>
22-
<p><%= element.hint %></p>
23-
<% end %>
2416
<% if element.unique %>
2517
<sl-tooltip content="This element can only be used once per page">
2618
<small class="label">
@@ -35,6 +27,14 @@
3527
</small>
3628
</sl-tooltip>
3729
<% end %>
30+
<% if element.deprecated %>
31+
<alchemy-message type="warning">
32+
<%= element.deprecation_notice %>
33+
</alchemy-message>
34+
<% end %>
35+
<% if element.has_hint? %>
36+
<p class="description"><%= element.hint %></p>
37+
<% end %>
3838
<% if element.ingredients.any? %>
3939
<ol>
4040
<%= render collection: element.ingredients, partial: "ingredient", locals: {element_name: element_name} %>

app/views/alchemy/admin/page_definitions/_ingredient.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<small><%= Alchemy::Ingredient.normalize_type(ingredient.type).constantize.model_name.human %></small>
55
</header>
66
<% if ingredient.has_hint? %>
7-
<p><%== ingredient.hint %></p>
7+
<p class="description"><%= sanitize ingredient.hint %></p>
88
<% end %>
99
</li>

app/views/alchemy/admin/page_definitions/_page_definition.html.erb

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,15 @@
1414
<% if page_definition.image %>
1515
<%= image_tag page_definition.image %>
1616
<% end %>
17+
<% if page_definition.unique %>
18+
<sl-tooltip content="This page can only be used once per page">
19+
<small class="label">
20+
<%= Alchemy::PageDefinition.human_attribute_name(:unique) %>
21+
</small>
22+
</sl-tooltip>
23+
<% end %>
1724
<% if page_definition.has_hint? %>
18-
<p><%= page_definition.hint %></p>
25+
<p class="description"><%= page_definition.hint %></p>
1926
<% end %>
2027
<% if page_definition.elements.any? %>
2128
<%= render collection: page_definition.elements, partial: "element", as: "element_name" %>

spec/dummy/config/alchemy/elements.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@
211211

212212
- name: slide
213213
icon: image-2-line
214+
hint: "A single slide for the slider element."
214215
compact: true
215216
ingredients:
216217
- role: picture

spec/dummy/config/alchemy/page_layouts.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
searchresults: true
5454

5555
- name: contact
56+
hint: The contact page provides a contactform.
5657
unique: true
5758
cache: false
5859
elements: [headline, text, contactform]

0 commit comments

Comments
 (0)