Merge upstream

.github/pull_request_template.md

@@ -0,0 +1,18 @@
+<!--
+Thanks for improving the documentation 😃
+Please give a short description and check the matching checkboxes to help us review this as quick as possible.
+-->
+
+## 🏷 Type of documentation
+<!-- Remove items that don't apply and/or select an item by changing [ ] to [x] -->
+- [ ] new bid adapter
+- [ ] update bid adapter
+- [ ] new feature
+- [ ] text edit only (wording, typos)
+- [ ] bugfix (code examples)
+- [ ] new examples
+
+## 📋 Checklist
+<!-- Remove items that don't apply and/or select an item by changing [ ] to [x] -->
+- [ ] Related pull requests in prebid.js or server are linked
+- [ ] For new adapters check [submitting your adapter docs](https://docs.prebid.org/dev-docs/bidder-adaptor.html#submitting-your-adapter)

.gitignore

@@ -9,3 +9,9 @@ Gemfile.lock
 .jekyll-metadata
 *ads.txt.bkp*
 .sass-cache
+
+# Files generated by `npm install`
+node_modules/
+/.vs/prebid.github.io/v17/.suo
+/.vs/slnx.sqlite
+/.vs

Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
-gem 'github-pages', '>= 30'
+gem 'github-pages', '>= 30'
+
+gem "webrick", "~> 1.7"

README.md

@@ -1,6 +1,6 @@
 This repository contains the source files for the Prebid.js documentation site at [Prebid.org](https://prebid.org).
 
-Please see the sections below for more information.
+Please see the sections below for more information:
 
 + [Contributing](#contributing)
 + [License](#license)
@@ -14,7 +14,7 @@ Please see the sections below for more information.
 
 ## Contributing
 
-Thanks in advance for your contribution!  Contributors are listed in the **Thanks** section below.
+Thanks in advance for your contribution!
 
 For smaller changes, such as fixing a typo or adding a new section to an existing page, submit a pull request.
 
@@ -33,7 +33,7 @@ All docs are under the license shown in the `LICENSE` file in this directory.
 
 ## Prerequisites
 
-The site uses [Jekyll](https://jekyllrb.com/), which is written in the [Ruby](https://www.ruby-lang.org/en/) language.
+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.
 
 1. follow the instructions at https://jekyllrb.com/docs/installation/ for your OS
 1. gem install github-pages
@@ -42,7 +42,7 @@ The site uses [Jekyll](https://jekyllrb.com/), which is written in the [Ruby](ht
 For CSS, the site uses Laravel Mix to build CSS from Sass (scss-flavored) source files. Under the hood Laravel Mix uses Webpack.
 
 1. follow the instructions at https://nodejs.dev to install Node.js for your OS
-1. `npm install` to install packages for building assets
+1. `npm ci` to install packages for building assets
 1. build assets as described below
 
 <a name="running-jekyll-locally" />
@@ -53,20 +53,22 @@ Before submitting a pull request, you should run the site locally to make sure y
 
 To get started editing the site and seeing your changes, clone this repo and enter the following commands in your terminal:
 
-- `cd path/to/prebid.github.io`
-- `bundle exec jekyll serve`
+```bash
+$ JEKYLL_ENV=production bundle exec jekyll serve --watch --incremental
+```
+
 
 You should see output that looks something like this:
 
 ```
-Configuration file: /Users/rloveland/Dropbox/Code/prebid.github.io/_config.yml  
-            Source: /Users/rloveland/Dropbox/Code/prebid.github.io  
-       Destination: /Users/rloveland/Dropbox/Code/prebid.github.io/_site  
+Configuration file: /Users/me/git/prebid.github.io/_config.yml  
+            Source: /Users/me/git/prebid.github.io  
+       Destination: /Users/me/git/prebid.github.io/_site  
  Incremental build: disabled. Enable with --incremental  
       Generating...   
                     done in 13.596 seconds.  
- Auto-regeneration: enabled for '/Users/rloveland/Dropbox/Code/prebid.github.io'  
-Configuration file: /Users/rloveland/Dropbox/Code/prebid.github.io/_config.yml  
+ Auto-regeneration: enabled for '/Users/me/git/prebid.github.io'  
+Configuration file: /Users/me/git/prebid.github.io/_config.yml  
     Server address: http://127.0.0.1:8080/  
   Server running... press ctrl-c to stop.  
 ...  

_assets/sass/base/_base.scss

@@ -1,3 +1,9 @@
 img {
   max-width: 100%;
 }
+
+div {
+  min-width: 0;
+}
+
+

_assets/sass/components/_pb.scss

@@ -99,6 +99,10 @@
     }
   }
 
+  .pb-code-hl-wrap {
+    width: 100%;
+  }
+
   .highlight, .pb-code-hl {
     margin-top: 20px;
     margin-bottom: 20px;

_data/partners.yml

@@ -2,33 +2,33 @@
   link: https://www.indexexchange.com/
   imgURL: /assets/images/partners/leader/IX-logo.png
   type: leader
-  
+
 - company: Magnite
   link: https://www.magnite.com/
   imgURL: /assets/images/partners/leader/Magnite_logo.png
   type: leader
-  
-- company: MediaMath 
+
+- company: MediaMath
   link: https://www.mediamath.com/
   imgURL: /assets/images/partners/leader/MediaMath-wordmark.png
   type: leader
-  
-- company: OpenX 
+
+- company: OpenX
   link: https://www.openx.com/
   imgURL: /assets/images/partners/leader/openx.png
   type: leader
-  
-- company: Pubmatic 
+
+- company: Pubmatic
   link: https://pubmatic.com/products/header-bidding/
   imgURL: /assets/images/partners/leader/pubmatic.png
   type: leader
 
-- company: SpotX 
+- company: SpotX
   link: https://spotx.tv
   imgURL: /assets/images/partners/leader/spotx_logo.png
   type: leader
 
-- company: theTradeDesk 
+- company: theTradeDesk
   link: https://www.thetradedesk.com/
   imgURL: /assets/images/partners/leader/TTD_logo.png
   type: leader
@@ -37,38 +37,38 @@
   link: https://www.xandr.com/platform/
   imgURL: /assets/images/partners/founders/xandr.png
   type: leader
-  
+
 - company: Beachfront Media
   link: https://www.beachfront.com/
   imgURL: /assets/images/partners/tech/beachfront_logo.png
   type: technology
-  
-- company: Conversant 
+
+- company: Conversant
   link: https://www.conversantmedia.com/
   imgURL: /assets/images/partners/tech/conversant_logo.png
   type: technology
-  
-- company: Criteo 
+
+- company: Criteo
   link: https://www.criteo.com/for-publishers/products/criteo-direct-bidder/
   imgURL: /assets/images/partners/tech/criteo.png
   type: technology
-  
-- company: Datablocks 
+
+- company: Datablocks
   link: https://datablocks.net/
   imgURL: /assets/images/partners/tech/datablocks_logo.png
   type: technology
-  
-- company: LiveRamp 
+
+- company: LiveRamp
   link: https://liveramp.com/
   imgURL: /assets/images/partners/tech/LiveRamp-Logo.png
   type: technology
-  
-- company: Marfeel 
+
+- company: Marfeel
   link: https://www.marfeel.com/
   imgURL: /assets/images/partners/tech/marfeel.png
   type: technology
-  
-- company: PubNative 
+
+- company: PubNative
   link: https://pubnative.net/
   imgURL: /assets/images/partners/tech/Pubnative-RGB-Logo.png
   type: technology
@@ -78,27 +78,27 @@
   imgURL: /assets/images/partners/tech/rakuten_logo.png
   type: technology
 
-- company: StreamAMP 
+- company: StreamAMP
   link: https://streamamp.com/
   imgURL: /assets/images/partners/tech/StreamAMP_logo.png
   type: technology
 
-- company: Tapad 
+- company: Tapad
   link: https://tapad.com/
   imgURL: /assets/images/partners/tech/tapad_logo.png
   type: technology
 
-- company: Verizon Media 
+- company: Verizon Media
   link: https://www.verizonmedia.com/advertising
   imgURL: /assets/images/partners/tech/verizon_logo.png
   type: technology
-  
-- company: Advance Local Media 
+
+- company: Advance Local Media
   link: https://advancelocal.com
   imgURL: /assets/images/partners/publisher/advancelocal_logo.png
   type: publisher
 
-- company: CafeMedia 
+- company: CafeMedia
   link: https://www.cafemedia.com/
   imgURL: /assets/images/partners/publisher/cafemedia.png
   type: publisher
@@ -107,28 +107,28 @@
   link: https://www.chegg.com/
   imgURL: /assets/images/partners/publisher/chegg.png
   type: publisher
-  
+
 - company: diDNA
   link: https://didna.io/
   imgURL: /assets/images/partners/publisher/didna-logo.png
   type: publisher
-  
+
 - company: Freestar
   link: https://freestar.com/
   imgURL: /assets/images/partners/publisher/freestar-logo.png
   type: publisher
-  
+
 - company: Glewed TV
   link: https://www.glewed.tv/
   imgURL: /assets/images/partners/publisher/glewed_logo.png
   type: publisher
-  
+
 - company: Hive Media
   link: https://www.hivemedia.com
   imgURL: /assets/images/partners/publisher/Hive-Media-Group-Stacked-Color-web.png
   type: publisher
-  
-- company: Insider, Inc. 
+
+- company: Insider, Inc.
   link: https://www.insider-inc.com/
   imgURL: /assets/images/partners/publisher/Insider_Inc_logo.png
   type: publisher
@@ -163,12 +163,7 @@
   imgURL: /assets/images/partners/publisher/SHE_Media_Logo.png
   type: publisher
 
-- company: Sortable 
-  link: https://www.sortable.com/
-  imgURL: /assets/images/partners/publisher/sortable.png
-  type: publisher
-
-- company: Havas 
+- company: Havas
   link: https://havasmedia.com/
   imgURL: /assets/images/partners/buyer/Havas_Media_Logo.png
   type: buyer