Skip to content

Commit 2eb3606

Browse files
Merge remote-tracking branch 'prebid/master'
2 parents 28b4a08 + 9c025d3 commit 2eb3606

484 files changed

Lines changed: 14804 additions & 3634 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ Gemfile.lock
99
.jekyll-metadata
1010
*ads.txt.bkp*
1111
.sass-cache
12+
13+
# Files generated by `npm install`
14+
node_modules/

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
source 'https://rubygems.org'
2-
gem 'github-pages', '>= 30'
2+
gem 'github-pages', '>= 30'

README.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Please see the sections below for more information.
1414

1515
## Contributing
1616

17-
Thanks in advance for your contribution! Contributors are listed in the **Thanks** section below.
17+
Thanks in advance for your contribution!
1818

1919
For smaller changes, such as fixing a typo or adding a new section to an existing page, submit a pull request.
2020

@@ -33,7 +33,7 @@ All docs are under the license shown in the `LICENSE` file in this directory.
3333

3434
## Prerequisites
3535

36-
The site uses [Jekyll](https://jekyllrb.com/), which is written in the [Ruby](https://www.ruby-lang.org/en/) language.
36+
The site is hosted on GitHub pages, and uses [Jekyll](https://jekyllrb.com/) to generate the HTML. Jekyll is written in the [Ruby](https://www.ruby-lang.org/en/) language.
3737

3838
1. follow the instructions at https://jekyllrb.com/docs/installation/ for your OS
3939
1. gem install github-pages
@@ -42,7 +42,7 @@ The site uses [Jekyll](https://jekyllrb.com/), which is written in the [Ruby](ht
4242
For CSS, the site uses Laravel Mix to build CSS from Sass (scss-flavored) source files. Under the hood Laravel Mix uses Webpack.
4343

4444
1. follow the instructions at https://nodejs.dev to install Node.js for your OS
45-
1. `npm install` to install packages for building assets
45+
1. `npm ci` to install packages for building assets
4646
1. build assets as described below
4747

4848
<a name="running-jekyll-locally" />
@@ -54,19 +54,20 @@ Before submitting a pull request, you should run the site locally to make sure y
5454
To get started editing the site and seeing your changes, clone this repo and enter the following commands in your terminal:
5555

5656
- `cd path/to/prebid.github.io`
57+
- `export JEKYLL_ENV=production`
5758
- `bundle exec jekyll serve`
5859

5960
You should see output that looks something like this:
6061

6162
```
62-
Configuration file: /Users/rloveland/Dropbox/Code/prebid.github.io/_config.yml
63-
Source: /Users/rloveland/Dropbox/Code/prebid.github.io
64-
Destination: /Users/rloveland/Dropbox/Code/prebid.github.io/_site
63+
Configuration file: /Users/me/git/prebid.github.io/_config.yml
64+
Source: /Users/me/git/prebid.github.io
65+
Destination: /Users/me/git/prebid.github.io/_site
6566
Incremental build: disabled. Enable with --incremental
6667
Generating...
6768
done in 13.596 seconds.
68-
Auto-regeneration: enabled for '/Users/rloveland/Dropbox/Code/prebid.github.io'
69-
Configuration file: /Users/rloveland/Dropbox/Code/prebid.github.io/_config.yml
69+
Auto-regeneration: enabled for '/Users/me/git/prebid.github.io'
70+
Configuration file: /Users/me/git/prebid.github.io/_config.yml
7071
Server address: http://127.0.0.1:8080/
7172
Server running... press ctrl-c to stop.
7273
...

0 commit comments

Comments
 (0)