Skip to content

Commit 4d1faf6

Browse files
santibsantib
authored
Merge pull request #63 from rubyuy/new_design
New design
2 parents d569fca + 1189605 commit 4d1faf6

File tree

16 files changed

+464
-183
lines changed

16 files changed

+464
-183
lines changed

‎_includes/default_header.html

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<header class="header__default">
2+
<div>
3+
<h1>
4+
COMUNIDAD RUBY EN URUGUAY
5+
</h1>
6+
<img src='/assets/images/logo.svg' aria-hidden="true" focuseable="false"/>
7+
</div>
8+
<div>
9+
<div>
10+
<h2>Sé parte_</h2>
11+
</div>
12+
<div>
13+
<ul>
14+
<li>
15+
<ul>
16+
<li>
17+
<a href="https://www.meetup.com/ruby-montevideo/" target="_blank">
18+
Meetup <img src='/assets/images/arrow.svg' aria-hidden="true" focuseable="false"/>
19+
</a>
20+
</li>
21+
<li>
22+
<a href="https://www.instagram.com/ruby_uruguay/" target="_blank">
23+
Instagram <img src='/assets/images/arrow.svg' aria-hidden="true" focuseable="false"/>
24+
</a>
25+
</li>
26+
</ul>
27+
</li>
28+
<li>
29+
<ul>
30+
<li>
31+
<a href="https://twitter.com/rubymontevideo" target="_blank">
32+
Twitter <img src="/assets/images/arrow.svg" aria-hidden="true" focuseable="false"/>
33+
</a>
34+
</li>
35+
<li>
36+
<a href="https://owu.slack.com/archives/C52L2AK8W" target="_blank">
37+
Slack <img src="/assets/images/arrow.svg" aria-hidden="true" focuseable="false"/>
38+
</a>
39+
</li>
40+
<li>
41+
<a href="https://github.com/rubyuy/ruby.uy" target="_blank">
42+
Github <img src="/assets/images/arrow.svg" aria-hidden="true" focuseable="false"/>
43+
</a>
44+
</li>
45+
</ul>
46+
</li>
47+
</ul>
48+
</div>
49+
</div>
50+
</header>

‎_includes/head.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
<title>Ruby UY</title>
33
<meta charset='utf-8' />
44
<meta name="viewport" content="width=device-width, initial-scale=1">
5+
<meta name="description" content="Sitio de la comunidad de Ruby en Uruguay">
56
<meta name="view-transition" content="same-origin" />
67
<link rel="preconnect" href="https://fonts.googleapis.com">
78
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
89
<link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@300&display=swap" rel="stylesheet">
9-
<link href="https://fonts.googleapis.com/css2?family=DM+Sans&family=Syncopate:wght@700&display=swap" rel="stylesheet">
10+
<link href="https://fonts.googleapis.com/css2?family=DM+Sans&family=Syncopate:wght@400;700&display=swap" rel="stylesheet">
1011

1112
<script async src="https://analytics.umami.is/script.js" data-website-id="209b35e2-b972-4bf5-8a88-09cedbc740f8" data-domains="ruby.uy"></script>
1213
<link rel="stylesheet" href="{{ "styles" | css_asset | buster }}">
13-
<script src="{{ "topbar" | js_asset | buster }}"></script>
14+
<script src="{{ "nav" | js_asset | buster }}"></script>
1415
</head>

‎_includes/header.html

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎_includes/nav.html

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<nav>
2+
<ul>
3+
<li>
4+
<a href="/"><img src="/assets/images/blackstar.svg" alt="Logo" /></a>
5+
</li>
6+
<li>
7+
Ruby UY
8+
</li>
9+
<li>
10+
<a href="#">HOME</a>
11+
</li>
12+
<li>
13+
<a href="#about">ABOUT</a>
14+
</li>
15+
<li>
16+
<a href="#contact">CONTACT</a>
17+
</li>
18+
<li>
19+
<button onclick="toggleNavLinks()" aria-label="Open Menu">
20+
<img class="barBurger" src="/assets/images/menu.svg" alt="Open Menu Icon" aria-hidden="true" focusable="false" />
21+
</button>
22+
</li>
23+
</ul>
24+
</nav>

‎_layouts/default.html

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
<!DOCTYPE html>
2-
<html>
2+
<html lang="es">
33
{% include head.html %}
44

55
<body>
6-
{% include header.html %}
6+
{% include nav.html %}
77

8-
<article>
9-
<header>
10-
<h1> Ruby UY </h1>
11-
<h2> Comunidad Ruby en Uruguay &#127482;&#127486; </h2>
12-
</header>
8+
{% include default_header.html %}
9+
<main>
10+
<article>
11+
<header>
12+
<h1> Ruby UY </h1>
13+
<h2> Comunidad Ruby en Uruguay &#127482;&#127486; </h2>
14+
</header>
1315

14-
<section> {{ content }} </section>
16+
<section> {{ content }} </section>
1517

16-
</article>
18+
</article>
19+
</main>
1720
</body>
1821

1922
</html>

‎_layouts/meetup.html

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,57 @@
11
<!DOCTYPE html>
2-
<html>
2+
<html lang="es">
33
{% include head.html %}
44

55
<body>
6-
{% include header.html %}
7-
8-
<article>
9-
<section>
10-
<p>
11-
Host: <a href="{{ site.data.companies[page.host].url }}">{{ site.data.companies[page.host].name }}</a>
12-
</p>
6+
{% include nav.html %}
7+
8+
<main>
9+
<article>
10+
<section>
11+
<p>
12+
Host: <a href="{{ site.data.companies[page.host].url }}">{{ site.data.companies[page.host].name }}</a>
13+
</p>
14+
15+
<h2>Speakers:</h2>
16+
<ul>
17+
{% for talk in page.talks %}
18+
{% for speaker in talk.speakers %}
19+
<li>
20+
{% if site.data.people[speaker].github %}
21+
<a href="https://github.com/{{ site.data.people[speaker].github }}">
22+
<img src="https://github.com/{{ site.data.people[speaker].github }}.png?size=30" alt="{{ site.data.people[speaker].name }}" style="border-radius: 50%; width: 30px"/>
23+
{{ site.data.people[speaker].name }}
24+
</a>
25+
{% else %}
26+
{{ site.data.people[speaker].name }}
27+
{% endif %}
28+
</li>
29+
{% endfor %}
30+
{% endfor %}
31+
</ul>
1332

14-
<h2>Speakers:</h2>
15-
<ul>
33+
<h2>Charlas:</h2>
1634
{% for talk in page.talks %}
35+
{% assign speakers = "" | split: ',' %}
1736
{% for speaker in talk.speakers %}
18-
<li>
19-
{% if site.data.people[speaker].github %}
20-
<a href="https://github.com/{{ site.data.people[speaker].github }}">
21-
<img src="https://github.com/{{ site.data.people[speaker].github }}.png?size=30" alt="{{ site.data.people[speaker].name }}" style="border-radius: 50%; width: 30px"/>
22-
{{ site.data.people[speaker].name }}
23-
</a>
24-
{% else %}
25-
{{ site.data.people[speaker].name }}
26-
{% endif %}
27-
</li>
37+
{% assign speakers = speakers | push: site.data.people[speaker].name %}
2838
{% endfor %}
29-
{% endfor %}
30-
</ul>
31-
32-
<h2>Charlas:</h2>
33-
{% for talk in page.talks %}
34-
{% assign speakers = "" | split: ',' %}
35-
{% for speaker in talk.speakers %}
36-
{% assign speakers = speakers | push: site.data.people[speaker].name %}
37-
{% endfor %}
38-
<h3>{{ talk.title }} - {{ speakers | join: ", " }}</h3>
39-
<p>{{ talk.description }}<p>
39+
<h3>{{ talk.title }} - {{ speakers | join: ", " }}</h3>
40+
<p>{{ talk.description }}<p>
4041

41-
{% if talk.recording %}
42-
<iframe src="{{ talk.recording }}" width="640" height="480" allow="autoplay"></iframe></br>
43-
{% endif %}
42+
{% if talk.recording %}
43+
<iframe src="{{ talk.recording }}" width="640" height="480" allow="autoplay"></iframe></br>
44+
{% endif %}
4445

45-
{% if talk.slides %}
46-
<iframe src="{{ talk.slides }}" frameborder="0" width="960" height="569" allowfullscreen="true" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe></br>
47-
{% endif %}
48-
{% endfor %}
49-
</section>
46+
{% if talk.slides %}
47+
<iframe src="{{ talk.slides }}" frameborder="0" width="960" height="569" allowfullscreen="true" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe></br>
48+
{% endif %}
49+
{% endfor %}
50+
</section>
5051

51-
<section> {{ content }} </section>
52-
</article>
52+
<section> {{ content }} </section>
53+
</article>
54+
</main>
5355
</body>
5456

5557
</html>

‎_sass/application.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
body {
1+
main {
22
padding: 10em;
33
font-family: 'Open Sans', sans-serif;
44
font-size: 10pt;
@@ -49,13 +49,13 @@ iframe {
4949
}
5050

5151
@media (max-width: 350px) {
52-
body {
52+
main {
5353
padding: 1em;
5454
}
5555
}
5656

5757
@media (min-width: 350px) and (max-width: 550px) {
58-
body {
58+
main {
5959
padding: 3em;
6060
}
6161
}

0 commit comments

Comments
 (0)