Skip to content

Commit 49c724e

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents dc7e6a6 + 08bc74b commit 49c724e

File tree

1,196 files changed

+101863
-21029
lines changed

Some content is hidden

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

1,196 files changed

+101863
-21029
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ Gemfile.lock
77
/vendor
88
/.bundle
99
.jekyll-metadata
10+
*ads.txt.bkp*
11+
.sass-cache

404.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
layout: fourofour
33
title: Page Not Found
44
description:
5-
hide: true
5+
66
---
77

8-
This is the 404 page.
8+
9+

CNAME

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
prebid.org
1+
docs.prebid.org

Install-Package

Whitespace-only changes.

README.md

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
This repository contains the source files for the Prebid.js documentation site at [Prebid.org](http://prebid.org).
1+
This repository contains the source files for the Prebid.js documentation site at [Prebid.org](https://prebid.org).
22

33
Please see the sections below for more information.
44

55
+ [Contributing](#contributing)
66
+ [License](#license)
77
+ [Prerequisites](#prerequisites)
88
+ [Running Jekyll Locally](#running-jekyll-locally)
9-
+ [Alphabetization of Bidder Adapters](#alphabetization-of-bidder-adaptors)
9+
+ [Building Assets](#building-assets)
1010
+ [The Downloads Page](#the-downloads-page)
1111
+ [Thanks](#thanks)
1212

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

3434
## Prerequisites
3535

36-
The site uses [Jekyll](http://jekyllrb.com/), which is written in the [Ruby](http://www.ruby-lang.org/en/) language.
36+
The site uses [Jekyll](https://jekyllrb.com/), which is written in the [Ruby](https://www.ruby-lang.org/en/) language.
3737

38-
To follow the instructions in the next section, you will need to install the [Bundler](http://bundler.io/) Ruby gem.
38+
1. follow the instructions at https://jekyllrb.com/docs/installation/ for your OS
39+
1. gem install github-pages
40+
1. start Jekyll as described below
3941

40-
Try the following command:
42+
For CSS, the site uses Laravel Mix to build CSS from Sass (scss-flavored) source files. Under the hood Laravel Mix uses Webpack.
4143

42-
```
43-
$ gem install bundler
44-
```
45-
46-
If you are on a Mac and the above command fails with a permissions error (e.g., `"ERROR: While executing gem ... You don't have write permissions for the /Library/Ruby/Gems/... directory."`), try the following steps:
47-
48-
1. Build your own `ruby` binary using [Homebrew](https://brew.sh/): `brew install ruby`. The Homebrew-built Ruby should include its own version of the `gem` command which avoids modifying system libraries.
49-
2. Try `gem install bundler` again. If it still fails, try `sudo gem install bundler`. After that, you should be able to avoid any further use of `sudo` by running `bundler` with the arguments shown in the next section.
44+
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
46+
1. build assets as described below
5047

5148
<a name="running-jekyll-locally" />
5249

@@ -56,10 +53,7 @@ Before submitting a pull request, you should run the site locally to make sure y
5653

5754
To get started editing the site and seeing your changes, clone this repo and enter the following commands in your terminal:
5855

59-
- `cd /path/to/prebid.github.io`
60-
61-
- `bundle install --path vendor/bundle`
62-
56+
- `cd path/to/prebid.github.io`
6357
- `bundle exec jekyll serve`
6458

6559
You should see output that looks something like this:
@@ -81,23 +75,13 @@ Configuration file: /Users/rloveland/Dropbox/Code/prebid.github.io/_config.yml
8175

8276
Open the `Server address` URL in your browser, and you should see a locally running copy of the site.
8377

84-
<a name="alphabetization-of-bidder-adaptors" />
78+
<a name="building-assets"/>
8579

86-
## Alphabetization of Bidder Adaptors
87-
88-
Please don't alphabetize the lists of adapters in your PR, either on the home page or the downloads page.
89-
90-
The adapters are not listed in alphabetical order, they're listed in the order in which they were added to the Prebid.js repo, using (approximately) this command in `src/adapters`:
91-
92-
```
93-
for file in `ls | grep -f <(git ls-files)`; do
94-
HASH=`git rev-list HEAD $file | tail -n 1`;
95-
DATE=`git show -s --format="%ci" $HASH --`;
96-
printf "%-35s %-35s %s\n" $file "$DATE" $HASH;
97-
done | sort -d -k 2
98-
```
80+
## Building Assets
9981

100-
<a name="the-downloads-page" />
82+
- `npm run dev` to build unminified CSS for development
83+
- `npm run prod` to build minified CSS for production
84+
- `npm run watch` to use [Browsersync](https://browsersync.io) to rebuild CSS on demand and reload the browser
10185

10286
## The Downloads Page
10387

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
$container-max-widths: (
2+
sm: 540px,
3+
md: 720px,
4+
lg: 960px,
5+
xl: 1200px
6+
);
7+
8+
$spacer: 1rem;
9+
$spacers: (
10+
6: ($spacer * 3.75),
11+
7: ($spacer * 4.5),
12+
8: ($spacer * 5),
13+
);
14+
15+
$grid-gutter-width: 20px;
16+
$body-bg: #eceeef;
17+
18+
$card-border-radius: 0;
19+
$card-spacer-x: 30px;
20+
21+
$table-accent-bg: $t-code-bg;
22+
$table-border-color: $t-divider-color;
23+
$table-color: $t-text-color;
24+
25+
$navbar-padding-y: 0;
26+
$nav-link-padding-y: 0;
27+
$navbar-nav-link-padding-x: 0;
28+
$navbar-nav-link-padding-y: 0;
29+
$navbar-dark-color: adjust-color($t-text-color--reverse, $alpha: -0.3);
30+
31+
$dropdown-border-radius: 0;
32+
$dropdown-border-width: 0;
33+
$dropdown-link-color: $t-text-color;
34+
$dropdown-link-hover-bg: transparent;
35+
$dropdown-link-hover-color: $t-anchor-color;
36+
$dropdown-spacer: 0;
37+
$dropdown-padding-y: 24px;
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
// Breakpoint Declarations
2+
//
3+
// Responsive breakpoint declarations
4+
// Breakpoints are matched in Responsive VC Design Options Plugin
5+
// http://actian/wp-admin/admin.php?page=bb_edo_all_devices
6+
//
7+
// Markup:
8+
// 'phone-xs': 320px,
9+
// 'phone-sm': 480px,
10+
// 'phone': 767px, // Page Builder Default
11+
// 'tablet': 960px, // Page Builder Default
12+
// 'desktop-sm': 1200px,
13+
// 'desktop': 1980px,
14+
//
15+
// Styleguide Layout.Breakpoints
16+
17+
// Site width
18+
$t-site-width-pixels: 1180;
19+
$t-site-width: 1180px;
20+
$t-site-width--padded: 1210px;
21+
22+
$t-phone-xs: 320px;
23+
$t-phone-sm: 480px;
24+
$t-phone-md: 640px;
25+
$t-phone: 767px; // Page Builder Default
26+
$t-tablet: 992px; // Page Builder Default
27+
$t-ipad-landscape: 1024px;
28+
$t-desktop-aio: 1257px; // Site width + scrollbar (17px) + margins (60px). *** This is where the content starts to shrink. ***
29+
$t-desktop: 1200px; // Page Builder Default
30+
$t-fullscreen: 1903px; // 1920 - 17px scrollbar
31+
32+
$t-screen-sm-min: $t-phone;
33+
$t-screen-md-min: $t-tablet;
34+
$t-screen-lg-min: $t-desktop;
35+
36+
$t-screen-xs-max: $t-screen-sm-min - 1;
37+
$t-screen-sm-max: $t-screen-md-min - 1;
38+
$t-screen-md-max: $t-screen-lg-min - 1;
39+
40+
$breakpoints: (
41+
'phone-xs': $t-phone-xs,
42+
'phone-sm': $t-phone-sm,
43+
'phone-md': $t-phone-md,
44+
'phone': $t-phone,
45+
'tablet': $t-tablet,
46+
'ipad-landscape': $t-ipad-landscape,
47+
'site-width': $t-site-width,
48+
'desktop': $t-desktop,
49+
'fullscreen': $t-fullscreen,
50+
) !default;
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// Colors
2+
//
3+
// These are named colors that are a part of the color palette or tint stack
4+
// for the design. Colors should be named by how they look, not by where they
5+
// are used.
6+
//
7+
// Markup: color-swatches.hbs
8+
//
9+
// Weight: -100
10+
//
11+
// Styleguide Colors
12+
13+
$color--black: #000;
14+
$color--white: #fff;
15+
$color--carbon: #333;
16+
$color--blue: #1BA9E1;
17+
$color--grey: #797F90;
18+
$color--orange: #FF6F00;
19+
$color--dark-grey: #505050;
20+
$color--dove-cry-gray: #707070;
21+
$color--aqua: #ECF3F5;
22+
$color--light-iron: #dddfe3;
23+
$color--cornflower-blue: #28AEE2;
24+
25+
$sg-colors: (
26+
27+
);
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
@function convert-angle($value, $unit) {
2+
$convertable-units: deg grad turn rad;
3+
$conversion-factors: 1 (10grad/9deg) (1turn/360deg) (3.1415926rad/180deg);
4+
@if index($convertable-units, unit($value)) and index($convertable-units, $unit) {
5+
@return $value
6+
/ nth($conversion-factors, index($convertable-units, unit($value)))
7+
* nth($conversion-factors, index($convertable-units, $unit));
8+
}
9+
10+
@warn "Cannot convert `#{unit($value)}` to `#{$unit}`.";
11+
}
12+
13+
/// Test if `$value` is an angle
14+
/// @param {*} $value - Value to test
15+
/// @return {Bool}
16+
@function is-direction($value) {
17+
$is-direction: index((to top, to top right, to right top, to right, to bottom right, to right bottom, to bottom, to bottom left, to left bottom, to left, to left top, to top left), $value);
18+
$is-angle: type-of($value) == 'number' and index('deg' 'grad' 'turn' 'rad', unit($value));
19+
20+
@return $is-direction or $is-angle;
21+
}
22+
23+
/// Convert a direction to legacy syntax
24+
/// @param {Keyword | Angle} $value - Value to convert
25+
/// @require {function} is-direction
26+
/// @require {function} convert-angle
27+
@function legacy-direction($value) {
28+
@if is-direction($value) == false {
29+
@warn "Cannot convert `#{$value}` to legacy syntax because it doesn't seem to be an angle or a direction";
30+
}
31+
32+
$conversion-map: (
33+
to top : bottom,
34+
to top right : bottom left,
35+
to right top : left bottom,
36+
to right : left,
37+
to bottom right : top left,
38+
to right bottom : left top,
39+
to bottom : top,
40+
to bottom left : top right,
41+
to left bottom : right top,
42+
to left : right,
43+
to left top : right bottom,
44+
to top left : bottom right
45+
);
46+
47+
@if map-has-key($conversion-map, $value) {
48+
@return map-get($conversion-map, $value);
49+
}
50+
51+
@return 90deg - convert-angle($value, 'deg');
52+
}

0 commit comments

Comments
 (0)