Commit cd307e02 authored by Tony Kwok's avatar Tony Kwok 💬

Resolved merging and linting issues.

parent eefc28ef
Pipeline #33326071 passed with stages
in 26 minutes and 55 seconds
......@@ -13,10 +13,10 @@
.page-container.product-categories-container.text-center
.container.titles
%h1
Product categories 12322
.gitlab-content-container-full
Product categories
.gitlab-content-container-full.margin-top40
.content
.grid-layout.grid-layout2.margin-top40
.grid-layout.grid-layout2
- data.categories.each do |key, category|
- url = category.alt_link ? category.alt_link : "/product/#{key.gsub('_', '-').downcase}"
- if solution.display_name.downcase === category.stage
......
......@@ -5,6 +5,7 @@ suppress_header: true
extra_css:
- features-v2.css
- release-posts.css
- product.css
---
= partial "includes/stages/stage-page", locals: { solution: data.stages.stages.configure, solution_name: "configure" }
......@@ -5,6 +5,7 @@ suppress_header: true
extra_css:
- features-v2.css
- release-posts.css
- product.css
---
= partial "includes/stages/stage-page", locals: { solution: data.stages.stages.create, solution_name: "create" }
......@@ -5,6 +5,7 @@ suppress_header: true
extra_css:
- features-v2.css
- release-posts.css
- product.css
---
= partial "includes/stages/stage-page", locals: { solution: data.stages.stages.manage, solution_name: "manage" }
......@@ -5,6 +5,7 @@ suppress_header: true
extra_css:
- features-v2.css
- release-posts.css
- product.css
---
= partial "includes/stages/stage-page", locals: { solution: data.stages.stages.monitor, solution_name: "monitor" }
......@@ -5,6 +5,7 @@ suppress_header: true
extra_css:
- features-v2.css
- release-posts.css
- product.css
---
= partial "includes/stages/stage-page", locals: { solution: data.stages.stages.package, solution_name: "package" }
......@@ -5,6 +5,7 @@ suppress_header: true
extra_css:
- features-v2.css
- release-posts.css
- product.css
---
= partial "includes/stages/stage-page", locals: { solution: data.stages.stages.plan, solution_name: "plan" }
......@@ -5,6 +5,7 @@ suppress_header: true
extra_css:
- features-v2.css
- release-posts.css
- product.css
---
= partial "includes/stages/stage-page", locals: { solution: data.stages.stages.release, solution_name: "release" }
......@@ -5,6 +5,7 @@ suppress_header: true
extra_css:
- features-v2.css
- release-posts.css
- product.css
---
= partial "includes/stages/stage-page", locals: { solution: data.stages.stages.secure, solution_name: "secure" }
......@@ -5,6 +5,7 @@ suppress_header: true
extra_css:
- features-v2.css
- release-posts.css
- product.css
---
= partial "includes/stages/stage-page", locals: { solution: data.stages.stages.verify, solution_name: "verify" }
......@@ -807,7 +807,7 @@ iframe {
//// New content container styles to use
// Main container to hold all content below the header
%gitlab-content-container,
.gitlab-content-container {
padding: 100px 200px;
margin: auto;
......@@ -943,7 +943,7 @@ iframe {
// extend gitlab-content-container to use in background-centered containers with full-width
.gitlab-content-container-full {
@extend .gitlab-content-container;
@extend %gitlab-content-container;
padding: 0;
max-width: none;
}
......
......@@ -13,7 +13,7 @@
background: linear-gradient(to right, $features-gallery-background-gradient-begin 0%, $features-gallery-background-gradient-middle 40%, $features-gallery-background-gradient-end 100%);
color: $color-white;
a.learn-more {
a {
color: $color-white;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment