Skip to content

Fixing logo and freeCodeCamp case #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 8, 2017
Merged

Fixing logo and freeCodeCamp case #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b30dd94
added img folder and fccBA logo
luchosr Sep 5, 2017
069d699
modified freeCodeCamp camel case in footer.pug and meetups.pug
luchosr Sep 5, 2017
41dd271
Merge branch 'new-homepage-design' into fixing-logo-and-freeCodeCamp-…
arielger Sep 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/css/home.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file added dist/javascript/index.js/index.js
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html><head><title>freeCodeCampBA</title><link href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css" rel="stylesheet" type="text/css"><link href="https://cdnjs.cloudflare.com/ajax/libs/flexboxgrid/6.3.1/flexboxgrid.min.css" rel="stylesheet" type="text/css"><link href="https://fonts.googleapis.com/css?family=Karla:400,700" rel="stylesheet" type="text/css"><link href="./dist/css/home.css" rel="stylesheet"></head><body class="homepage"><header class="main-header"><div class="container main-header-container"><div class="logo"><img class="logo-image" src="" alt=""><h1 class="logo-text"><span class="title">freeCodeCamp</span><br><span class="subtitle">Buenos Aires</span></h1></div><nav class="main-navigation"><ul class="main-navigation-list"><li class="main-navigation-item"><a href="#home">Home</a></li><li class="main-navigation-item"><a href="#sobre-nosotros">Sobre nosotros</a></li><li class="main-navigation-item"><a href="#proximos-encuentros">Proximos encuentros</a></li></ul></nav></div></header><section class="hero"><div class="container"><h2 class="hero-title">Somos la comunidad de<strong> freeCodeCamp</strong> en<strong> Buenos Aires</strong></h2><h4 class="hero-description">Aprendemos haciendo, enseñando y compartiendo lo que sabemos.</h4><div class="video-launcher"><button class="video-launcher-btn">Mira nuestro video</button></div></div><div class="diagonal-divider"></div></section><section class="about-us"><div class="container"><div class="copy row"><div class="col-xs-12"><h2 class="section-title">Sobre nosotros</h2></div><div class="section-description col-xs-6 col-xs-offset-3"><p>Somos una comunidad de aprendizaje sobre desarrollo y tecnologías web.</p><p>Promovemos una forma de aprendizaje autodidacta, experimental y colaborativa.</p><p>Vas a tu propio ritmo, en un ambiente motivador y totalmente distendido.</p><p>Creemos que la mejor forma de aprender a programar es... ¡programando!</p><p>Utilizamos la plataforma de<strong><a href="https://www.freecodecamp.org/" target="_blank"> freeCodeCamp</a></strong> como currícula de desarrollo Full Stack JavaScript (<strong><a href="https://www.freecodecamp.org/map" target="_blank">ver currícula</a></strong>).</p><p>Si querés saber más, te recomendamos leer nuestra<strong><a href="https://github.com/freeCodeCampBA/quick-start#computer-freecodecamp-ba-quick-start-rocket" target="_blank"> guía rápida para empezar</a></strong>.</p></div></div><div class="photo-slider"><ul class="slider"><li><div class="image-container"><img src="" alt=""><div class="image-copy"><div class="image-title">Meetup Febrero 2016</div><div class="image-subtitle">Area Tres</div></div></div></li><li><div class="image-container"><img src="" alt=""><div class="image-copy"><div class="image-title">Meetup Febrero 2016</div><div class="image-subtitle">Area Tres</div></div></div></li><li><div class="image-container"><img src="" alt=""><div class="image-copy"><div class="image-title">Meetup Febrero 2016</div><div class="image-subtitle">Area Tres</div></div></div></li></ul></div></div></section><section class="meetups"><div class="container"><h2>Proximos encuentros</h2><article class="meetup-card"><div class="content"><h3 class="meetup-title">FreeCodeCamp BA S02E01</h3><div class="meetup-info"><span class="info-label">Fecha:</span><span class="info-text">Domingo 12/17</span><span class="info-label">Horario:</span><span class="info-text">16:00 a 20:00</span><span class="info-label">Lugar:</span><span class="info-text">Area Tres (El Salvador 5000)</span></div><button>Inscribite</button></div><div class="image"><img src="" alt=""></div></article><article class="meetup-card"><div class="content"><h3 class="meetup-title">FreeCodeCamp BA S02E01</h3><div class="meetup-info"><span class="info-label">Fecha:</span><span class="info-text">Domingo 12/17</span><span class="info-label">Horario:</span><span class="info-text">16:00 a 20:00</span><span class="info-label">Lugar:</span><span class="info-text">Area Tres (El Salvador 5000)</span></div><button>Inscribite</button></div><div class="image"><img src="" alt=""></div></article></div></section><section class="supporters"><div class="container"><h2>Supporters</h2><p>Estas son algunas de las comunidades y empresas que nos apoyan para seguir creciendo.</p><div class="supporters-list"><img src="" alt=""><img src="" alt=""><img src="" alt=""><img src="" alt=""><img src="" alt=""><img src="" alt=""><img src="" alt=""><img src="" alt=""></div></div></section><script src="./dist/js/index.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.2.1/owl.carousel.min.js"></script></body></html>
<!DOCTYPE html><html><head><title>freeCodeCampBA</title><link href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css" rel="stylesheet" type="text/css"><link href="https://cdnjs.cloudflare.com/ajax/libs/flexboxgrid/6.3.1/flexboxgrid.min.css" rel="stylesheet" type="text/css"><link href="https://fonts.googleapis.com/css?family=Karla:400,700" rel="stylesheet" type="text/css"><link href="./dist/css/home.css" rel="stylesheet"></head><body class="homepage"><header class="main-header"><div class="container main-header-container"><div class="logo"><img class="logo-image" src="src/img/logoSqueare.jpg" alt="freeCodeCamp Buenos Aires logo"><h1 class="logo-text"><span class="title">freeCodeCamp</span><br><span class="subtitle">Buenos Aires</span></h1></div><nav class="main-navigation"><ul class="main-navigation-list"><li class="main-navigation-item"><a href="#home">Home</a></li><li class="main-navigation-item"><a href="#sobre-nosotros">Sobre nosotros</a></li><li class="main-navigation-item"><a href="#proximos-encuentros">Proximos encuentros</a></li></ul></nav></div></header><section class="hero"><div class="container"><h2 class="hero-title">Somos la comunidad de<strong> freeCodeCamp</strong> en<strong> Buenos Aires</strong></h2><h4 class="hero-description">Aprendemos haciendo, enseñando y compartiendo lo que sabemos.</h4><div class="video-launcher"><button class="video-launcher-btn">Mira nuestro video</button></div></div><div class="diagonal-divider"></div></section><section class="about-us"><div class="container"><div class="copy row"><div class="col-xs-12"><h2 class="section-title">Sobre nosotros</h2></div><div class="section-description col-xs-6 col-xs-offset-3"><p>Somos un grupo de personas interesadas en el aprendizaje de tecnologías relacionadas con el desarrollo web.</p><p>Nos encontramos los domingos (16:00 a 20:00) para aprender a programar siguiendo la curricula propuesta por el sitio de e-learning<strong><a href="https://www.freecodecamp.org/" target="_blank"> freeCodeCamp</a></strong>.</p><p>En los encuentros no hay profesores ni alumnos, sino que todos nos ayudamos entre si para resolver los distintos problemas. El aprendizaje se basa en tecnologias web como HTML, CSS, Javascript, entre otras.</p><p>Si queres saber más sobre nosotros, podes revisar nuestra<strong><a href="https://github.com/FreeCodeCampBA/quick-start#computer-freecodecamp-ba-quick-start-rocket" target="_blank"> guia para quienes ingresan al grupo</a></strong> 💪.</p></div></div><div class="photo-slider"><ul class="slider"><li><div class="image-container"><img src="" alt=""><div class="image-copy"><div class="image-title">Meetup Febrero 2016</div><div class="image-subtitle">Area Tres</div></div></div></li><li><div class="image-container"><img src="" alt=""><div class="image-copy"><div class="image-title">Meetup Febrero 2016</div><div class="image-subtitle">Area Tres</div></div></div></li><li><div class="image-container"><img src="" alt=""><div class="image-copy"><div class="image-title">Meetup Febrero 2016</div><div class="image-subtitle">Area Tres</div></div></div></li></ul></div></div></section><section class="meetups"><div class="container"><h2>Proximos encuentros</h2><article class="meetup-card"><div class="content"><h3 class="meetup-title">FreeCodeCamp BA S02E01</h3><div class="meetup-info"><span class="info-label">Fecha:</span><span class="info-text">Domingo 12/17</span><span class="info-label">Horario:</span><span class="info-text">16:00 a 20:00</span><span class="info-label">Lugar:</span><span class="info-text">Area Tres (El Salvador 5000)</span></div><button>Inscribite</button></div><div class="image"><img src="" alt=""></div></article><article class="meetup-card"><div class="content"><h3 class="meetup-title">FreeCodeCamp BA S02E01</h3><div class="meetup-info"><span class="info-label">Fecha:</span><span class="info-text">Domingo 12/17</span><span class="info-label">Horario:</span><span class="info-text">16:00 a 20:00</span><span class="info-label">Lugar:</span><span class="info-text">Area Tres (El Salvador 5000)</span></div><button>Inscribite</button></div><div class="image"><img src="" alt=""></div></article></div></section><section class="supporters"><div class="container"><h2>Supporters</h2><p>Estas son algunas de las comunidades y empresas que nos apoyan para seguir creciendo.</p><div class="supporters-list"><img src="" alt=""><img src="" alt=""><img src="" alt=""><img src="" alt=""><img src="" alt=""><img src="" alt=""><img src="" alt=""><img src="" alt=""></div></div></section><script src="./dist/js/index.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.2.1/owl.carousel.min.js"></script></body></html>
Binary file added src/img/logoSqueare.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion src/styles/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@

.logo {
display: inline-flex;
flex-direction: column;
flex-direction: row;

.logo-image {
margin-right: 10px;
width: 36px;
height: 36px;
border-radius: 10px;
}

.logo-text {
Expand Down
2 changes: 1 addition & 1 deletion src/templates/includes/footer.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ footer.main-footer
.information
h4
img(src="", alt="")
span.title FreeCodeCamp
span.title freeCodeCamp
span.subtitle Buenos Aires
ul.social-links
li
Expand Down
2 changes: 1 addition & 1 deletion src/templates/includes/header.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
header.main-header
.container.main-header-container
.logo
img.logo-image(src="", alt="")
img.logo-image(src="src/img/logoSqueare.jpg", alt="freeCodeCamp Buenos Aires logo")
h1.logo-text
span.title freeCodeCamp
br
Expand Down
4 changes: 2 additions & 2 deletions src/templates/includes/meetups.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ section.meetups
h2 Proximos encuentros
article.meetup-card
.content
h3.meetup-title FreeCodeCamp BA S02E01
h3.meetup-title freeCodeCamp BA S02E01
.meetup-info
span.info-label Fecha:
span.info-text Domingo 12/17
Expand All @@ -16,7 +16,7 @@ section.meetups
img(src="", alt="")
article.meetup-card
.content
h3.meetup-title FreeCodeCamp BA S02E01
h3.meetup-title freeCodeCamp BA S02E01
.meetup-info
span.info-label Fecha:
span.info-text Domingo 12/17
Expand Down