Skip to content

Commit 4ec07a6

Browse files
committed
Updated style for README
1 parent dcc2b21 commit 4ec07a6

File tree

1 file changed

+53
-45
lines changed

1 file changed

+53
-45
lines changed

README.md

Lines changed: 53 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,59 +7,73 @@ 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+
'git clone https://github.com/Brainhack-Donostia/brainhack-donostia.github.io.git'
1617

17-
-move to brainhack repository
18+
- Move to brainhack repository
1819

19-
$ cd brainhack-donostia.github.io.git
20+
'cd brainhack-donostia.github.io.git'
2021

21-
$ bundle install
22+
- Install required gems
2223

23-
-To check local changes or to display on a local host
24+
'bundle install'
2425

25-
$ bundle exec jekyll serve --trace
26+
- To check local changes or to display on a local host
27+
28+
'bundle exec jekyll serve --trace'
2629

2730
or
2831

29-
$ jekyll serve
32+
'jekyll serve'
3033

31-
#Git branches
34+
# Git branches
3235

3336
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.
3437

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

37-
-Changing to BHD2023 branch
38-
$ git checkout BHD2023
40+
- Changing to BHD2023 branch
41+
42+
'git checkout BHD2023'
43+
44+
- Creating your sub-branch from BHD2023
3945

40-
- Creating your subranch from BHD2023
41-
$ git checkout -b YourAmazingSubbranch
46+
'git checkout -b YourAmazingSubbranch'
4247

4348
- Checking the status of the current branch
44-
$ git status
4549

46-
- Adding untracked changes
47-
$ git add filename1 filename2
48-
or to add all
49-
$ git add .
50+
'git status'
51+
52+
- Adding untracked changes
53+
54+
'git add filename1'
55+
56+
or to add all (not recommended)
57+
58+
'git add .'
5059

51-
- Commit changes
52-
$ git commit -m "Your message explaining your commited work"
60+
- Commit changes
61+
62+
'git commit -m "Your message explaining your commited work"'
63+
64+
- Push changes from locall to repo
65+
66+
'git push -u origin BHD2023'
5367

54-
- Push changes from locall to repo
55-
$ git push -u origin BHD2023
68+
- Merging with master (only if you know what you are doing)
69+
70+
'git checkout master'
5671

57-
- Merging with master
58-
$ git checkout master
59-
$ git merge BHD2023
72+
'git merge BHD2023'
6073

61-
- You could also push your commit to a specific branch intead of merging and without checkout master
62-
$ git push -u origin master
74+
- You could also push your commit to a specific branch intead of merging and without checkout master. Then you merge from the website GUI
75+
76+
'git push -u origin BHD2025'
6377

6478
## How to use
6579

@@ -74,7 +88,7 @@ Within such folder you will find several html named after the section they stand
7488
Your amazing second paragraph. </h3>'
7589

7690

77-
###Portfolio
91+
### Portfolio
7892

7993
Portfolio projects are in '/_posts'
8094

@@ -83,26 +97,26 @@ yyyy-mm-dd-project-n.markdown , i.e., 2023-01-01-project-1.markdown
8397

8498
Images are in /img/portfolio'
8599

86-
###Images
100+
### Images
87101

88102
Images are in 'your/system/path/brainhack-donostia.github.io/img'
89103

90104
Team subfolder contains the pictures of BHD 2023 team. Images are 620px*820px
91105

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

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
108+
- thumbnails: '400px*289px'
109+
- Displayed image when clicked: 600px*450px
110+
- About subfolder contains the images to be displayed on BHD timeline. Images are 200px*200px
111+
- Logos subfolder contains the images for the header, projects,register, and the sponsors section :
112+
- header background: 1900px*1250px
113+
- contact and register: 1469px*725px
114+
- sponsors: 295px*86px
101115

102-
###Team
116+
### Team
103117

104118
Team members and info are in '_config.yml'You can add aditional information as twitter, facebook, stack-overflow and linkedin:
105-
- name: Grogru
119+
'- name: Grogru
106120
pic: babyyoda.png
107121
position: Cuteness leader
108122
social:
@@ -111,13 +125,7 @@ Team members and info are in '_config.yml'You can add aditional information as t
111125
- title: facebook
112126
url: #
113127
- title: stack-overflow
114-
url: #
115-
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 )
128+
url: #'
121129

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

0 commit comments

Comments
 (0)