Fix merge conflict

source/javascripts/features.js

 (function () {
-  this.SlickHandler = (function() {
-    function SlickHandler(slickElement, slickNavElement, options) {
-      var idSlickElement = slickElement[0].id;
-      this.slickElement = slickElement;
-      this.slickNavElement = slickNavElement;
-      this.options = options;
-      this.customDots = slickNavElement.find('.feature-slider-dot-content');
-      this.slickElement.on('init reInit', this.bindEvents.bind(this));
-      this.configSlickElement = {
-        arrows: false,
-        slidesToShow: 1,
-        slidesToScroll: 1,
-        responsive: [
-          {
-            breakpoint: 768,
-            settings: {
-              arrows: false,
-              slidesToShow: 1,
-              slidesToScroll: 1,
-              dots: true
-            }
-          }
-        ]
-      };
-
-      this.configSlickNavElement = {
-        arrows: false,
-        slidesToShow: 3,
-        slidesToScroll: 1,
-        asNavFor: '#' + idSlickElement,
-        responsive: [
-          {
-            breakpoint: 768,
-            settings: {
-              arrows: false,
-              slidesToShow: 1,
-              slidesToScroll: 1,
-              dots: false,
-              swipe: true,
-              autoplay: true,
-              autoplaySpeed: 5000
-            }
-          }
-        ]
-      };
-
-      this.slickElement.slick(this.configSlickElement);
-      if (typeof this.slickNavElement !== 'undefined') {
-        if (this.slickNavElement !== null) {
-          this.slickNavElement.slick(this.configSlickNavElement);
-        }
-      }
-      this.slickElement[0].slick.slickGoTo(0);
-      if ($(window).width() > 768) {
-        if (typeof this.options === 'undefined' || !this.options.isAlt) {
-          $(this.customDots[0]).addClass('clicked-element');
-        }
-        else {
-          $(this.customDots[0]).addClass('clicked-element-alt');
-        }
-      }
-
-    }
-
-    SlickHandler.prototype.bindEvents = function() {
-      this.customDots.off('mouseenter').on('mouseenter', this.changePage.bind(this));
-      this.slickElement.on("breakpoint", this.removeDesktopElements.bind(this));
-      this.slickElement.on("swipe", this.syncSliders.bind(this));
-      this.slickElement.on("destroy", this.reInitSliders.bind(this));
-    };
-
-    //Remove the clicked element styling in case a resize happens
-    SlickHandler.prototype.removeDesktopElements = function(e, slick, breakpoint) {
-      if (breakpoint <= 768) {
-        this.customDots.removeClass('clicked-element');
-        this.customDots.removeClass('clicked-element-alt');
-      }
-      else {
-        this.slickElement.slick('unslick');
-        this.slickNavElement.slick('unslick');
-      }
-    };
-
-    SlickHandler.prototype.reInitSliders =  function() {
-      this.slickElement.slick(this.configSlickElement);
-      this.slickNavElement.slick(this.configNavElement);
-    };
-
-    SlickHandler.prototype.syncSliders = function(e, slick, direction) {
-      if (slick.activeBreakpoint === 768 && slick.activeBreakpoint !== null) {
-        this.slickNavElement[0].slick.slickGoTo(slick.currentSlide);
-      }
-      else {
-        var newSelectedElement = $(this.slickNavElement).find('.feature-slider-dot-content');
-        var clickedElementName = 'clicked-element';
-        if (typeof this.options !== 'undefined') {
-          clickedElementName = 'clicked-element-alt';
-        }
-        newSelectedElement.removeClass(clickedElementName);
-        $(newSelectedElement).filter(function () {
-          return $(this).attr('index') == slick.currentSlide;
-        }).addClass(clickedElementName);
-      }
-    };
-
-    SlickHandler.prototype.changePage = function(e) {
-      var clickedElement = $(e.currentTarget);
-      if (typeof this.options === 'undefined' || !this.options.isAlt) {
-        this.customDots.removeClass('clicked-element');
-        clickedElement.addClass('clicked-element');
-      }
-      else {
-        this.customDots.removeClass('clicked-element-alt');
-        clickedElement.addClass('clicked-element-alt');
-      }
-      this.slickElement[0].slick.slickGoTo(parseInt(clickedElement.attr("index")));
-    };
-
-    return SlickHandler;
-  })();
-
-  //this is prolly very silly
-  var $slider = $('#feature-gallery-slider');
-  var $sliderNavElement = $('.slider-nav');
-  var $slider1 = $('#feature-gallery-slider-1');
-  var $sliderNavElement1 = $('.slider-nav-1');
-  var $slider2 = $('#feature-gallery-slider-2');
-  var $sliderNavElement2 = $('.slider-nav-2');
-  var $slider3 = $('#feature-gallery-slider-3');
-  var $sliderNavElement3 = $('.slider-nav-3');
-  var $slider4 = $('#feature-gallery-slider-4');
-  var $sliderNavElement4 = $('.slider-nav-4');
-
-  var slickHandler  = new SlickHandler($slider, $sliderNavElement, {
-    isAlt: $slider.closest('.feature-gallery').hasClass('feature-gallery-alt')
-  });
-  var slickHandler1 = new SlickHandler($slider1, $sliderNavElement1, {
-    isAlt: $slider1.closest('.feature-gallery').hasClass('feature-gallery-alt')
-  });
-  if ($slider2.length) {
-    var slickHandler2 = new SlickHandler($slider2, $sliderNavElement2);
-  }
-  if ($slider3.length) {
-    var slickHandler3 = new SlickHandler($slider3, $sliderNavElement3, {isAlt: true});
-  }
-  if ($slider4.length) {
-    var slickHandler4 = new SlickHandler($slider4, $sliderNavElement4);
-  }
-
   var $videoButton = $(".video-button");
   var $videoContainer = $('.video-container');

source/okrs/index.html.md

@@ -67,10 +67,10 @@ TODO: Link to Diff with the start of the quarter
 ### Objective 1: Grow incremental ACV according to plan.
-* CEO: Build SQL pipeline for new business. 300% of IACV plan
+* CEO: Build [sales qualified leads (SQL)](/handbook/marketing/business-development/#sql) pipeline for new business. 300% of [incremental annual contract value (IACV)](handbook/finance/#iacv) plan
   * CMO: Identify CE installations within strategic organizations with installations with over 500 users and launch demand generation campaigns.
   * CMO: More demand coming from inbound marketing activities. 50% of sales pipeline quota
-    * CMO: Increase EE Trials. 21% QoQ
+    * CMO: Increase EE Trials. 21% Quarter over Quarter (QoQ)
     * CMO: Increase EE Trial SQL $ pipeline contribution 43% QoQ
   * CFO: Forecast accuracy and delivery of relevant information
     * Controller: Zuora to Salesforce reconciliation complete and tested.
@@ -78,25 +78,25 @@ TODO: Link to Diff with the start of the quarter
     * Controller: Zuora to Salesforce to Zendesk data synch completed.
   * CFO: Deliver 10 SQLs > $10k during quarter through investor outreach
   * VP Prod: Salesforce shows usage. [Version check](https://gitlab.com/gitlab-com/salesforce/issues/104), usage ping, and ConvDev index are available in SFDC.
-  * CRO: 100% of quota-carrying reps at 3x pipeline of quarterly iACV goal
-    * Alliances: generates 15% of sales pipeline
-    * Federal: generates 5% of sales pipleine
+  * CRO: 100% of quota-carrying reps at 3x pipeline of quarterly IACV goal
+    * Alliances: generates 10% of sales pipeline
+    * Federal: generates 10% of sales pipleine
     * Customer Success: generate 15% of sales pipeline quota
-    * SDR lead: Generate 15% of sales pipeline quota
+    * SDR lead: Generate 25% of sales pipeline quota
       * SDR lead: Get an SQL from Fortune 1000 companies identified using CE. 50% of identified companies using CE.
-      * SDR lead: Increase win rate. 20%
+      * SDR lead: Double Win Rate. 10%
   * CRO: Increase new business sales velocity. Grow 200% YoY to 602 new business deals closed won.
   * CRO: Decrease age of non-web direct deals by 10%
     * Sales Ops: [New sales stages and exit criteria. Launch and Train](https://gitlab.com/gitlab-com/sales/issues/120)
     * Customer Success: Solution Architects managing PoC's for new business opps within strategic/large accounts. 50%
     * PMM: 2 ROI calculators
     * PMM: 3 case studies
-  * CRO: Keep sales efficient. Sales efficiency ratio > 1.8 (IACV / sales spend)
-  * CMO: Keep marketing efficient. Marketing efficiency ratio > 3.4 (IACV / marketing spend)
+  * CRO: Keep sales efficient. [Sales efficiency ratio](/handbook/finance/#definitions) > 1.8 (IACV / sales spend)
+  * CMO: Keep marketing efficient. [Marketing efficiency ratio](/handbook/finance/#definitions) > 3.4 (IACV / marketing spend)
 * CEO: Understand and improve existing account growth. 200% YoY
   * VP Eng: Geo DR successful deployments. [Test fail-over with GitLab.com](https://gitlab.com/gitlab-org/gitlab-ee/issues/1884)
     * Platform: Get Geo reliable with a testing framework.
-    * Build: Deliver PostgreSQL HA in omnibus and Terraform to enable HA
+    * Build: Deliver PostgreSQL High Availability (HA) in omnibus and Terraform to enable HA
   * VP Prod: [Make it easier to discover and use EE features](https://gitlab.com/gitlab-org/gitlab-ee/issues/2417). Ship EE by default. Trials increase 100%.
     * Technical Writing: CE docs link to EE wherever relevant. Increased visits to EE docs.
   * VP Prod: Ship paid subscriptions for GitLab.com. All EE features are behind subscription. Ability to buy higher storage limits.
@@ -111,13 +111,13 @@ TODO: Link to Diff with the start of the quarter
   * Customer Success: [Double spend within large/strategic account segmentation](https://gitlab.com/gitlab-com/customer-success/issues/78)
   * Customer Success: Identity the trigger(s) to purchase for large/strategic accounts.
   * Support: Provide faster, more knowledgable support. Reduce Average Time to Solve by 5%.
-* CEO: Increase ASP (IACV per won) by 25% QoQ
-    * CRO: Triple average new business deal size YoY to $4,875
-    * CRO: [50% of iACV from EEP](https://gitlab.com/gitlab-com/sales/issues/143_
-    * CMO: More sales assets. 3 new for each stage (TOFU, MOFU, BOFU) of the sales process
+* CEO: Increase [average sales price (ASP)](/handbook/finance/#definitions) (IACV per won) by 25% QoQ
+    * CRO: Triple average new business deal size YoY 
+    * CRO: [50% of IACV from EEP](https://gitlab.com/gitlab-com/sales/issues/143_
+    * CMO: More sales assets. 3 new for each stage ([TOFU, MOFU, BOFU](/handbook/glossary/#funnel)) of the sales process
       * CMO: [Presentation generation based on conversational development index.](https://gitlab.com/gitlab-com/organization/issues/95)
       * CMO: 3 minute video product demo targeted at buyer audience. Published
-    * PMM: Sales Demo easy to give. At least one AE can do it in 10 minutes.
+    * PMM: Sales Demo easy to give. At least one Account Executive can do it in 10 minutes.
     * CRO: Sales Demo trained. 75% of customer facing team passes test.
     * VP Prod: Conversational Development Index in product and SFDC.
     * VP Prod: Improve JIRA support. Better than Bitbucket. Support transitions, references and development panel.
@@ -136,7 +136,7 @@ TODO: Link to Diff with the start of the quarter
   * VP Eng: Enable High Availability
     * Platform: Enable graceful degradation when file servers are down
     * Platform: Support multiple Redis clusters for persistent and cache stores
-    * Platform: Use Geo DR to move between clouds and AZs
+    * Platform: Use Geo DR to move between clouds and Area Zones
     * Support: Improve GitLab provided debugging tools. We'll log all times we need terminal access and create an issue for each to improve GitLab tools.
     * Prometheus: Allow monitoring of Unicorn, Sidekiq, and gitlab-shell. Deprecate InfluxDB
     * Edge: Make GitLab QA test backup/restore, LDAP, Container Registry, and Mattermost
@@ -195,9 +195,6 @@ TODO: Link to Diff with the start of the quarter
   * CMO: Initiate AR engagement with key analysts and achieve Leader in the Forrester Wave CI research report.
   * Head Prod: [Make sure we have a very quick install of all our components](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/2432)
   * VP Eng: Make sure existing features are used by GitLab.com. Cycle time analytics working.
-    * Production: GitLab.com uses Kubernetes. In use.
-    * Production: GitLab.com uses Canary deploys. In use.
-    * Production: GitLab.com uses Review apps. In use.
     * Support: GitLab.com uses Service Desk. In use for one process.
     * Build: Deliver Helm charts which are used on GitLab.com.
     * CI/CD: Help GitLab.com use our deployment features. CD/Kubernetes/Helm/Canary deploys/Review Apps/Service Desk

source/posts/2017-06-19-how-to-shorten-conversation-cycle.html.md

+---
+title: How to Shorten the Conversation Cycle
+author: Rebecca Dodd
+author_twitter: 
+author_gitlab: rebecca
+categories: GitLab workflow
+image_title: '/images/blogimages/shorten-conversation-cycle.jpg'
+twitter_image: '/images/tweets/how-to-shorten-conversation-cycle.png'
+description: Four simple steps to move faster from idea to production.
+---
+
+If your new features often get stalled in the initial discussion phase, read our four tips for shortening the conversation cycle and shipping faster.
+
+<!-- more -->
+
+## 1. Measure Your Cycle Time
+
+The first step towards making a change is having the numbers to motivate it. If you measure the duration of time from the moment an idea is first discussed in chat, all the way through to its release in production, you can make a good case for changing your approach if others can see that something is causing delays. Try a feature like [cycle analytics](https://about.gitlab.com/features/cycle-analytics/) to monitor each stage in your workflow.
+
+## 2. Start with Minimum Viable Changes
+
+You've identified the problem, now how do you fix it? Where ideas for new features and improvements often get stuck is on how to implement them. The idea may be too ambitious or too time consuming to ship easily, so it gets pushed back in favor of more manageable changes. Try breaking up new products or features into smaller pieces of functionality. [Iteration is one of our company values](https://about.gitlab.com/handbook/values/) and while it's often one of the more uncomfortable ones, it is effective. Do the smallest thing possible and release it quickly – you can keep iterating from there.
+
+## 3. Include Gatekeepers Early on
+
+Who needs to approve something before you ship? Don't leave them out until the last minute. Including stakeholders, security experts, product managers and UX team members in the conversation in the early phases prevents bottlenecks ahead of release, and ensures that most errors have been caught and addressed before you move into production. Read more about [shipping faster without sacrificing security or quality](https://about.gitlab.com/2017/06/05/speed-security-quality-with-hackerone/).
+
+## 4. Get Everyone on Board
+
+Acknowledging that a feature or product is not polished and needs more work, yet releasing it anyway, feels unnatural to must of us, so you may meet some resistance to the idea. Working in this way does offer benefits to both business owners and developers, which you can communicate to help persuade hesitant team members.
+
+For example, you can respond more quickly to market needs and user feedback by shipping minimum viable changes often, which is good news for your business. For developers, it's easier to troubleshoot a small release and having faster, more frequent feedback on work gives more of a sense of progress and boosts motivation.
+
+Moving towards smaller releases to shorten the time between idea and production may feel strange at first, but you'll start seeing results quickly.
+Shortening the conversation cycle is just one principle of Conversational Development. Visit [conversationaldevelopment.com](http://conversationaldevelopment.com/) to learn more.
+{: .alert .alert-gitlab-orange}  
+
+[Cover image](https://unsplash.com/@djmalecki?photo=fw7lR3ibfpU) by [Dawid Malecki](https://unsplash.com/@djmalecki) is licensed under [CC0 1.0](https://creativecommons.org/publicdomain/zero/1.0/)
+{: .note}

source/products/index.html.haml

@@ -37,7 +37,7 @@ extra_font:
               = link_to "Install", "/installation/", class: "featured-item-button"
             = link_to "View More ", "#community-edition", class: "featured-item-expand"
             %ul#community-edition.featured-item-list.list-unstyled
-              - data.comparisons.features.each do |feature|
+              - data.features.features.each do |feature|
                 - if (feature.gitlab_ce == true && feature.feature_page == true)
                   %li.line-separator
                   %li.item-description
@@ -72,7 +72,7 @@ extra_font:
               %li.item-description
                 %strong
                   All features from Community Edition plus:
-              - data.comparisons.features.each do |feature|
+              - data.features.features.each do |feature|
                 - if (feature.gitlab_ce == false && feature.gitlab_ees == true)
                   %li.line-separator
                   %li.item-description
@@ -107,7 +107,7 @@ extra_font:
               %li.item-description
                 %strong
                   All features from Enterprise Edition Starter plus:
-              - data.comparisons.features.each do |feature|
+              - data.features.features.each do |feature|
                 - if (feature.gitlab_ce == false && feature.gitlab_ees == false && feature.gitlab_eep == true)
                   %li.line-separator
                   %li.item-description
@@ -125,7 +125,7 @@ extra_font:
     %h2.faq-title.light.text-center
       Feature Comparison
     .comparison-page-content.comparison.gray-bg#comparison
-      = partial "includes/features/table", locals: { product_one: data.comparisons.competitors.gitlab_ce, product_two: data.comparisons.competitors.gitlab_ees, product_three: data.comparisons.competitors.gitlab_eep, key_one: 'gitlab_ce', key_two: 'gitlab_ees', key_three: 'gitlab_eep' }
+      = partial "includes/features/table", locals: { product_one: data.features.competitors.gitlab_ce, product_two: data.features.competitors.gitlab_ees, product_three: data.features.competitors.gitlab_eep, key_one: 'gitlab_ce', key_two: 'gitlab_ees', key_three: 'gitlab_eep' }
     .text-center
       = link_to "Contact Us", "https://about.gitlab.com/sales/", class: "featured-item-button contact-us-button"

source/public-sector/index.html.haml

+---
+title: GitLab for the Public Sector
+suppress_header: true
+extra_css:
+  - public-sector.css
+---
+
+.landing-header
+  = partial "includes/icons/gitlab-icon-pattern-header.svg"
+  .container
+    .landing-content
+      %h1 GitLab for the Public Sector
+      %h2
+        Bring the power of Git and CI/CD to your federal, state, and education IT teams.
+
+.page-container.summary-container.text-center
+  .container
+    %h2.summary-title
+      Unlock great software with GitLab Enterprise Edition
+    .description
+      %p
+        Social coding, continuous integration, and release automation have proven to improve development speed and software quality.  
+        %div
+          With GitLab’s enterprise-grade source code management, code review, continuous Integration, continuous delivery, and application monitoring tools, you can remove the roadblocks to collaboration and accelerate your development process.
+    %a.btn.cta-btn.red{ href: '#mktoForm_1411' }
+      Contact us today
+
+.page-container.characteristics-container
+  .container
+    .row
+      .col-md-12
+        .row.row-characteristics
+          .col-sm-6.col-md-6
+            .row
+              .col-sm-2.col-md-2.icon-container
+                =icon("public-sector/globe-icon")
+              .col-sm-10
+                %h4.point-title
+                  Git at enterprise scale
+                %p.point-description
+                  Built to support today’s global organizations, GitLab Enterprise Edition scales in terms of users, data, and geographic location. A single server can handle thousands of users and repositories.
+          .col-sm-6.col-md-6
+            .row
+              .col-sm-2.col-md-2.icon-container
+                =icon("public-sector/server-icon")
+              .col-sm-10
+                %h4.point-title
+                  Host it your way
+                %p.point-description
+                  GitLab ships in one easy-to-install package that can be hosted on your servers or on the cloud provider of your choice.
+        .row.row-characteristics
+          .col-sm-6.col-md-6
+            .row
+              .col-sm-2.col-md-2.icon-container
+                =icon("public-sector/code-icon")
+              .col-sm-10
+                %h4.point-title
+                  Code collaboratively
+                %p.point-description
+                  Create a culture of collaboration where developers can easily contribute ideas through merge request and get feedback through inline commenting and discussions.
+          .col-sm-6.col-md-6
+            .row
+              .col-sm-2.col-md-2.icon-container
+                =icon("public-sector/settings-icon")
+              .col-sm-10
+                %h4.point-title
+                  Integrate with existing tools
+                %p.point-description
+                  GitLab can easily fit into your existing workflow. It integrates with dozens of external tools, such as Slack, JIRA, Jenkins and many more.
+        .row.row-characteristics
+          .col-sm-6.col-md-6
+            .row
+              .col-sm-2.col-md-2.icon-container
+                =icon("public-sector/checklist-icon")
+              .col-sm-10
+                %h4.point-title
+                  Improve software quality
+                %p.point-description
+                  Add quality control to your development process with automated testing. GitLab’s integrated continuous integration (CI) tool is fast and scalable, allowing your team can test every commit.
+          .col-sm-6.col-md-6
+            .row
+              .col-sm-2.col-md-2.icon-container
+                =icon("public-sector/security-icon")
+              .col-sm-10
+                %h4.point-title
+                  Enforce security standards
+                %p.point-description
+                  GitLab Enterprise Edition gives admins more control over user and workflow management. Enforce workflow guidelines and security best practices without disrupting developer productivity.
+        .row.row-characteristics
+          .col-sm-6.col-md-6
+            .row
+              .col-sm-2.col-md-2.icon-container
+                =icon("public-sector/rocket-icon")
+              .col-sm-10
+                %h4.point-title
+                  Accelerate delivery
+                %p.point-description
+                  Automate your deployments to reduce error rates and accelerate delivery. GitLab Enterprise Edition comes with advanced continuous delivery (CD) features to enable your team to test, build, and deploy code.
+          .col-sm-6.col-md-6
+            .row
+              .col-sm-2.col-md-2.icon-container
+                =icon("public-sector/support-icon")
+              .col-sm-10
+                %h4.point-title
+                  Take advantage of premium support
+                %p.point-description
+                  Stay focused on your products and let us help you with your onboarding, upgrading, and troubleshooting needs. For teams that are new to Git or Continuous Integration, Premium Support gives you access to training workshops.
+
+.page-container.logos-container
+  .container
+    %h2
+      Join these public sector organizations and start collaborating on code.
+    .row.logos
+      .col-sm-8.col-md-8.col-sm-offset-2.col-md-offset-2
+        .row
+          .col-sm-2.col-md-2.logo-container
+            = icon("public-sector/us-dept-of-state-logo", 'center-svg')
+          .hidden-xs.hidden-sm.col-md-3.navy-logo.logo-container
+            = icon("public-sector/us-navy-logo", 'center-svg', width: 160)
+          .hidden-md.hidden-lg.col-sm-3.navy-logo.logo-container
+            = icon("public-sector/us-navy-logo", 'center-svg', width: 100)
+          .col-sm-2.col-md-2.logo-container
+            = icon("public-sector/us-dept-of-homeland-security-logo", 'center-svg')
+          .col-sm-3.col-md-3.logo-container
+            = icon("public-sector/us-air-force-logo", 'center-svg', width: 110)
+          .col-sm-2.col-md-2
+            = icon("public-sector/us-army-logo", 'center-svg')
+    .row.logos
+      .col-sm-8.col-sm-offset-2
+        .row
+          .col-sm-3.col-md-3.logo-container
+            = icon("public-sector/nasa-logo", 'center-svg', width: 200)
+          .hidden-xs.hidden-sm.col-md-4.logo-container
+            = icon("public-sector/upmc-logo", 'center-svg', width: 200)
+          .hidden-lg.hidden-md.col-sm-4.logo-container
+            = icon("public-sector/upmc-logo", 'center-svg', width: 120)
+          .col-sm-2.col-md-2.logo-container
+            = icon("public-sector/federal-reserve-of-kansas-city-logo", 'center-svg')
+          .col-sm-3.col-md-3
+            = icon("public-sector/university-of-michigan-logo", 'center-svg')
+    .row.logos
+      .col-sm-8.col-md-8.col-sm-offset-2.col-md-offset-2
+        %h4
+          Available on the GSA Schedule and NASA SEWP V.
+    .row.logos
+      .col-sm-8.col-md-8.col-sm-offset-2.col-md-offset-2
+        .row
+          .hidden-xs.hidden-sm.col-md-6.pull-left
+            = icon("public-sector/gsa-schedule-logo", 'pull-right', width: 200)
+          .hidden-xs.hidden-sm.col-md-6.pull-right
+            = icon("public-sector/sewp-v-nasa-logo", 'pull-left', width: 200)
+        .row
+          .hidden-md.hidden-lg.col-xs-12.logo-container
+            = icon("public-sector/gsa-schedule-logo", 'center-svg', width: 200)
+        .row
+          .hidden-md.hidden-lg.col-xs-12.logo-container
+            = icon("public-sector/sewp-v-nasa-logo", 'center-svg', width: 200)
+        
+
+
+.page-container.form-container
+  .container
+    %h2
+      Contact GitLab’s Public Sector Sales team
+    .row
+      .col-sm-12.col-md-12.col-lg-10.col-sm-offset-0.col-md-offset-0.col-lg-offset-1
+        .row
+          .col-xs-12.col-sm-12.col-md-8.col-lg-8.form-column
+            %script{src: "//app-ab13.marketo.com/js/forms2/js/forms2.min.js"}
+            %form#mktoForm_1411
+            :javascript
+              MktoForms2.loadForm("//app-ab13.marketo.com", "194-VVC-221", 1411, function(form) {
+                form.onSuccess(function(values, followUpUrl) {
+
+                  form.getFormElem().hide();
+                  document.getElementById('confirmform').style.visibility = 'visible';
+
+                  dataLayer.push({event: 'mktoLead', mktoFormId: form.getId()});
+                  return false;
+                });
+                function getgacid() {
+                  try {
+                    var tracker = ga.getAll()[0];
+                    return tracker.get('clientId');
+                  } catch (e) {
+                    return 'n/a';
+                  }
+                }
+                form.vals({
+                  'gacid': getgacid()
+                });
+              });
+            #confirmform{style: "visibility:hidden;"}
+              %p Submission received! We'll be in contact shortly.
+          .hidden-xs.hidden-sm.col-sm-4.col-md-4.col-lg-4.fed-info
+            %h4
+              GitLab Inc. Federal information
+            .gitlab-list-fed-info
+              %ul
+                %li
+                  %b
+                    Federal Tax ID: 
+                  47-1861035
+                %li
+                  %b
+                    DUNS Number: 
+                  087987115
+                %li
+                  %b
+                    CAGE Code: 
+                  7NJT9
+                %li
+                  %b
+                    NAICS Code: 
+                  511210
+                %li
+                  %b
+                    GSA Schedule Number: 
+                  GS35F186BA
+            %h4
+              Export Control Classification
+            .gitlab-list-fed-info
+              %ul
+                %li
+                  %b
+                    (ECCN): 
+                  5D002.c.1
+                %li
+                  %b
+                    (CCATS): 
+                  G163509
+        .row
+          .visible-xs.visible-sm.col-sm-12.fed-info
+            %h4
+              GitLab Inc. Federal information
+            .gitlab-list-fed-info
+              %ul
+                %li
+                  %b
+                    Federal Tax ID: 
+                  47-1861035
+                %li
+                  %b
+                    DUNS Number: 
+                  087987115
+                %li
+                  %b
+                    CAGE Code: 
+                  7NJT9
+                %li
+                  %b
+                    NAICS Code: 
+                  511210
+                %li
+                  %b
+                    GSA Schedule Number: 
+                  GS35F186BA
+            %h4
+              Export Control Classification
+            .gitlab-list-fed-info
+              %ul
+                %li
+                  %b
+                    (ECCN): 
+                  5D002.c.1
+                %li
+                  %b
+                    (CCATS): 
+                  G163509
\ No newline at end of file

source/roi/index.html.haml

@@ -66,7 +66,7 @@ extra_js:
                   %br
                   Total
               %tbody
-                - data.comparisons.features.each do |feature|
+                - data.features.features.each do |feature|
                   - if feature.key?("roi_case")
                     %tr
                       %td.include

source/stylesheets/_sandwich-page-layout.scss

@@ -307,7 +307,6 @@
     }
     a {
-      color: inherit;
       text-decoration: underline;
       &:hover {

source/stylesheets/_variables.scss

@@ -151,7 +151,7 @@ $features-semi-transparent-gray: rgba(180, 180, 180, .15);
 $features-semi-transparent-gray-link: rgba(180, 180, 180, .50);
 $features-semi-transparent-black: rgba(12, 12, 12, .47);
 $features-semi-transparent-purple: rgba(107, 79, 187, .50);
-$features-barely-transparent-white: rgba(255, 255, 255, .5);
+$features-barely-transparent-white: rgba(255, 255, 255, .75);
 $features-gray-light-barely-transparent: rgba(170, 170, 170, .5);
 $features-gallery-background-gradient-begin: #6b4fbb;
 $features-gallery-background-gradient-middle: #5942a0;
@@ -168,6 +168,10 @@ $linkedin-bg: #007bb5;
 $dropdown-events-text-color: #626262;
 // features pages
+// purple title container gradient
+$purple-section-gradient-from: #654ca7;
+$purple-section-gradient-to: #3c257b;
+
 $wordmark-text-color: $color-white;
 $wordmark-secondary-text-color: #ccc;
 $what-is-bg: #33373c;
@@ -178,6 +182,5 @@ $steps-link-color: $color-primary-alt;
 // issue bash pages
 $bash-label-border-color: #808080;
-// purple title container gradient
-$purple-section-gradient-from: #654ca7;
-$purple-section-gradient-to: #3c257b;
+// Federal landing site
+$point-title-color: #6b4fb9;

source/stylesheets/features-v2.css.scss

@@ -5,6 +5,7 @@
 .landing-container {
   background: url("/images/feature_page/hero-background-overlay-features-page-v2.jpg") center center no-repeat;
   background-size: cover;
+  padding-top: 70px;
 }
 .video-button {
@@ -39,7 +40,7 @@
 .feature-contents,
 .feature-contents-white {
   a {
-    color: $color-secondary;
+    color: $color-secondary-alt;
     font-size: 16px;
     text-align: center;
     cursor: pointer;
@@ -94,3 +95,45 @@
     margin-top: 50px;
   }
 }
+
+.features-description {
+  display: flex;
+  flex-wrap: wrap;
+
+  .feature-container {
+    padding: 20px 10px;
+  }
+}
+
+.qnav {
+  background: $color-primary;
+  position: fixed;
+  width: 100%;
+  border: 0;
+  border-radius: 0;
+  min-height: 0;
+  z-index: 100;
+  transition: all .5s ease;
+}
+
+.qnav2 {
+  background: $color-primary-alt;
+}
+
+.nav-justified > li {
+  > a {
+    color: $color-white;
+    border-radius: 0;
+  }
+
+  > a:hover,
+  &.active > a,
+  &.active > a:hover {
+    background: $color-primary;
+  }
+}
+
+
+.feature-nav {
+  width: 700px;
+}

source/stylesheets/public-sector.css.scss

+@import "vendor/bootstrap/bootstrap/variables";
+@import "variables";
+
+$distros-size: 5;
+$padding-container: 80px;
+
+.landing-header {
+  position: relative;
+  overflow: hidden;
+
+  &::after {
+    background-image: linear-gradient(to right, $purple-section-gradient-from, $purple-section-gradient-to 100%);
+    position: absolute;
+    content: "";
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+  }
+
+  h1 {
+    font-size: 46px;
+    font-weight: 300;
+    margin: 0;
+    color: $color-white;
+  }
+
+  h2 {
+    color: $blueish-gray;
+    font-weight: 300;
+    font-size: 22px;
+  }
+
+  .container {
+    position: relative;
+    z-index: 99;
+  }
+
+  > svg {
+    position: absolute;
+    left: -100px;
+    right: -100px;
+    top: -25%;
+    min-height: 150%;
+    min-width: 120%;
+    z-index: 9;
+    fill: $color-primary;
+    opacity: .5;
+  }
+}
+
+.landing-content {
+  padding: 20px 0;
+  text-align: center;
+  color: $color-white;
+
+  @media (min-width: $screen-md-min) {
+    padding: $padding-container 0;
+  }
+}
+
+.summary-container {
+  background: $body-bg;
+
+  .summary-title {
+    margin-top: 40px;
+    margin-bottom: 40px;
+    color: $color-primary;
+  }
+
+  .description {
+    max-width: 970px;
+    margin: 0 auto;
+    font-size: 18px;
+    color: $text-color-light;
+  }
+
+  .btn {
+    font-size: 18px;
+    padding: 12px 20px;
+    margin: 0;
+    line-height: 1em;
+    margin-top: 40px;
+  }
+
+  @media (max-width: $screen-xs-max) {
+    padding-bottom: 80px;
+  }
+}
+
+.characteristics-container {
+  background: $color-white;
+  border-top: 1px solid $border-color;
+  padding-top: $padding-container;
+
+  .point-title {
+    color: $point-title-color;
+    font-size: 20px;
+  }
+
+  .point-description {
+    font-size: 16px;
+    color: $text-color-light;
+    margin-bottom: 0;
+  }
+
+  .icon-container {
+    svg {
+      margin-left: 40px;
+      margin-top: 5px;
+      width: 32px;
+      height: 32px;
+      fill: $color-secondary;
+    }
+  }
+
+  .row-characteristics {
+    margin-bottom: 80px;
+  }
+
+  @media (max-width: $screen-md-max) {
+    .icon-container {
+      svg {
+        margin-left: 0;
+      }
+    }
+  }
+
+  @media (max-width: $screen-xs-max) {
+    .col-sm-6 {
+      padding: 0 30px;
+      margin-bottom: 80px;
+    }
+
+    .row-characteristics {
+      margin-bottom: 0;
+    }
+
+    .icon-container {
+      svg {
+        margin-left: 0;
+        margin-top: 5px;
+      }
+    }
+  }
+
+}
+
+.logos-container {
+  background-image: linear-gradient(90deg, $color-primary 0%, $link-code-color 100%);
+  padding-top: $padding-container;
+
+  h2 {
+    color: $color-secondary-alt;
+    text-align: center;
+    font-weight: 400;
+  }
+
+  h4 {
+    color: $color-white;
+    font-size: 20px;
+    text-align: center;
+    font-weight: 500;
+  }
+
+  .logos {
+    margin-top: 40px;
+  }
+
+  @media (max-width: $screen-sm-max) {
+    .logo-container {
+      padding-bottom: 40px;
+    }
+  }
+}
+
+.form-container {
+  padding-top: $padding-container;
+
+  h2 {
+    color: $color-primary;
+    text-align: center;
+    margin-bottom: 50px;
+  }
+
+  h4 {
+    color: $color-primary-alt;
+    font-size: 20px;
+  }
+
+  .gitlab-list-fed-info ul:first-child {
+    padding-bottom: 40px;
+  }
+
+  .gitlab-list-fed-info ul {
+    list-style: none;
+    padding-left: 0;
+    font-size: 16px;
+
+    > li {
+      margin-bottom: 5px;
+      color: $text-color-light;
+    }
+  }
+
+  @media (max-width: $screen-sm-max) {
+    .form-column {
+      form {
+        margin: 0 auto;
+      }
+    }
+
+    .fed-info {
+      margin-left: 45px;
+    }
+  }
+
+  @media (max-width: $screen-xs-max) {
+    .fed-info {
+      margin-left: 15px;
+    }
+  }
+}
+
+.center {
+  width: 100%;
+  margin: 0 auto;
+}
+
+.center-svg {
+  display: block;
+  margin: auto;
+}
+
+@media(max-width: $screen-sm-max) {
+  .navy-logo {
+    > svg {
+      margin-left: 10px;
+    }
+  }
+
+  .upmc-logo-fix {
+    > svg {
+      margin-left: 20px;
+    }
+  }
+}
+
+@media(max-width: $screen-xs-max) {
+  .navy-logo,
+  .upmc-logo {
+    > svg {
+      margin: 0 auto;
+    }
+  }
+}