Skip to content

Commit 0691253

Browse files
Josh SagerGitHub Enterprise
authored andcommitted
Merge pull request linode#48 from abailly/DLC-72
DLC-72 FE fixes
2 parents 883ba73 + 84551e5 commit 0691253

File tree

11 files changed

+49
-1
lines changed

11 files changed

+49
-1
lines changed

content/events/2018/08-25.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ description: "FOSSCON"
77
location: "Philadelphia, PA"
88
event_url: "https://fosscon.us/"
99
image_url: "https://www.linode.com/media/images/events/fosscon.png"
10+
register_link: "https://www.eventbee.com/v/fosscon2018#/tickets"
1011
sites:
1112
- developers
1213
---

content/events/2018/09-10.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ description: "SaltConf 18"
77
location: "Salt Lake City, UT"
88
event_url: "https://saltconf.com/"
99
image_url: "https://www.linode.com/media/images/events/SaltConf18.png"
10+
register_link: "https://saltconf.com/register/"
1011
sites:
1112
- developers
1213
---

content/events/2018/09-24.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ description: "ApacheCon"
77
location: "Montreal, CDN"
88
event_url: "https://www.apachecon.com/acna18/index.html"
99
image_url: "https://www.linode.com/media/images/events/apachecon_na.png"
10+
register_link: "https://www.eventbrite.com/e/apachecon-north-america-2018-registration-43200327342"
1011
sites:
1112
- developers
1213
---

content/events/2018/10-05.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ description: "Asbury Agile"
77
location: "Asbury Park, NJ"
88
event_url: "http://www.asburyagile.com/"
99
image_url: "https://www.linode.com/media/images/events/Asbury_agile.png"
10+
register_link: "https://www.eventbrite.com/e/asbury-agile-2018-tickets-47519699701"
1011
sites:
1112
- developers
1213
---

themes/dlc/layouts/_default/changelog.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<span class="uppercase font-semibold text-xs mr-4">Product:</span>
1010
{{ $currentTag := index (last 1 (split (delimit (split .URL "/") "," "") ",")) 0 }}
1111
{{ range $name, $items := .Site.Taxonomies.changelog }}
12-
<a href="{{ $.Site.BaseURL }}changelog/{{ $name | urlize | lower }}" class="btn btn-small btn-grey mr-2 {{ if eq $currentTag $name}}active{{end}}">{{ $name | humanize}}</a>
12+
<a href="{{ $.Site.BaseURL }}changelog/{{ $name | urlize | lower }}" class="btn btn-small btn-grey mr-2 {{ if eq $currentTag $name}}active{{end}}">{{ $name | upper}}</a>
1313
{{ end }}
1414
</nav>
1515

themes/dlc/layouts/index.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,16 @@ <h3 class="mt-0 mb-4"><a href="{{ .Params.event_url }}" class="text-black tile-l
5858
<div><strong>{{ dateFormat "Jan 2, 2006" .Params.start_date }}</strong></div>
5959
<p>{{ .Content }}</p>
6060
</section>
61+
{{ if .Params.register_link }}
62+
<footer>
63+
<a href="{{ .Params.register_link }}" target ="_blank">Register Now</a>
64+
</footer>
65+
{{ end }}
6166
</div>
6267
</article>
6368
{{ end }}
6469
{{ end }}
70+
<a class="btn block mx-auto" href="https://www.linode.com/events" target="_blank">View All Events</a>
6571
</div>
6672

6773
<div class="relative row-full pb-8">
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.bg-d-cell footer {
2+
position: relative;
3+
z-index: 2;
4+
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
a {
2+
@apply text-d-turq;
3+
text-decoration: underline;
4+
}
5+
6+
a:hover {
7+
@apply text-d-turq-hov;
8+
}
9+
10+
h1 a,
11+
h2 a,
12+
h3 a,
13+
h4 a,
14+
h5 a {
15+
text-decoration: none !important;
16+
}

themes/dlc/srcCSS/components/1_atoms/button.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
transition: background-color 225ms ease-in-out,
55
color 225ms ease-in-out;
66
line-height: 1;
7+
text-decoration: none;
78
}
89

910
.btn-small {
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.main-nav-link {
2+
text-decoration: none;
3+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.footer-nav a,
2+
.footer-wrapper a {
3+
text-decoration: none;
4+
}
5+
6+
.footer-nav a:hover{
7+
@apply text-white;
8+
text-decoration: none;
9+
}
10+
11+
.footer-wrapper a:hover {
12+
@apply text-white;
13+
text-decoration: underline;
14+
}

0 commit comments

Comments
 (0)