Skip to content

Commit

Permalink
Merge remote-tracking branch 'root_branch/master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
nmaeura committed Jul 1, 2022
2 parents 0922217 + 799ce10 commit 4d3a562
Show file tree
Hide file tree
Showing 392 changed files with 20,387 additions and 5,374 deletions.
16 changes: 16 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
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

- [ ] new bid adapter
- [ ] update bid adapter
- [ ] new feature
- [ ] text edit only (wording, typos)
- [ ] bugfix (code examples)
- [ ] new examples

## 📋 Checklist

- [ ] 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)
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
source 'https://rubygems.org'
gem 'github-pages', '>= 30'

gem "webrick", "~> 1.7"
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,10 @@ 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`
- `export JEKYLL_ENV=production`
- `bundle exec jekyll serve`
```bash
$ JEKYLL_ENV=production bundle exec jekyll serve --watch --incremental
```


You should see output that looks something like this:

Expand Down
6 changes: 6 additions & 0 deletions _assets/sass/base/_base.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
img {
max-width: 100%;
}

div {
min-width: 0;
}


4 changes: 4 additions & 0 deletions _assets/sass/components/_pb.scss
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@
}
}

.pb-code-hl-wrap {
width: 100%;
}

.highlight, .pb-code-hl {
margin-top: 20px;
margin-bottom: 20px;
Expand Down
75 changes: 35 additions & 40 deletions _data/partners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit 4d3a562

Please sign in to comment.