Skip to content

Commit

Permalink
Merge pull request #44 from Brainhack-Donostia/BHD2023
Browse files Browse the repository at this point in the history
Bhd2023
  • Loading branch information
marco7877 authored Aug 22, 2023
2 parents 7b0b7c6 + b937eff commit e343130
Show file tree
Hide file tree
Showing 20 changed files with 108 additions and 81 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

/_site/**
87 changes: 54 additions & 33 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,56 +3,75 @@ Agency Jekyll theme

Agency theme based on [Agency bootstrap theme ](https://startbootstrap.com/template-overviews/agency/)

The resulting jekyll theme uses Ruby >=2.5, GCC and Make. For more information on specific OS setting see: https://jekyllrb.com/docs/installation/
The resulting jekyll theme uses Ruby >=2.5, GCC and Make.

For more information on specific OS setting see: https://jekyllrb.com/docs/installation/


# How to install


- copy the brainhack repository

$ git clone https://github.com/Brainhack-Donostia/brainhack-donostia.github.io.git

-move to brainhack repository

$ cd brainhack-donostia.github.io.git

$ bundle install

-To check local changes or to display on a local host

$ bundle exec jekyll serve --trace

or

$ jekyll serve

#Git branches

Commit and push changes on BHD2023 or a personal sub-branch from there. When you are sure about your changes, push them to BHD2023 and open a pull request.
NOTE: remember to run pull before working locally
-Changing to BHD2023 branch

**NOTE: remember to run pull before working locally**

-Changing to BHD2023 branch
$ git checkout BHD2023
- Creating your subranch from BHD2023

- Creating your subranch from BHD2023
$ git checkout -b YourAmazingSubbranch
- Checking the status of the current branch

- Checking the status of the current branch
$ git status
- Adding untracked changes
$ git add filename1 filename2
or to add all

- Adding untracked changes
$ git add filename1 filename2
or to add all
$ git add .
- Commit changes

- Commit changes
$ git commit -m "Your message explaining your commited work"
- Push changes from locall to repo

- Push changes from locall to repo
$ git push -u origin BHD2023
- Merging with master
$ git checkout master
$ git merge BHD2023
- You could also push your commit to a specific branch intead of merging and without checkout master

- Merging with master
$ git checkout master
$ git merge BHD2023

- You could also push your commit to a specific branch intead of merging and without checkout master
$ git push -u origin master

## How to use

To edit the format of the page, you will find everything inside 'your/system/path/brainhack-donostia.github.io/_/_includes'

Within such folder you will find several html named after the section they stand for. As an example,to change the 'about us' section you should edit the services.html. There if you want to have different paragrafs, you should have a class section for each paragraph:
'<h3 class="section-subheading textmuted">
Your amazing first paragraph. </h3>
<h3 class="section-subheading textmuted">
Your amazing second paragraph. </h3>'
Within such folder you will find several html named after the section they stand for.
As an example,to change the 'about us' section you should edit the services.html. There if you want to have different paragrafs, you should have a class section for each paragraph:

'<h3 class="section-subheading textmuted">
Your amazing first paragraph. </h3>
<h3 class="section-subheading textmuted">
Your amazing second paragraph. </h3>'


###Portfolio
Expand All @@ -69,28 +88,30 @@ Images are in /img/portfolio'
Images are in 'your/system/path/brainhack-donostia.github.io/img'

Team subfolder contains the pictures of BHD 2023 team. Images are 620px*820px
Portfolio subfolder contains the pictures to be displayed for the calendar and the talks section:

Portfolio subfolder contains the pictures to be displayed for the calendar and the talks section:

-thumbnails: '400px*289px'
-Displayed image when clicked: 600px*450px
About subfolder contains the images to be displayed on BHD timeline. Images are 200px*200px
Logos subfolder contains the images for the header, projects,register, and the sponsors section :
-About subfolder contains the images to be displayed on BHD timeline. Images are 200px*200px
-Logos subfolder contains the images for the header, projects,register, and the sponsors section :
-header background: 1900px*1250px
-contact and register: 1469px*725px
-sponsors: 295px*86px

###Team

Team members and info are in '_config.yml'You can add aditional information as twitter, facebook, stack-overflow and linkedin:
- name: Grogru
pic: babyyoda.png
position: Cuteness leader
social:
- title: twitter
url: #
- title: facebook
url: #
- title: stack-overflow
url: #
- name: Grogru
pic: babyyoda.png
position: Cuteness leader
social:
- title: twitter
url: #
- title: facebook
url: #
- title: stack-overflow
url: #

# To do
- Add posts for each one of the speakers and one for the calendar
Expand Down
46 changes: 30 additions & 16 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,65 +2,79 @@ url: https://brainhack-donostia.github.io
baseurl:

# Site settings
title: Brain Hack Donosti 2023
title: Brain Hack Donostia 2023
email: bhg-donostia@bcbl.eu
description: "Coming soon!"
description: "Site for Brainhack Donostia 2023"


# Team names, titles and social links
people:
- name: Ihintza Malharin
pic: ihintzaM
position: Brainhack Donosti organizing chair

position: Brainhack Donosti organizing chair
social:
-title: #
url: https://www.bcbl.eu/en/ihintza-malharin
- name: Marco Flores-Coronado
pic: marcoFC
position: Brainhack Donosti organizing chair

social:
url: https://www.bcbl.eu/en/marco-a-flores-coronado
- name: Chiara Luna Rivolta
pic: chiaraLR
position: Brainhack Donosti treasury

social:
url: https://www.bcbl.eu/en/chiara-luna-rivolta
- name: Anique Schüller
pic: aniqueS
position: Brainhack Donosti treasury

social:
url: https://www.bcbl.eu/en/anique-schuller
- name: Jiaqi (Mo) Mao
pic: jiaqiM
position: Brainhack Donosti treasury

social:
url: https://www.bcbl.eu/en/jiaqi-mo-mao
- name: Inés Chavarría
pic: inesC
position: Brainhack Donosti projects

social:
url: https://www.bcbl.eu/en/ines-chavarria
- name: Cristina Comella
pic: cristinaC
position: Brainhack Donosti projects

social:
url: https://www.bcbl.eu/en/node/7402
- name: Yi-Ting (Silvia) Yang
pic: yi-tingY
position: Brainhack Donosti projects

social:
url: https://www.bcbl.eu/en/yi-ting-silvia-yang
- name: Ana Bautista
pic: anaB
position: Brainhack Donosti design

social:
url: https://www.bcbl.eu/en/leandro-lecca
- name: Leandro Lecca
pic: leandroL
position: Brainhack Donosti IT

social:
url: https://www.bcbl.eu/en/leandro-lecca
- name: Ryland Miller
pic: rylandM
position: Brainhack Donosti IT

social:
url: https://www.bcbl.eu/en/node/7471
- name: Cesar Caballero-Gaudes
pic: CesarCG
position: Brainhack Donosti talks

social:
url: https://www.bcbl.eu/en/conocenos/equipo/cesar-caballero-gaudes
- name: Garikoitz Lerma-Usabiaga
pic: garikoitzLU
position: Brainhack Donosti talks

social:
url: https://www.bcbl.eu/en/conocenos/equipo/garikoitz-lerma-usabiaga

# Social networks usernames (many more available: google-plus, flickr, dribbble, pinterest, instagram, tumblr, linkedin, etc.)
social:
Expand Down
4 changes: 2 additions & 2 deletions _data/template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ color:

# Font Families
font:
primary: 'Montserrat, "Helvetica Neue",Helvetica,Arial,sans-serif'
secondary: '"Droid Serif", "Helvetica Neue", Helvetica,Arial,sans-serif'
primary: 'Helvetica, "Helvetica Neue",Helvetica,Helvetica,Helvetica'
secondary: 'Helvetica, "Helvetica Neue", Helvetica,Helvetica,Helvetica'
2 changes: 1 addition & 1 deletion _includes/contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h3 class="section-subheading text-muted">Do you have any project you would like
<div class="clearfix"></div>
<div class="col-lg-12 text-center">
<div id="success"></div>
<button type="submit" class="btn btn-xl">Submmit project</button>
<button type="submit" class="btn btn-xl">Submit project</button>
</div>
</div>
</form>
Expand Down
16 changes: 14 additions & 2 deletions _includes/css/agency.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@ body {
.text-muted {
color: #{{ site.data.template.color.muted }};
}
.text-yellow {
color:#ffe95e ;

}
.text-white {
color:#ffffff ;

}

.text-primary {
color: #{{ site.data.template.color.primary }};
Expand Down Expand Up @@ -64,6 +72,9 @@ h6 {
.bg-light-gray {
background-color: #000;
}
.bg-yellow {
background-color: #ffe95e;
}

.bg-darkest-gray {
background-color: #f7f7f7;
Expand Down Expand Up @@ -339,7 +350,7 @@ section h3.section-subheading {
text-transform: none;
font-family: {{ site.data.template.font.secondary }};
font-size: 16px;
font-style: italic;
font-style: helvetica;
font-weight: 400;
}

Expand Down Expand Up @@ -419,7 +430,7 @@ section h3.section-subheading {
margin: 0;
font-family: {{ site.data.template.font.secondary }};
font-size: 16px;
font-style: italic;
font-style: helvetica;
}

#portfolio * {
Expand Down Expand Up @@ -645,6 +656,7 @@ section h3.section-subheading {
.team-member h4 {
margin-top: 25px;
margin-bottom: 0;
color: #ffffff;
text-transform: none;
}

Expand Down
8 changes: 0 additions & 8 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,6 @@
{% endfor %}
</ul>
</div>
<div class="col-md-4">
<ul class="list-inline quicklinks">
<li><a href="#">Privacy Policy</a>
</li>
<li><a href="#">Terms of Use</a>
</li>
</ul>
</div>
</div>
</div>
</footer>
14 changes: 0 additions & 14 deletions _includes/modals.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,6 @@ <h2>{{ post.title }}</h2>
<hr class="star-primary">
<img src="img/portfolio/{{ post.img }}" class="img-responsive img-centered" alt="{{ post.alt }}">
<p>{{ post.description }}</p>
<ul class="list-inline item-details">
<li>Client:
<strong><a href="http://startbootstrap.com">{{ post.client }}</a>
</strong>
</li>
<li>Date:
<strong><a href="http://startbootstrap.com">{{ post.project-date }}</a>
</strong>
</li>
<li>Service:
<strong><a href="http://startbootstrap.com">{{ post.category }}</a>
</strong>
</li>
</ul>
<button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion _includes/portfolio_grid.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="section-heading">Program at a glance</h2>
<h2 class="section-heading text-yellow">Program at a glance</h2>
<h3 class="section-subheading text-muted"> </h3>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions _includes/team.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="section-heading">Organizing Team</h2>
<h3 class="section-subheading text-muted">Brainhack Donosti 2023.</h3>
<h2 class="section-heading text-white">Organizing Team</h2>
<h3 class="section-subheading text-yellow">Brainhack Donosti 2023.</h3>
</div>
</div>
<div class="row">
Expand All @@ -13,7 +13,7 @@ <h3 class="section-subheading text-muted">Brainhack Donosti 2023.</h3>
<div class="team-member">
<img src="img/team/{{ member.pic }}.jpg" class="img-responsive img-circle" alt="">
<h4>{{ member.name }}</h4>
<p class="text-muted">{{ member.position }}</p>
<p class="text-yellow">{{ member.position }}</p>
<ul class="list-inline social-buttons">
{% for network in member.social %}
<li>
Expand All @@ -30,7 +30,7 @@ <h4>{{ member.name }}</h4>
</div>
<div class="row">
<div class="col-lg-8 col-lg-offset-2 text-center">
<p class="large text-muted">Feel free to contact us!.</p>
<p class="large text-yellow">Feel free to contact us!.</p>
</div>
</div>
</div>
Expand Down
Binary file added img/portfolio/David-thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/portfolio/DavidSpeaker.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/portfolio/MerelSpeaker.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/portfolio/OscarSpeaker.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/portfolio/StefanoSpeaker.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/portfolio/Workshop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/portfolio/merel-thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/portfolio/oscar-thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/portfolio/stefano-thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/portfolio/workshop-thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e343130

Please sign in to comment.