Skip to content

Commit 68693cb

Browse files
authored
Merge pull request #145 from Brainhack-Donostia/master
melissas first PR
2 parents 4254238 + 3fa4f48 commit 68693cb

File tree

5 files changed

+186
-56
lines changed

5 files changed

+186
-56
lines changed

README.md

Lines changed: 98 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -7,59 +7,115 @@ The resulting jekyll theme uses Ruby >=2.5, GCC and Make.
77

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

10+
*IMPORTANT NOTE!* MacOS have a preinstalled ruby version that is not gonna work. Follow the official jekyll documentation to install other one outside main system. Finally, if you can't exec the server try runnin bundle update so that it uses the gems you already have *DO NOT PUSH GEM CHANGES TO MASTER!*
1011

1112
# How to install
1213

13-
- copy the brainhack repository
14+
### Copy the brainhack repository
1415

15-
$ git clone https://github.com/Brainhack-Donostia/brainhack-donostia.github.io.git
16+
*Make sure you have your git credentials in order!* If you are working on a fresh git install run:
1617

17-
-move to brainhack repository
1818

19-
$ cd brainhack-donostia.github.io.git
19+
git config --global user.name "yourGithubName"
20+
git config --global user.email "[email protected]"
2021

21-
$ bundle install
22+
I definetly suggest you working with ssh keys so that you dont need to prompt any password everytime you push. For that check [ssh-key linux] (https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent?platform=linux) or [ss-key mac](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent?platform=mac).
2223

23-
-To check local changes or to display on a local host
24+
To clone the repo with ssh key run
25+
26+
git clone [email protected]:Brainhack-Donostia/brainhack-donostia.github.io.git
27+
28+
To clone the repo with HTTPS (asking for password for pushing)
29+
30+
git clone https://github.com/Brainhack-Donostia/brainhack-donostia.github.io.git
31+
32+
33+
### Move to brainhack repository
34+
35+
36+
cd brainhack-donostia.github.io.git
37+
38+
39+
### Install required gems
40+
41+
42+
bundle install
43+
44+
45+
### To check local changes or to display on a local host
46+
47+
48+
bundle exec jekyll serve --trace
2449

25-
$ bundle exec jekyll serve --trace
2650

2751
or
2852

29-
$ jekyll serve
3053

31-
#Git branches
54+
jekyll serve
3255

33-
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.
56+
57+
# Git branches
58+
59+
Commit and push changes on BHD2025 or a personal sub-branch from there. When you are sure about your changes, push them to BHD2025 and open a pull request.
3460

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

37-
-Changing to BHD2023 branch
38-
$ git checkout BHD2023
63+
### Changing to BHD2025 branch
64+
65+
66+
git checkout BHD2025
67+
68+
69+
### Creating your sub-branch from BHD2025
70+
71+
72+
git checkout -b YourAmazingSubbranch
73+
3974

40-
- Creating your subranch from BHD2023
41-
$ git checkout -b YourAmazingSubbranch
75+
### Checking the status of the current branch
4276

43-
- Checking the status of the current branch
44-
$ git status
4577

46-
- Adding untracked changes
47-
$ git add filename1 filename2
48-
or to add all
49-
$ git add .
78+
git status
5079

51-
- Commit changes
52-
$ git commit -m "Your message explaining your commited work"
5380

54-
- Push changes from locall to repo
55-
$ git push -u origin BHD2023
81+
### Adding untracked changes
5682

57-
- Merging with master
58-
$ git checkout master
59-
$ git merge BHD2023
6083

61-
- You could also push your commit to a specific branch intead of merging and without checkout master
62-
$ git push -u origin master
84+
git add filename1
85+
86+
87+
or to add all (not recommended)
88+
89+
90+
git add .
91+
92+
93+
### Commit changes
94+
95+
96+
git commit -m "Your message explaining your commited work"
97+
98+
99+
### Push changes from locall to repo
100+
101+
102+
git push -u origin BHD2025
103+
104+
105+
### Merging with master (only if you know what you are doing)
106+
107+
108+
git checkout master
109+
110+
111+
git merge BHD2025
112+
113+
114+
### You could also push your commit to a specific branch intead of merging and without checkout master. Then you merge from the website GUI
115+
116+
117+
git push -u origin BHD2025
118+
63119

64120
## How to use
65121

@@ -74,34 +130,35 @@ Within such folder you will find several html named after the section they stand
74130
Your amazing second paragraph. </h3>'
75131

76132

77-
###Portfolio
133+
### Portfolio
78134

79135
Portfolio projects are in '/_posts'
80136

81137
You need to create a markdown for each post. The files must be named something like this:
82-
yyyy-mm-dd-project-n.markdown , i.e., 2023-01-01-project-1.markdown
138+
yyyy-mm-dd-project-n.markdown , i.e., 2025-01-01-project-1.markdown
83139

84140
Images are in /img/portfolio'
85141

86-
###Images
142+
### Images
87143

88144
Images are in 'your/system/path/brainhack-donostia.github.io/img'
89145

90-
Team subfolder contains the pictures of BHD 2023 team. Images are 620px*820px
146+
Team subfolder contains the pictures of BHD 2025 team. Images are 620px*820px
91147

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

94-
-thumbnails: '400px*289px'
95-
-Displayed image when clicked: 600px*450px
96-
-About subfolder contains the images to be displayed on BHD timeline. Images are 200px*200px
97-
-Logos subfolder contains the images for the header, projects,register, and the sponsors section :
98-
-header background: 1900px*1250px
99-
-contact and register: 1469px*725px
100-
-sponsors: 295px*86px
150+
- thumbnails: '400px*289px'
151+
- Displayed image when clicked: 600px*450px
152+
- About subfolder contains the images to be displayed on BHD timeline. Images are 200px*200px
153+
- Logos subfolder contains the images for the header, projects,register, and the sponsors section :
154+
- header background: 1900px*1250px
155+
- contact and register: 1469px*725px
156+
- sponsors: 295px*86px
101157

102-
###Team
158+
### Team
103159

104160
Team members and info are in '_config.yml'You can add aditional information as twitter, facebook, stack-overflow and linkedin:
161+
105162
- name: Grogru
106163
pic: babyyoda.png
107164
position: Cuteness leader
@@ -113,11 +170,6 @@ Team members and info are in '_config.yml'You can add aditional information as t
113170
- title: stack-overflow
114171
url: #
115172

116-
# To do
117-
- Add posts for each one of the speakers and one for the calendar
118-
- Try to add a link to a google calendar file or similar
119-
- Change images from the timeline
120-
- Change colors for the lettering (probably on /_includes/css/agency.css )
121173

122174
=========
123175
For more details, read [documentation](http://jekyllrb.com/)

_includes/BHD.html

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<!DOCTYPE html>
2+
<html>
3+
4+
<!-- Services Section -->
5+
<section id="BHD">
6+
<div class="container">
7+
<div class="row">
8+
<div class="col-lg-12 text-center">
9+
<h1 class="section-heading">Donostia-San Sebastián, Spain </h1>
10+
11+
<hr>
12+
<h3 class="section-heading">What is Brainhack Donostia?</h3>
13+
14+
<p class="text-muted" style="font-size: 20px"> A gender-balanced board of researchers from BCBL invites you to join a three-day in-person workshop focused on project development to foster new ideas, findings and future collaborations. In addition, we will host four international keynote speakers that will share their experience on state of the art methods, good practices in science and hot topics in research nowadays. By doing so, we will continue to grow our contributions towards sharing knowledge openly and transparently across disciplines and specialties, and to the development of open-source tools. <br />
15+
Accessibility to science is an important objective for BHD and we are determined in making this year's event more inclusive and open. Following last year's organization, a real-time transcription system will be provided during all talks and tutorials in order to ensure fluid and intelligible subtitles for deaf and hard of hearing participants. This system is also a valuable aid for all those participants who are not native speakers of English. <br />
16+
BHD 2024 will award travel grants to help cover travel and registration costs for the event. Through these travel awards we want to encourage and promote the participation of junior scientists who have less access to fundings. Awards will be assigned based on statements of purposes provided by the participants themselves, which will be assessed by our committee. If you would like to be considered for one of these travel grants, feel free to click on the following button and to fill out the form. You will be asked to write a short statement of purpose on why you believe this grant could help you attend BHD 2024. <br />
17+
The deadline for the statement of purpose submission is the 8th of November. The grants consist in refunds for travel or registration costs after the event. If you have any questions about this process, feel free to contact us at [email protected] .</p>
18+
19+
<div class="container">
20+
<div class="intro-text">
21+
<div class="intro-lead-in"></div>
22+
<div class="intro-heading"> </div>
23+
<a href="https://docs.google.com/forms/d/e/1FAIpQLSf1XKLjjoWOijNUmaY_wfUedkBsZLeGJJVhEn05VCzeJdWTbQ/viewform" class="page-scroll btn btn-xl">I want to apply for a travel grant!</a>
24+
</div>
25+
</div>
26+
<hr>
27+
28+
<h3 class="section-heading">
29+
Open Science projects in Neurosciences </h3>
30+
31+
<p class="text-muted" style="font-size: 20px"> Brainhack Donostia is not an ordinary conference but an event focused on cooperation and collaboration in Neuroscience, as well as the promotion of Open Science. Our aim is to explore the multiple applications of neuroscience from a cross-disciplinary perspective. With this goal in mind, we bring together students, researchers, users, and non-academic industry professionals to learn about and develop collaborative projects. BHD 2024 is an opportunity to learn new skills and create long-lasting collaborations with interesting people from various backgrounds with a strong interest in Open Science. <br />
32+
These projects are proposed by the attendees for the attendees, and can be in any stage of development (i.e, it can be just an idea). Any attendee can propose any number of project, but can only lead one. The presenter of the project is responsible for making sure that anyone can contribute to the project, regardless of their level of expertise and background knowledge in programming. If possible, the project leaders should try to define some 'beginners' tasks'. We firmly believe that every single one of the attendees has something valuable to contribute to any project and we can't wait to see what it will be!</p>
33+
<hr>
34+
35+
<h3 class="section-heading">
36+
<a href="https://brainhack.org/global2024/">Brainhack Global</a></h3>
37+
<p class="text-muted" style="font-size: 20px">Brainhack Donostia is part of a larger initiative that holds simultaneous events all over the world with this same goal. A cornerstone of Brainhack is the promotion of responsible research and innovation in an inclusive, open, and transparent manner. Accordingly, knowledge sharing activities and the use of open-source resources are two of the basic tenets of Brainhack. <br />
38+
Through talks, hands-on tutorials, and the development of projects, attendees actively explore and learn how to manage data acquisition using different neuroimaging techniques such as Magnetic Resonance Imaging (MRI), Magneto-/Electroencephalography (M/EEG), or Near-Infrared Spectroscopy (NIRS).</p>
39+
<hr>
40+
</div>
41+
</div>
42+
<div class="row text-center">
43+
<div class="col-md-4">
44+
<span class="fa-stack fa-4x">
45+
<i class="fa fa-circle fa-stack-2x text-primary"></i>
46+
<i class="fa fa-bullhorn fa-stack-1x fa-inverse"></i>
47+
</span>
48+
<h4 class="service-heading">Invited speakers</h4>
49+
<p class="text-muted"> </p>
50+
</div>
51+
<div class="col-md-4">
52+
<span class="fa-stack fa-4x">
53+
<i class="fa fa-circle fa-stack-2x text-primary"></i>
54+
<i class="fa fa-cogs fa-stack-1x fa-inverse"></i>
55+
</span>
56+
<h4 class="service-heading">Open source projects</h4>
57+
<p class="text-muted"> </p>
58+
</div>
59+
<div class="col-md-4">
60+
<span class="fa-stack fa-4x">
61+
<i class="fa fa-circle fa-stack-2x text-primary"></i>
62+
<i class="fa fa-globe fa-stack-1x fa-inverse"></i>
63+
</span>
64+
<h4 class="service-heading">Community building</h4>
65+
<p class="text-muted">.</p>
66+
</div>
67+
<div class="container">
68+
<div class="intro-text">
69+
<div class="intro-lead-in"></div>
70+
<div class="intro-heading"> </div>
71+
<a href="https://github.com/brainhackorg/global2024/issues/new?assignees=&labels=project&template=project-submission-template.yml" class="page-scroll btn btn-xl">I want to propose a project!</a>
72+
</div>
73+
</div>
74+
</div>
75+
</div>
76+
</section>
77+
78+
</html>

_includes/css/agency.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ body {
3131
p {
3232
font-size: 16px;
3333
line-height: 1.75;
34+
text-align: justify;
3435
}
3536

3637
p.large {

_includes/header.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
<span class="icon-bar"></span>
1010
<span class="icon-bar"></span>
1111
</button>
12-
<a class="navbar-brand page-scroll" href="#page-top">Comming soon this 2025!</a>
12+
<a class="navbar-brand page-scroll" href="#page-top">November 19-21, 2025</a>
1313
</div>
1414

1515
<!-- Collect the nav links, forms, and other content for toggling -->
1616
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
1717
<ul class="nav navbar-nav navbar-right">
1818
<li class="hidden">
19-
<a href="#page-top">Comming soon this 2025!</a>
19+
<a href="#page-top">November 19-21, 2025</a>
2020
</li>
2121
<li>
22-
<a class="page-scroll" href="#services">BHD 2024</a>
22+
<a class="page-scroll" href="#services">About BHD</a>
2323
</li>
2424
<li>
2525
<a class="page-scroll" href="#program">Program</a>
@@ -34,7 +34,7 @@
3434
<a class="page-scroll" href="#social">Social</a>
3535
</li>
3636
<li>
37-
<a class="page-scroll" href="#about">About BHD</a>
37+
<a class="page-scroll" href="#about">BHD editions</a>
3838
</li>
3939
<li>
4040
<a class="page-scroll" href="#team">Team</a>

_includes/services.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,21 @@
66
<div class="container">
77
<div class="row">
88
<div class="col-lg-12 text-center">
9-
<h1 class="section-heading">Last edition > BHD 2024 | Donostia-San Sebastián, Spain </h1>
9+
<h1 class="section-heading">Donostia-San Sebastián, Spain </h1>
1010

11-
<h3 class="section-heading" style="font-size: 20px;color:red" >Be braver on Palestine and Lebanon!</h3>
1211
<hr>
1312
<h3 class="section-heading">What is Brainhack Donostia?</h3>
1413

1514
<p class="text-muted" style="font-size: 20px"> A gender-balanced board of researchers from BCBL invites you to join a three-day in-person workshop focused on project development to foster new ideas, findings and future collaborations. In addition, we will host four international keynote speakers that will share their experience on state of the art methods, good practices in science and hot topics in research nowadays. By doing so, we will continue to grow our contributions towards sharing knowledge openly and transparently across disciplines and specialties, and to the development of open-source tools. <br />
1615
Accessibility to science is an important objective for BHD and we are determined in making this year's event more inclusive and open. Following last year's organization, a real-time transcription system will be provided during all talks and tutorials in order to ensure fluid and intelligible subtitles for deaf and hard of hearing participants. This system is also a valuable aid for all those participants who are not native speakers of English. <br />
17-
BHD 2024 will award travel grants to help cover travel and registration costs for the event. Through these travel awards we want to encourage and promote the participation of junior scientists who have less access to fundings. Awards will be assigned based on statements of purposes provided by the participants themselves, which will be assessed by our committee. If you would like to be considered for one of these travel grants, feel free to click on the following button and to fill out the form. You will be asked to write a short statement of purpose on why you believe this grant could help you attend BHD 2024. <br />
18-
The deadline for the statement of purpose submission is the 8th of November. The grants consist in refunds for travel or registration costs after the event. If you have any questions about this process, feel free to contact us at [email protected] .</p>
1916

2017
<div class="container">
2118
<div class="intro-text">
2219
<div class="intro-lead-in"></div>
2320
<div class="intro-heading"> </div>
24-
<a href="https://docs.google.com/forms/d/e/1FAIpQLSf1XKLjjoWOijNUmaY_wfUedkBsZLeGJJVhEn05VCzeJdWTbQ/viewform" class="page-scroll btn btn-xl">I want to apply for a travel grant!</a>
21+
<!--
22+
<a href="https://docs.google.com/forms/d/e/1FAIpQLSf1XKLjjoWOijNUmaY_wfUedkgBsZLeGJJVhEn05VCzeJdWTbQ/viewform" class="page-scroll btn btn-xl"disabled>I want to apply for a travel grant!</a>
23+
-->
2524
</div>
2625
</div>
2726
<hr>
@@ -69,7 +68,7 @@ <h4 class="service-heading">Community building</h4>
6968
<div class="intro-text">
7069
<div class="intro-lead-in"></div>
7170
<div class="intro-heading"> </div>
72-
<a href="https://github.com/brainhackorg/global2024/issues/new?assignees=&labels=project&template=project-submission-template.yml" class="page-scroll btn btn-xl">I want to propose a project!</a>
71+
<a href="https://github.com/brainhackorg/global2024/issues/new?assignees=&labels=project&template=project-submission-template.yml" class="page-scroll btn btn-xl" disabled>We encourage you to propose a project!</a>
7372
</div>
7473
</div>
7574
</div>

0 commit comments

Comments
 (0)