pull latest master

.gitignore

@@ -8,4 +8,4 @@ Gemfile.lock
 /.bundle
 .jekyll-metadata
 *ads.txt.bkp*
-
+.sass-cache

_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;
+    }
+  }
+}

_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;
+}

_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; }
+  }
+}

_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';

_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;
+      }
+    }
+  }
+}

_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";

_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

_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,47 +983,47 @@
   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
   sectionTitle:
   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
   sectionTitle:
   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
   sectionTitle:
   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
   sectionTitle:
   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

_includes/adops/adops-gam-setup.html

@@ -1,5 +1,5 @@
 <div class="col-sm-9 pb-content" markdown="1">
-			
+
 <h1 id="step-by-step-guide-to-google-ad-manager-setup">Step By Step Guide to Google Ad Manager Setup</h1>
 
 <div id="youtube">
@@ -28,6 +28,13 @@ <h2>(Sorry, YouTube videos aren't available with your cookie privacy settings.)<
   </li>
 </ul>
 
+<div class="alert alert-info" role="alert">
+  <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
+  <span class="sr-only">Tip:</span>
+  Tip: Manually configuring GAM for Prebid can be a fair amount of work.
+Consider using our official command line tool, <a href="/tools/line-item-manager.html">Prebid Line Item Manager</a>, to create the setup. Using this tool may save you time and help you avoid mistakes.
+</div>
+
 <h2 id="step-1-add-a-line-item">Step 1. Add a line item</h2>
 
 <p>In Google Ad Manager, create a new order with a $0.50 line item.</p>
@@ -76,7 +83,7 @@ <h2 id="step-2-add-a-creative">Step 2. Add a Creative</h2>
 
 <p>Copy this creative code snippet and paste it into the <strong>Code snippet</strong> box.</p>
 
-<div class="pb-alert pb-alert-important" role="alert"><i class="fa fa-exclamation-circle"></i> <b>Important:</b> 
+<div class="pb-alert pb-alert-important" role="alert"><i class="fa fa-exclamation-circle"></i> <b>Important:</b>
 If you’re using the <code class="language-plaintext highlighter-rouge">Send All Bids</code> scenario (where every bidder has a separate
 order), the creative and targeting will be different from the example shown here. See <a href="/adops/send-all-bids-adops.html">Send All Bids</a> for details.
 </div>