Removed purple-bg & newsletter, cleaned up look, fix ee reported as ce

data/platforms.yml

@@ -117,10 +117,8 @@
                     sudo rcSuSEfirewall2 restart
 - name: raspberrypi2
   long_name: Raspberry PI 2 on Raspbian
-  download_command: |
-                    sudo curl -sS https://packages.gitlab.com/install/repositories/gitlab/raspberry-pi2/script.deb.sh | sudo bash
-  install_commands: |
-                    sudo apt-get install gitlab-ce
+  download_command: sudo curl -sS https://packages.gitlab.com/install/repositories/gitlab/raspberry-pi2/script.deb.sh | sudo bash
+  install_commands: sudo apt-get install gitlab-ce
   install_commands_manual: |
                     curl -LJO https://packages.gitlab.com/gitlab/raspberry-pi2/packages/debian/(wheezy|jessie)/gitlab-ce-XXX.deb/download
                     dpkg -i gitlab-ce-XXX.deb

source/downloads-ee/index.html.haml

 ---
 layout: default
-title: Download GitLab Enterprise Edition (EE)
-purple_bg: true
+title: Install a GitLab Enterprise Edition (EE) Omnibus package in 5 easy steps
 extra_css:
   - downloads.css
 ---
 .wrapper.container
   .row.graphic-menu
-    .col-md-3.hidden-sm.hidden-xs
-      = image_tag "/images/downloads/logo.svg", class: "img-responsive pack-fox"
-      %p.newsletter-preamble
-        Sign up for our monthly newsletter to stay up-to-date with new features, security updates
-        and product releases.
-      %script{src: "//app-ab13.marketo.com/js/forms2/js/forms2.min.js"}
-      %form#mktoForm_1070
-      :javascript
-        MktoForms2.loadForm("//app-ab13.marketo.com", "194-VVC-221", 1070, 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()
-            });
-        });
-    .col-md-9
+    .col-md-10.col-md-offset-1
       .installation-instructions
         %h2.heavy
-          Install a GitLab EE Omnibus package on
+          Step 1: Select Operating System
         .btn-group
           %button.btn.btn-default.dropdown-toggle.btn-lg{"data-toggle" => "dropdown", type: "button"}
             Select Operating System
@@ -48,14 +18,18 @@ extra_css:
           %ul.dropdown-menu{role: "menu"}
             - data.platforms_ee.each do |platform|
               %li
-                %a{href: "##{platform.name}", onclick: "dataLayer.push({event: 'ceDownload', operatingSystem: '#{platform.name}'});"}
+                %a{href: "##{platform.name}", onclick: "dataLayer.push({event: 'eeDownload',operatingSystem: '#{platform.name}'});"}
                   = platform.long_name
       #tabs
         - data.platforms_ee.each do |platform|
           = partial "includes/downloads/platform", locals: { platform: platform, type: "ee" }
       .other-downloads
-        %h5
+        %h2.heavy
+          Other Installation Options
+        %h4.other
           %a{href: "/downloads"} Download GitLab Community Edition
-        %h5
-          %a{href: "https://packages.gitlab.com/gitlab/gitlab-ee"} Browse the packages
-      = partial "includes/downloads/other"
+        %h4
+          %a{href: "https://packages.gitlab.com/gitlab/gitlab-ee"} Browse all GitLab EE installation packages
+        %h4
+          %a{href: "https://docs.gitlab.com/ee/install/requirements.html"} GitLab EE Installation requirements
+        = partial "includes/downloads/other"

source/downloads/index.html.haml

 ---
 layout: default
-title: Download GitLab Community Edition (CE)
-purple_bg: true
+title: Install a GitLab Community Edition (CE) Omnibus package in 5 easy steps
 extra_css:
   - downloads.css
 ---
 .wrapper.container
   .row.graphic-menu
-    .col-md-3.hidden-sm.hidden-xs
-      = image_tag "/images/downloads/logo.svg", class: "img-responsive pack-fox"
-      %p.newsletter-preamble
-        Sign up for our monthly newsletter to stay up-to-date with new features, security updates
-        and product releases.
-      %script{src: "//app-ab13.marketo.com/js/forms2/js/forms2.min.js"}
-      %form#mktoForm_1070
-      :javascript
-        MktoForms2.loadForm("//app-ab13.marketo.com", "194-VVC-221", 1070, 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 Thanks for subscribing!
-    .col-md-9
+    .col-md-10.col-md-offset-1
       .installation-instructions
         %h2.heavy
-          Install a GitLab CE Omnibus package on
+          Step 1: Select Operating System
         .btn-group
           %button.btn.btn-default.dropdown-toggle.btn-lg{"data-toggle" => "dropdown", type: "button"}
             Select Operating System
@@ -56,8 +24,12 @@ extra_css:
         - data.platforms.each do |platform|
           = partial "includes/downloads/platform", locals: { platform: platform, type: "ce" }
       .other-downloads
-        %h5
+        %h2.heavy
+          Other Installation Options
+        %h4.other
           %a{href: "/downloads-ee"} Download GitLab Enterprise Edition
-        %h5
-          %a{href: "https://packages.gitlab.com/gitlab/gitlab-ce"} Browse the packages
-      = partial "includes/downloads/other"
+        %h4
+          %a{href: "https://packages.gitlab.com/gitlab/gitlab-ce"} Browse all GitLab CE installation packages
+        %h4
+          %a{href: "https://docs.gitlab.com/ce/install/requirements.html"} GitLab CE Installation requirements
+        = partial "includes/downloads/other"

source/includes/downloads/other.html.haml

-.other-downloads
-  %h5
-    %a{href: "https://docs.gitlab.com/omnibus/"} Troubleshooting and configuration options in the Omnibus documentation
-  %h5
-    %a{href: "/installation/"} Alternative installation methods
-  %h5
-    %a{href: "/aws"} AWS AMI with a preloaded Omnibus package
-  %h5
-    %a{href: "https://mirror.tuna.tsinghua.edu.cn/help/gitlab-ce/"} Chinese GitLab CE mirror hosted by TUNA
-  %h5
-    %a{href: "/update"} Update a GitLab instance
-  %h5
-    %a{href: "https://docs.gitlab.com/ce/install/requirements.html"} Installation requirements
-  %h5
-    %a{href: "https://docs.gitlab.com/runner/install/"} Install GitLab Runner
-  %h5
-    %a{href: "https://about.gitlab.com/products/#compare-options"} Compare GitLab CE with EE
+%h4
+  %a{href: "/installation/"} Alternative installation methods
+%h4
+  %a{href: "https://docs.gitlab.com/runner/install/"} Install GitLab Runner
+%h4
+  %a{href: "/update"} Update a GitLab instance
+%h4
+  %a{href: "/aws"} AWS AMI with a preloaded Omnibus package
+%h4
+  %a{href: "https://mirror.tuna.tsinghua.edu.cn/help/gitlab-ce/"} Chinese GitLab CE mirror hosted by TUNA
+%h4
+  %a{href: "https://docs.gitlab.com/omnibus/"} Troubleshooting and configuration options in the Omnibus documentation
+%h4
+  %a{href: "https://about.gitlab.com/products/#compare-options"} Compare GitLab CE with EE

source/includes/downloads/platform.haml

 .tab{id: platform.name}
   .tab-step
+    %h2
+      Step 2: Install and configure the necessary dependencies
     %p
       %i.fa.fa-info-circle.green
       Check if your server meets
       %a.green{href: "http://doc.gitlab.com/#{type}/install/requirements.html"} the hardware requirements.
       GitLab packages are built for 64bit systems. For 32bit OS, consider
       %a.green{href: "https://about.gitlab.com/installation/"} alternative installation methods.
-  .tab-step
-    %h4
-      1. Install and configure the necessary dependencies
     %p
       If you install Postfix to send email please select 'Internet Site' during setup.
       Instead of using Postfix you can also use Sendmail or
       %a{href: "https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/smtp.md"} configure a custom SMTP server
       and
       %a{href: "https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/smtp.md#smtp-on-localhost"} configure it as an SMTP server.
-    %p
-      On Centos 6 and 7, the commands below will also open HTTP and SSH access in the system firewall.
+    - if platform.name == 'centos6' or platform.name == 'centos7'
+      %p
+        %i.fa.fa-info-circle.green
+        On Centos 6 and 7, the commands below will also open HTTP and SSH access in the system firewall.
     %p
       %pre
         = platform.dependency_commands
         = platform.firewall_open
   .tab-step
-    %h4
-      2. Add the GitLab package server and install the package
+    %h2
+      Step 3: Add the GitLab package server and install the package
     %p
       %pre
         = "#{platform.download_command}\n#{platform.install_commands}"
@@ -36,24 +37,25 @@
       %pre
         = platform.install_commands_manual
   .tab-step
-    %h4
-      3. Configure and start GitLab
+    %h2
+      Step 4: Configure and start GitLab
     %p
       %pre
         sudo gitlab-ctl reconfigure
   .tab-step
-    %h4
-      4. Browse to the hostname and login
+    %h2
+      Step 5: Browse to the hostname and login
     :markdown
       On your first visit, you'll be redirected to a password reset screen to provide the password for the initial administrator account. Enter your desired password and you'll be redirected back to the login screen.
       The default account's username is **root**. Provide the password you created earlier and login. After login you can change the username if you wish.
   .tab-step
+    %h2
+      Troubleshooting and configuration options
     %p
       %i.fa.fa-info-circle.green
-      For configuration and troubleshooting options please see the
       %a.green{href: "http://doc.gitlab.com/omnibus/"}
-        Omnibus GitLab documentation
+        Troubleshooting and configuration options in the Omnibus GitLab documentation
       %br
       %i.fa.fa-info-circle.green
       If you are located in China, try using

source/stylesheets/_variables.scss

@@ -3,6 +3,8 @@ $color-white-alt: #d9ccff;
 $color-transparent: rgba(0, 0, 0, 0);
 $color-dark: #000;
+$color-body: #333;
+$color-purple: rgb(107, 79, 187);
 $color-gray: #777;
 $color-gray-medium: #ddd;

source/stylesheets/downloads.css.scss

 @import "variables";
+.downloads,
+.downloads-ee {
+  font-size: 18px;
+
+  .footer {
+    margin-top: 100px;
+  }
+}
+
+h2 {
+  margin: 35px 0 20px;
+}
+
 p a {
   text-decoration: underline;
 }
@@ -24,14 +37,26 @@ p a {
   color: $color-white;
 }
-.other-downloads a {
-  color: rgba($color-white, .8);
+.other-downloads {
+  margin-top: 20px;
+
+  .other {
+    margin-bottom: 20px;
+
+    a {
+      font-weight: 800;
+      font-size: 22px;
+      color: $color-purple;
+    }
+  }
 }
 pre {
   background: $downloads-code-color;
   border: 0;
   color: $color-white;
+  font-size: 14px;
+  padding: 12px;
 }
 .simple-header {
@@ -40,17 +65,8 @@ pre {
 .tab-step {
   margin: 20px 0;
-  padding: 12px;
   border-radius: 5px;
   background-color: rgba($color-white, .05);
-
-  a {
-    color: $downloads-step-link-color;
-  }
-
-  p {
-    color: $downloads-step-color;
-  }
 }
 .newsletter-preamble {