Skip to content

Commit 6e268dd

Browse files
santibsantib
authored
Merge pull request #66 from rubyuy/new_design
Add meetup list, sponsors list and footer
2 parents 92abda5 + 8783881 commit 6e268dd

22 files changed

+361
-76
lines changed

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ Sitio de la comunidad Ruby en Uruguay
77

88
## Local
99

10+
Run server:
1011
```bash
11-
make server
12+
bundle exec jekyll serve
1213
```
1314

1415
## Adding slides

‎_includes/footer.html

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<footer>
2+
<div>
3+
<h1>
4+
<a href="mailto:[email protected]">[email protected]</a>
5+
</h1>
6+
<ul>
7+
<li>
8+
<a href="https://twitter.com/rubymontevideo"><img src="/assets/images/twitter.svg" alt="Twitter Icon"></a>
9+
</li>
10+
<li>
11+
<a href="https://github.com/rubyuy/ruby.uy"><img src="/assets/images/github.svg" alt="Github Icon"></a>
12+
</li>
13+
<li>
14+
<a href="https://www.instagram.com/ruby_uruguay/"><img src="/assets/images/instagram.svg" alt="Instagram Icon"></a>
15+
</li>
16+
</ul>
17+
</div>
18+
<div>
19+
<img src="/assets/images/thank_you.svg" aria-hidden="true">
20+
</div>
21+
</footer>

‎_includes/head.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
<script async src="https://analytics.umami.is/script.js" data-website-id="209b35e2-b972-4bf5-8a88-09cedbc740f8" data-domains="ruby.uy"></script>
1313
<link rel="stylesheet" href="{{ "styles" | css_asset | buster }}">
14+
<script src="{{ "application" | js_asset | buster }}"></script>
1415
<script src="{{ "nav" | js_asset | buster }}"></script>
1516
<script src="{{ "next_meetup_callout" | js_asset | buster }}"></script>
17+
<script src="{{ "sponsors" | js_asset | buster }}"></script>
1618
</head>

‎_includes/meetups.html

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<section id="meetups">
2+
<header>
3+
<h1>EDICIONES PASADAS</h1>
4+
<p>Conocé el contenido de las ediciones pasadas.</p>
5+
</header>
6+
7+
<ul>
8+
{% for meetup in site.meetups reversed %}
9+
<li class="meetup-event">
10+
<a href="{{ meetup.url }}" class="meetup-event__link">
11+
<span class="meetup-event__date">
12+
{{ meetup.date | date_to_string }}
13+
</span>
14+
<span class="meetup-event__company">
15+
{{ meetup.title }}
16+
<img src="/assets/images/arrow.svg" aria-hidden="true">
17+
</span>
18+
</a>
19+
</li>
20+
{% endfor %}
21+
</ul>
22+
</section>

‎_includes/sponsors.html

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<section id="sponsors-list">
2+
<ul>
3+
{% for sponsor in site.data.sponsors %}
4+
{% assign company = site.data.companies[sponsor] %}
5+
<li>
6+
<img src="{{ company.image }}" alt="{{ company.name }}"/>
7+
</li>
8+
{% endfor %}
9+
</ul>
10+
</section>

‎_layouts/default.html

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,11 @@
55
<body>
66
{% include nav.html %}
77

8-
{% include default_header.html %}
9-
10-
{% include next_meetup.html %}
11-
128
<main>
13-
<article>
14-
<header>
15-
<h1> Ruby UY </h1>
16-
<h2> Comunidad Ruby en Uruguay &#127482;&#127486; </h2>
17-
</header>
18-
19-
<section> {{ content }} </section>
20-
21-
</article>
9+
{{ content }}
2210
</main>
11+
12+
{% include footer.html %}
2313
</body>
2414

2515
</html>

‎_sass/application.scss

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@ body {
22
font-family: 'Syncopate', sans-serif;
33
}
44

5-
main {
6-
padding: 10em;
7-
font-family: 'Open Sans', sans-serif;
8-
font-size: 10pt;
9-
}
10-
115
h1 {
126
font-size: 24pt;
137
margin-bottom: 0;
@@ -51,15 +45,3 @@ iframe {
5145
top: 50%;
5246
transform: translateY(-50%);
5347
}
54-
55-
@media (max-width: 350px) {
56-
main {
57-
padding: 1em;
58-
}
59-
}
60-
61-
@media (min-width: 350px) and (max-width: 550px) {
62-
main {
63-
padding: 3em;
64-
}
65-
}

‎_sass/footer.scss

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
footer {
2+
border-top: 2px solid black;
3+
padding: 6rem 3rem;
4+
background-color: #F6EEEC;
5+
display: flex;
6+
7+
@media (max-width: 768px) {
8+
padding: 2rem 1rem;
9+
flex-direction: column;
10+
align-items: center;
11+
}
12+
13+
a, a:active, a:hover, a:focus {
14+
color: #2E2E2E;
15+
text-decoration: none;
16+
}
17+
18+
div {
19+
&:first-child {
20+
h1 {
21+
font-size: 2rem;
22+
font-weight: bold;
23+
margin-bottom: 1rem;
24+
25+
@media (max-width: 768px) {
26+
font-size: 1rem;
27+
}
28+
}
29+
30+
ul {
31+
display: flex;
32+
33+
li {
34+
margin-right: 1rem;
35+
36+
svg {
37+
@media (max-width: 768px) {
38+
transform: scale(0.9)
39+
}
40+
}
41+
}
42+
}
43+
}
44+
45+
&:nth-child(2) {
46+
margin-left: 5rem;
47+
48+
@media (max-width: 768px) {
49+
margin-left: 0;
50+
}
51+
52+
img {
53+
@media (max-width: 768px) {
54+
transform: scale(0.8);
55+
}
56+
}
57+
}
58+
}
59+
}

‎_sass/header.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ body {
7373

7474
&:first-child {
7575
border-left-width: 0;
76+
background-color: #F6EEEC;
7677

7778
h2 {
7879
color: #3967D1;

‎_sass/meetups.scss

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
#meetups {
2+
background-color: #F6EEEC;
3+
4+
header {
5+
background-color: #3967D1;
6+
border: 0 solid black;
7+
border-width: 2px 0;
8+
color: white;
9+
padding: 2rem 3.5rem;
10+
11+
@media (max-width: 425px) {
12+
padding: 2rem 1.5rem;
13+
display: flex;
14+
justify-content: center;
15+
align-items: center;
16+
}
17+
18+
h1 {
19+
color: #FFC24D;
20+
font-size: 2.5rem;
21+
font-weight: bold;
22+
margin-bottom: 0.8rem;
23+
24+
@media (max-width: 425px) {
25+
font-size: 1.2rem;
26+
margin-bottom: 0;
27+
}
28+
}
29+
30+
p {
31+
@media (max-width: 425px) {
32+
display: none;
33+
}
34+
}
35+
}
36+
37+
ul {
38+
li {
39+
align-items: center;
40+
display: flex;
41+
padding: 1.5rem 8rem;
42+
43+
@media (max-width: 425px) {
44+
padding: 1.5rem 1rem;
45+
}
46+
47+
&:not(:last-child) {
48+
border-bottom: 1px solid #3967D1;
49+
}
50+
51+
a {
52+
display: flex;
53+
font-weight: bold;
54+
justify-content: space-between;
55+
width: 100%;
56+
57+
@media (max-width: 425px) {
58+
align-items: center;
59+
flex-direction: column;
60+
}
61+
62+
63+
&, &:active, &:visited, &:focus, &:hover {
64+
color: #3967D1;
65+
text-decoration: none;
66+
}
67+
68+
.meetup-event__date {
69+
align-items: center;
70+
display: flex;
71+
}
72+
73+
.meetup-event__company {
74+
align-items: center;
75+
display: flex;
76+
77+
@media (max-width: 425px) {
78+
margin-top: 1rem;
79+
}
80+
}
81+
82+
img {
83+
margin-left: 0.5rem;
84+
/* Hacky way to get the color from the white SVG. Tool used: https://angel-rs.github.io/css-color-filter-generator/ */
85+
filter: brightness(0) saturate(100%) invert(37%) sepia(91%) saturate(575%) hue-rotate(186deg) brightness(90%) contrast(95%);
86+
}
87+
}
88+
}
89+
}
90+
}

0 commit comments

Comments
 (0)