diff --git a/.gitignore b/.gitignore index ad4754cd5e..c300c925e6 100755 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,4 @@ Gemfile.lock /.bundle .jekyll-metadata *ads.txt.bkp* - +.sass-cache diff --git a/.sass-cache/3566244f41d72698175d1ae4f088bd2e3dff2559/main.scssc b/.sass-cache/3566244f41d72698175d1ae4f088bd2e3dff2559/main.scssc deleted file mode 100644 index 76fc24b01a..0000000000 Binary files a/.sass-cache/3566244f41d72698175d1ae4f088bd2e3dff2559/main.scssc and /dev/null differ diff --git a/.sass-cache/41c54059954d6ed385311837ab9d3a08e3784288/main.scssc b/.sass-cache/41c54059954d6ed385311837ab9d3a08e3784288/main.scssc deleted file mode 100644 index 3e75ee75f1..0000000000 Binary files a/.sass-cache/41c54059954d6ed385311837ab9d3a08e3784288/main.scssc and /dev/null differ diff --git a/.sass-cache/5eb7d1ad8f5d191bdc09ff706ecde9f0bb94342b/main.scssc b/.sass-cache/5eb7d1ad8f5d191bdc09ff706ecde9f0bb94342b/main.scssc deleted file mode 100644 index 487a2b9b62..0000000000 Binary files a/.sass-cache/5eb7d1ad8f5d191bdc09ff706ecde9f0bb94342b/main.scssc and /dev/null differ diff --git a/.sass-cache/a8ae1fbf8fe3cf0ae44282e4f927a25624204c54/main.scssc b/.sass-cache/a8ae1fbf8fe3cf0ae44282e4f927a25624204c54/main.scssc deleted file mode 100644 index 6db4f74c3a..0000000000 Binary files a/.sass-cache/a8ae1fbf8fe3cf0ae44282e4f927a25624204c54/main.scssc and /dev/null differ diff --git a/.sass-cache/e54a2b524845b6c18a57dadf1796966da31d0138/main.scssc b/.sass-cache/e54a2b524845b6c18a57dadf1796966da31d0138/main.scssc deleted file mode 100644 index b3701f0ddf..0000000000 Binary files a/.sass-cache/e54a2b524845b6c18a57dadf1796966da31d0138/main.scssc and /dev/null differ diff --git a/_assets/sass/components/_bidder-list.scss b/_assets/sass/components/_bidder-list.scss new file mode 100644 index 0000000000..55db573e20 --- /dev/null +++ b/_assets/sass/components/_bidder-list.scss @@ -0,0 +1,36 @@ +.pb-content { + .bidder-filter { + padding: 10px 15px; + border: 1px solid #b3c1cc; + background-color: rgba(236, 243, 245, 0.35); + + &:focus { + outline: none; + } + } + + .c-bidder-list-group { + h4 { + color: #797f90; + font-size: 19px; + font-weight: 700; + } + } + + .c-bidder-list { + padding-left: 0; + columns: 2; + + li { + padding-bottom: 5px; + + &::before { + content: none !important; + } + } + + a { + text-decoration: none; + } + } +} diff --git a/_assets/sass/components/_download-form.scss b/_assets/sass/components/_download-form.scss new file mode 100644 index 0000000000..19ebe7fb55 --- /dev/null +++ b/_assets/sass/components/_download-form.scss @@ -0,0 +1,17 @@ +.download-form { + margin-bottom: 20px; + + > .row { + flex-flow: column; + } + + .adapters { + display: flex; + flex-flow: row wrap; + } +} + +.download-form__modal, +.modal-backdrop.fade { + opacity: 0; +} diff --git a/_assets/sass/components/_search.scss b/_assets/sass/components/_search.scss new file mode 100644 index 0000000000..0909593a1b --- /dev/null +++ b/_assets/sass/components/_search.scss @@ -0,0 +1,44 @@ +.algolia-autocomplete { + .algolia-docsearch-suggestion--category-header { + display: none !important; + } +} + +.c-search { + position: relative; + + @include media('<=990px') { + float: left; + } + + &::after { + @include position(absolute, 50% 10px null null); + @include size(20px); + transform: translateY(-50%); + background: url(/assets/images/icons/search-icon2.svg); + background-size: cover; + content: ''; + } + + input[type="search"] { + @include padding(null 8px); + border: 1px solid rgba(0, 0, 0, 0.125); + max-width: 120px; + transition: max-width 200ms ease-in-out; + + &:hover, &:focus { + max-width: 200px; + outline: none; + } + + /* clears the ‘X’ from Internet Explorer */ + &::-ms-clear { display: none; width : 0; height: 0; } + &::-ms-reveal { display: none; width : 0; height: 0; } + + /* clears the ‘X’ from Chrome */ + &::-webkit-search-decoration, + &::-webkit-search-cancel-button, + &::-webkit-search-results-button, + &::-webkit-search-results-decoration { display: none; } + } +} diff --git a/_assets/sass/main.scss b/_assets/sass/main.scss index dc657f9167..29af1a2147 100644 --- a/_assets/sass/main.scss +++ b/_assets/sass/main.scss @@ -15,6 +15,7 @@ @import 'vendor/bootstrap'; @import 'vendor/bourbon'; @import 'vendor/include-media'; +@import 'vendor/awesomplete'; // Base Styles @import 'base/base'; @@ -32,6 +33,9 @@ @import 'components/pb'; @import 'components/social-media'; @import 'components/table'; +@import 'components/download-form'; +@import 'components/bidder-list'; +@import 'components/search'; // Pages @import 'pages/home'; diff --git a/_assets/sass/vendor/_awesomplete.scss b/_assets/sass/vendor/_awesomplete.scss new file mode 100644 index 0000000000..c4983e5ea6 --- /dev/null +++ b/_assets/sass/vendor/_awesomplete.scss @@ -0,0 +1,27 @@ +@import '../../node_modules/awesomplete/awesomplete.base.css'; + +.awesomplete { + > ul { + background: #333; + padding: 0 !important; + + > li { + padding: 10px 15px; + border-bottom: 1px solid #707070; + color: #efefef; + font-size: 17px; + + &:last-child { + border-bottom: 0; + } + + &[aria-selected="true"] { + background-color: #ff6f00; + } + + &::before { + content: none !important; + } + } + } +} diff --git a/_assets/sass/vendor/_bootstrap.scss b/_assets/sass/vendor/_bootstrap.scss index 405a18ded2..0d44b0260c 100644 --- a/_assets/sass/vendor/_bootstrap.scss +++ b/_assets/sass/vendor/_bootstrap.scss @@ -13,4 +13,5 @@ @import "../../../node_modules/bootstrap/scss/card"; @import "../../../node_modules/bootstrap/scss/code"; @import "../../../node_modules/bootstrap/scss/alert"; +@import "../../../node_modules/bootstrap/scss/modal"; @import "../../../node_modules/bootstrap/scss/utilities"; diff --git a/_config.yml b/_config.yml index 178f1e0d4b..8f03e0bebe 100755 --- a/_config.yml +++ b/_config.yml @@ -85,7 +85,7 @@ collections: port: 8080 -exclude: ['README.md', 'LICENSE', 'bower.json', 'Gemfile.lock', 'Gemfile', 'vendor', 'node_modules', '_assets', 'mix-manifest.json', 'webpack.mix.js'] +exclude: ['README.md', 'LICENSE', 'bower.json', 'Gemfile.lock', 'Gemfile', 'vendor', 'node_modules', '_assets', 'mix-manifest.json', 'webpack.mix.js', 'find-ungrouped-bidders.sh' ] keep_files: - assets/css/main-bundle.css diff --git a/_data/sidebar.yml b/_data/sidebar.yml index 0e1296b51f..8219b1f587 100644 --- a/_data/sidebar.yml +++ b/_data/sidebar.yml @@ -460,7 +460,7 @@ - sbSecId: 1 title: Native Ads - link: /dev-docs/show-native-ads.html + link: /prebid/native-implementation.html isHeader: 0 isSectionHeader: 0 sectionTitle: @@ -506,6 +506,14 @@ sectionTitle: subgroup: 8 +- sbSecId: 1 + title: Timeouts + link: /features/timeouts.html + isHeader: 0 + isSectionHeader: 0 + sectionTitle: + subgroup: 8 + #--------------Prebid Mobile--------------| @@ -625,6 +633,14 @@ sectionTitle: subgroup: 1 +- sbSecId: 2 + title: In App Native Ad Unit + link: /prebid-mobile/pbm-api/ios/pbm-native-inapp-ios.html + isHeader: 0 + isSectionHeader: 0 + sectionTitle: + subgroup: 1 + - sbSecId: 2 title: Video Outstream Ad Unit link: /prebid-mobile/pbm-api/ios/pbm-videooutstreamadunit-ios.html @@ -738,6 +754,14 @@ sectionTitle: subgroup: 2 +- sbSecId: 2 + title: In App Native Ad Unit + link: /prebid-mobile/pbm-api/android/pbm-native-inapp-android.html + isHeader: 0 + isSectionHeader: 0 + sectionTitle: + subgroup: 2 + - sbSecId: 2 title: Banner Interstitial Ad Unit link: /prebid-mobile/pbm-api/android/pbm-bannerinterstitialadunit-android.html @@ -754,6 +778,14 @@ sectionTitle: subgroup: 2 +- sbSecId: 2 + title: Video Intream Ad Unit + link: /prebid-mobile/pbm-api/android/pbm-video-instream-android.html + isHeader: 0 + isSectionHeader: 0 + sectionTitle: + subgroup: 2 + - sbSecId: 2 title: Video Interstitial Ad Unit link: /prebid-mobile/pbm-api/android/pbm-videointerstitialadunit-android.html @@ -951,7 +983,7 @@ subgroup: 0 - sbSecId: 3 - title: 'Guide to Ad Manager' + title: 'Guide to Prebid in Ad Manager' link: /adops/step-by-step.html isHeader: 0 isSectionHeader: 0 @@ -959,7 +991,7 @@ subgroup: 0 - sbSecId: 3 - title: 'Setting up for AMP' + title: 'Setting up for AMP in GAM' link: /adops/setting-up-prebid-for-amp-in-dfp.html isHeader: 0 isSectionHeader: 0 @@ -967,7 +999,7 @@ subgroup: 0 - sbSecId: 3 - title: 'Setting up Multi-Format' + title: 'Setting up Multi-Format in GAM' link: /adops/setting-up-prebid-multi-format-in-dfp.html isHeader: 0 isSectionHeader: 0 @@ -975,15 +1007,15 @@ subgroup: 0 - sbSecId: 3 - title: 'Setting up Native (Alpha)' - link: /adops/setting-up-prebid-native-in-dfp.html + title: 'Setting up Native in GAM' + link: /adops/gam-native.html isHeader: 0 isSectionHeader: 0 sectionTitle: subgroup: 0 - sbSecId: 3 - title: 'Setting up Video' + title: 'Setting up Video in GAM' link: /adops/setting-up-prebid-video-in-dfp.html isHeader: 0 isSectionHeader: 0 @@ -991,7 +1023,7 @@ subgroup: 0 - sbSecId: 3 - title: 'Setting up Long-Form Video' + title: 'Setting up Long-Form Video in GAM' link: /adops/setting-up-prebid-ott-video-in-gam.html isHeader: 0 isSectionHeader: 0 @@ -1583,14 +1615,6 @@ sectionTitle: subgroup: 0 -- sbSecId: 5 - title: 'Managed Solutions' - link: /prebid-server/hosting/hosted-servers.html - isHeader: 0 - isSectionHeader: 0 - sectionTitle: - subgroup: 0 - - sbSecId: 5 title: 'Hosting Your Own PBS' link: /prebid-server/hosting/pbs-hosting.html @@ -1993,3 +2017,32 @@ isSectionHeader: 0 sectionTitle: subgroup: 0 + + #-------------- Tools --------------| + +- sbSecId: 8 + title: + link: + isHeader: 0 + isSectionHeader: 1 + sectionTitle: Tools + sectionId: tools + subgroup: 1000 + sbCollapseId: tools + +- sbSecId: 8 + title: + link: + isHeader: 1 + headerId: toolsinvis + isSectionHeader: + sectionTitle: + subgroup: 0 + +- sbSecId: 8 + title: Line Item Manager + link: /tools/line-item-manager.html + isHeader: 0 + isSectionHeader: 0 + sectionTitle: + subgroup: 0 diff --git a/_includes/adops/adops-gam-setup.html b/_includes/adops/adops-gam-setup.html index f5c9eee240..35db7cdf1c 100644 --- a/_includes/adops/adops-gam-setup.html +++ b/_includes/adops/adops-gam-setup.html @@ -1,5 +1,5 @@
In Google Ad Manager, create a new order with a $0.50 line item.
@@ -76,7 +83,7 @@Copy this creative code snippet and paste it into the Code snippet box.
-Send All Bids scenario (where every bidder has a separate
order), the creative and targeting will be different from the example shown here. See Send All Bids for details.
Be sure to duplicate your line item and video creative for each Prebid price bucket you intend to create.
By default, Prebid.js caps all CPMs at $20. As a video seller, you may expect to see CPMs higher than $20. In order to receive those bids, you’ll need to make sure your dev team implements custom price buckets as described in the engineering setup instructions. Once those changes are made on the engineering side, there should be no changes required from the ad ops side to support CPMs over $20.
-Multiple Cache Services
You might need separate video line items for each cache service being used. For example, if both AppNexus and Rubicon Project are bidders, you’ll either need to create separate line items to support the different cache URLs required or provide separately-targeted creatives, as described below.
1. For each line item you create, click on the Creatives tab, click the ADD CREATIVE button, and choose the size you're entering.
2. In the dialog that appears, choose Redirect.
@@ -63,7 +72,7 @@Prebid Cache and the VAST creative URL warning
Google Ad Manager will show you a warning stating that fetching VAST from the creative
- URL failed. This is expected, since the creative URL above points
+ URL failed. This is expected, since the creative URL above points
to a server-side asset cache hosted by Prebid Server.
4. Set the Duration to 1.
@@ -74,6 +83,15 @@