Skip to content

Commit ddc831b

Browse files
committed
Simplify footer html and css
1 parent b1331ca commit ddc831b

File tree

3 files changed

+33
-56
lines changed

3 files changed

+33
-56
lines changed

app/javascript/css/components/footer-content.css

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ footer {
33
}
44

55
.footer-content {
6-
& nav > * {
6+
& nav > ul > li {
77
padding-top: var(--space-2xs-xs);
88
padding-bottom: var(--space-2xs-xs);
99
}
@@ -13,33 +13,14 @@ footer {
1313
flex-wrap: wrap;
1414
}
1515

16-
& nav > ul > li:first-child {
17-
& a {
18-
font-weight: bold;
19-
}
20-
21-
&:has(+ li) {
22-
margin-inline-end: var(--space-2xs-xs);
23-
24-
& a {
25-
margin-inline-end: var(--space-2xs-xs);
26-
}
27-
28-
&:after {
29-
content: ' / ';
30-
color: var(--joy-text-faint);
31-
}
32-
}
16+
& nav > ul > li > a {
17+
font-weight: bold;
3318
}
3419

35-
& nav > ul > li > ul > li:has(+ li) {
36-
margin-inline-end: var(--space-2xs-xs);
37-
38-
& a {
39-
margin-inline-end: var(--space-2xs-xs);
40-
}
41-
20+
& nav li:has(+ li) {
4221
&:after {
22+
margin-inline-start: var(--space-2xs-xs);
23+
margin-inline-end: var(--space-2xs-xs);
4324
content: ' / ';
4425
color: var(--joy-text-faint);
4526
}

app/views/application/_footer.html.erb

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,51 +4,47 @@
44
<div><%= inline_svg_tag "joy-logo.svg", class: "fill-current" %></div>
55
<div>Sharing and experiencing the Joy of Rails</div>
66
<% end %>
7-
<nav
8-
class="">
7+
<nav>
98
<ul>
10-
<li class="">
11-
<a
12-
class=""
13-
href="/articles">Articles</a>
14-
</li>
15-
</ul>
16-
<ul>
17-
<li class="">
18-
<%= link_to "Settings", settings_color_scheme_path %>
19-
</li>
20-
<li class="">
21-
<%= link_to "Syntax Highlighting", settings_syntax_highlight_path %>
22-
</li>
23-
<!--
249
<li>
25-
<ul>
26-
<li>
27-
<%#= link_to "Colors", settings_color_scheme_path %>
28-
</li>
29-
</ul>
10+
<a href="/articles">Articles</a>
3011
</li>
31-
-->
3212
</ul>
3313
<ul>
34-
<li class="">
35-
<a class="" href="/about">About</a>
14+
<li>
15+
<%= link_to "Settings", settings_color_scheme_path %>
3616
</li>
3717
<li>
3818
<ul>
3919
<li>
40-
<a class="" href="/about/acknowledgements">Acknowledgements</a>
20+
<%= link_to "Color Schemes", settings_color_scheme_path %>
4121
</li>
4222
<li>
43-
<a class="" href="/about/design">Design</a>
23+
<%= link_to "Syntax Highlighting", settings_syntax_highlight_path %>
4424
</li>
4525
</ul>
4626
</li>
4727
</ul>
48-
<ul>
49-
<li class=""><a
50-
class=""
51-
href="mailto:[email protected]">[email protected]</a></li>
28+
<ul>
29+
<li>
30+
<a href="/about">About</a>
31+
</li>
32+
<li>
33+
<ul>
34+
<li>
35+
<a class="" href="/about/acknowledgements">Acknowledgements</a>
36+
</li>
37+
<li>
38+
<a class="" href="/about/design">Design</a>
39+
</li>
40+
</ul>
41+
</li>
42+
</ul>
43+
<ul>
44+
<li>
45+
46+
</li>
47+
</ul>
5248
</ul>
5349
</nav>
5450
<div>

spec/system/settings/color_schemes_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
it "user can selected a curated color scheme" do
1515
visit root_path
1616

17-
click_link "Settings"
17+
click_link "Color Schemes"
1818

1919
chosen_color = curated_colors.sample
2020
select chosen_color.display_name, from: "settings[color_scheme_id]"

0 commit comments

Comments
 (0)