Skip to content
Snippets Groups Projects
Commit ddf1982c authored by Marcia Ramos's avatar Marcia Ramos
Browse files

Revert "Merge branch '1379-fix-training-page-readability' into 'master'" 

This reverts merge request !6091
parent 6681b155
No related branches found
No related tags found
No related merge requests found
Pipeline #
Hide whitespace changes
Inline Side-by-side
source/stylesheets/training.css.scss
+ 57
− 114
View file @ ddf1982c
@import "vendor/bootstrap/bootstrap/variables";
@import "variables";
body {
background-color: rgba($color-primary, .23);
}
.training-picture-container {
position: relative;
width: 100%;
min-height: 500px;
overflow: hidden;
background: url("/images/bg/bg_training.png") no-repeat center center;
background-size: cover;
}
.training-overlay {
background: rgba($color-primary, .9);
min-height: 500px;
}
.training-content {
padding-top: 76px;
color: $color-white;
width: 50%;
margin-left: 25%;
li {
text-align: left;
font-size: 15px;
}
h2 {
color: #aaa;
font-weight: 300;
font-size: 24px;
margin-top: 10px;
}
h3 a {
color: $color-secondary-alt;
}
p {
font-size: 18px;
font-weight: normal;
}
h3,h4 {
color: $color-secondary-alt;
}
a {
color: $color-white;
}
.training-block {
border-radius: 3px;
p,ul {
color: $color-white;
}
p {
margin: 0 0 20px;
}
path {
fill: $color-secondary-alt;
}
svg {
margin-top: 25px;
}
@media (min-width: $screen-sm-max) {
svg {
width: 96px;
height: 96px;
}
}
}
a.training-block:hover {
.row {
background-color:rgba(180, 180, 180, 0.15);
border-color: transparent;
border-radius: 3px;
}
}
}
.training-form {
color: $color-white;
margin-top: 25px;
@media (max-width: 1066px) {
margin: 0;
width: 100%;
li {
font-size: 13px;
background-size: cover;
}
.action {
margin: 3% 0% 0 15%;
}
}
}
@import "variables";
body {
background-color: rgba($color-primary, .23);
}
.training-picture-container {
position: relative;
width: 100%;
min-height: 500px;
overflow: hidden;
background: url("/images/bg/bg_training.png") no-repeat center center;
background-size: cover;
}
.training-overlay {
background: rgba($color-primary, .9);
min-height: 500px;
}
.training-content {
padding-top: 76px;
color: $color-white;
width: 50%;
margin-left: 25%;
li {
text-align: left;
font-size: 15px;
}
h1 {
color: $color-white;
font-size: 6rem;
font-weight: 700;
text-transform: uppercase;
}
}
.training-form {
color: $color-white;
margin-top: 25px;
@media (max-width: 1066px) {
margin: 0;
width: 100%;
li {
font-size: 13px;
background-size: cover;
}
.action {
margin: 3% 0% 0 15%;
}
}
}
source/training/gitlab-administrator-training.html.haml
+ 49
− 48
View file @ ddf1982c
---
layout: default
title: GitLab Administrator Training
suppress_header: true
extra_css:
- training.css
---
.wrapper
.training-picture-container
.training-overlay
.training-content
%h1.page-headline.text-center GitLab Administrator Training
%h3.text-center
Training Resources
%h3
%a{href:"https://gitlab-org.gitlab.io/end-user-admin/#/"}GitLab Admin Training Slidedeck
hosted in the corresponding
%a{href:"https://gitlab.com/gitlab-org/end-user-admin"}training project.
%br/
.centered-form.training-form
%script{src: "//app-ab13.marketo.com/js/forms2/js/forms2.min.js"}
%form#mktoForm_1068
:javascript
MktoForms2.loadForm("//app-ab13.marketo.com", "194-VVC-221", 1068, 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 touch shortly.
---
layout: default
title: GitLab Administrator Training
suppress_header: true
extra_css:
- training.css
---
.wrapper
.training-picture-container
.training-overlay
.training-content
%h1.text-center
GitLab Administrator Training
%h3.text-center
Training Resources
%h3
%a{href:"https://gitlab-org.gitlab.io/end-user-admin/#/"}GitLab Admin Training Slidedeck
hosted in the corresponding
%a{href:"https://gitlab.com/gitlab-org/end-user-admin"}training project.
%br/
.centered-form.training-form
%script{src: "//app-ab13.marketo.com/js/forms2/js/forms2.min.js"}
%form#mktoForm_1068
:javascript
MktoForms2.loadForm("//app-ab13.marketo.com", "194-VVC-221", 1068, 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 touch shortly.
source/training/index.html.haml
+ 70
− 82
View file @ ddf1982c
---
layout: default
title: Training
suppress_header: true
extra_css:
- training.css
---
.wrapper
.training-picture-container
.training-overlay
.training-content
%h1.page-headline.text-center Training
%h2.page-subtitle.text-center We organize training workshops to help your organization implement Git and GitLab quickly.
%a.training-block.clearfix{href:"/training/learn-gitlab-with-git.html"}
.row
.col-xs-1
=icon("gitlab-ee/icons/1-platform-icon")
.col-xs-11
%h3 Learning GitLab with Git Basics
%p This workshop focuses on how the GitLab UI works and how to integrate it and Git into your workflow.
%h4 Part 1: GitLab Flow workshop
%p A GitLab flow workshop help your organization develop a good Git workflow
%h4 Part 2: Git workshop
%p A Git workshop covers Git concepts such as committing, branches, merge requests, merge conflicts, tags, cherry-picking, bisecting and rebasing.
%a.training-block.clearfix{href:"/training/gitlab-administrator-training.html"}
.row
.col-xs-1
=icon("gitlab-ee/icons/9-permissions-icon")
.col-xs-11
%h3 GitLab administrator workshop
%p
A GitLab administrator workshop covers:
%ul
%li GitLab architecture overview
%li GitLab fundamentals
%li UI walkthrough
%li Admin panel
%li Admin tasks
%li Backups, troubleshooting
%a.training-block.clearfix{href:"/training/gitlab-ci-training.html"}
.row
.col-xs-1
=icon("gitlab-ee/icons/12-deployment-icon")
.col-xs-11
%h3 GitLab CI
%p This workshop focuses on how GitLab CI works and how to integrate it into your workflow.
%p
%h3 Cost for each workshop is $2,500
%p
Workshops are delivered via web-conferencing and are recorded for up to 20 people.
Each workshop takes approximately 2 hours.
%p
We're open to discussing other materials to cover and other durations.
Please fill out the form below if you are interested.
%br/
.centered-form.training-form
%script{src: "//app-ab13.marketo.com/js/forms2/js/forms2.min.js"}
%form#mktoForm_1068
:javascript
MktoForms2.loadForm("//app-ab13.marketo.com", "194-VVC-221", 1068, 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 touch shortly.
---
layout: default
title: Training
suppress_header: true
extra_css:
- training.css
---
.wrapper
.training-picture-container
.training-overlay
.training-content
%h1.text-center Training
We organize training workshops to help your organization implement Git and GitLab quickly.
%h3
%a{href:"/training/learn-gitlab-with-git.html"}Learning GitLab with Git Basics
%p This workshop focuses on how the GitLab UI works and how to integrate it and Git into your workflow.
%h3 Git workshop
%p A Git workshop covers Git concepts such as committing, branches, merge requests, merge conflicts, tags, cherry-picking, bisecting and rebasing.
%h3 GitLab flow workshop
%p A GitLab flow workshop help your organization develop a good Git workflow
%h3
%a{href:"/training/gitlab-administrator-training.html"} GitLab administrator workshop
%p
A GitLab administrator workshop covers:
%ul
%li GitLab architecture overview
%li GitLab fundamentals
%li UI walkthrough
%li Admin panel
%li Admin tasks
%li Backups, troubleshooting
%h3
%a{href:"/training/gitlab-ci-training.html"}GitLab CI
%p This workshop focuses on how GitLab CI works and how to integrate it into your workflow.
%p
%h3 Cost for each workshop is $2,500
%p
Workshops are delivered via web-conferencing and are recorded for up to 20 people.
Each workshop takes approximately 2 hours.
%p
We're open to discussing other materials to cover and other durations.
Please fill out the form below if you are interested.
%br/
.centered-form.training-form
%script{src: "//app-ab13.marketo.com/js/forms2/js/forms2.min.js"}
%form#mktoForm_1068
:javascript
MktoForms2.loadForm("//app-ab13.marketo.com", "194-VVC-221", 1068, 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 touch shortly.
source/training/learn-gitlab-with-git.html.haml
+ 76
− 75
View file @ ddf1982c
---
layout: default
title: Learn GitLab with Git Basics
suppress_header: true
extra_css:
- training.css
---
.wrapper
.training-picture-container
.training-overlay
.training-content
%h1.page-headline.text-center Learning GitLab with Git Basics
There are two sessions, 90 minutes each. Session 1 is built around re-enforcing how the UI works, and then paralleling that in the command line. Session 2 focuses on Merge Conflicts in the UI and command line and Git/Hub/Lab Flow.
%h3.text-center
Session 1: GitLab UI & Git Command Line (90 Minutes)
%h4
Part 1: The UI (45 minutes)
%h5
TODO: INSERT VIDEO HERE
GitLab is software that allows you to do a lot without having to use the command line. In this session, all participants will work together to commit code with the instructor and understand the GitLab interface through action and practice.
The UI also includes some advanced git features, and we dive into those topics at the end of the first session when we cover branching and what Git is and how Git fits into the GitLab equation.
%h4
Part 2: Command Line (45 minutes)
A core part of using Git and GitLab includes using Git locally on your computer to make changes and push these changes to the server. We use the command line (where Git is born and thrives) to make simple changes to some local files and push them to the server. This mirrors the work we did in the UI in the first session and bridges the gap of how GitLab and Git work together.
%h3.text-center
Session 2: Merge Conflicts & Git Flow (90 minutes)
%h4
Part 1: Simple Merge Conflicts in the UI (60 minutes)
%h5
TODO: INSERT VIDEO HERE
In the second session, we recap how the UI works and then dive into a complex topic: Merge Conflicts. A Majority of this session is focused on dealing with Merge conflicts in the UI and then Mirroring that experience in the command line. Since this topic can be more complex, it is lecture based.
%h4
Part 2: Merge Conflicts in the Command Line & Git Flow (30 minutes)
In the second portion of of the training, we focus on Merge conflicts and how they look and act locally in the command line. Since we already saw basic conflicts via the UI it's not as scary and daunting as they can be at first. Merge Conflicts arise from working with multiple developers and we talk about how to build workflows based on Git Flow, GitHub Flow and GitLab flow with examples of each and how they help to make different types of software development workflows easier.
%h3.text-center
Training Resources
%h3
%a{href:"https://docs.google.com/presentation/d/1G5KAZNvZ_iRpz39jf1MvMzKyaFYclZ0LItHoeinlOpU/edit#slide=id.g153a2ed090_0_57"}Learning GitLab with Git Basics Slidedeck
%h3
%a{href:"https://gitlab.com/gitlab-com-trainings/learning-gitlab-with-git-basics/blob/master/README.md"}Trainer's Guide
%h4
Optional module for <a href="https://www.eclipse.org">Eclipse IDE</a>: <a href="https://gitlab-org.gitlab.io/eclipse-gitlab-slides">GitLab with Eclipse IDE Slidedeck</a> hosted in the corresponding <a href="https://gitlab.com/gitlab-org/eclipse-gitlab-slides">training project</a>.
%br/
.centered-form.training-form
%script{src: "//app-ab13.marketo.com/js/forms2/js/forms2.min.js"}
%form#mktoForm_1068
:javascript
MktoForms2.loadForm("//app-ab13.marketo.com", "194-VVC-221", 1068, 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 touch shortly.
---
layout: default
title: Learn GitLab with Git Basics
suppress_header: true
extra_css:
- training.css
---
.wrapper
.training-picture-container
.training-overlay
.training-content
%h1.text-center
Learning GitLab with Git Basics
There are two sessions, 90 minutes each. Session 1 is built around re-enforcing how the UI works, and then paralleling that in the command line. Session 2 focuses on Merge Conflicts in the UI and command line and Git/Hub/Lab Flow.
%h3.text-center
Session 1: GitLab UI & Git Command Line (90 Minutes)
%h4
Part 1: The UI (45 minutes)
%h5
TODO: INSERT VIDEO HERE
GitLab is software that allows you to do a lot without having to use the command line. In this session, all participants will work together to commit code with the instructor and understand the GitLab interface through action and practice.
The UI also includes some advanced git features, and we dive into those topics at the end of the first session when we cover branching and what Git is and how Git fits into the GitLab equation.
%h4
Part 2: Command Line (45 minutes)
A core part of using Git and GitLab includes using Git locally on your computer to make changes and push these changes to the server. We use the command line (where Git is born and thrives) to make simple changes to some local files and push them to the server. This mirrors the work we did in the UI in the first session and bridges the gap of how GitLab and Git work together.
%h3.text-center
Session 2: Merge Conflicts & Git Flow (90 minutes)
%h4
Part 1: Simple Merge Conflicts in the UI (60 minutes)
%h5
TODO: INSERT VIDEO HERE
In the second session, we recap how the UI works and then dive into a complex topic: Merge Conflicts. A Majority of this session is focused on dealing with Merge conflicts in the UI and then Mirroring that experience in the command line. Since this topic can be more complex, it is lecture based.
%h4
Part 2: Merge Conflicts in the Command Line & Git Flow (30 minutes)
In the second portion of of the training, we focus on Merge conflicts and how they look and act locally in the command line. Since we already saw basic conflicts via the UI it's not as scary and daunting as they can be at first. Merge Conflicts arise from working with multiple developers and we talk about how to build workflows based on Git Flow, GitHub Flow and GitLab flow with examples of each and how they help to make different types of software development workflows easier.
%h3.text-center
Training Resources
%h3
%a{href:"https://docs.google.com/presentation/d/1G5KAZNvZ_iRpz39jf1MvMzKyaFYclZ0LItHoeinlOpU/edit#slide=id.g153a2ed090_0_57"}Learning GitLab with Git Basics Slidedeck
%h3
%a{href:"https://gitlab.com/gitlab-com-trainings/learning-gitlab-with-git-basics/blob/master/README.md"}Trainer's Guide
%h4
Optional module for <a href="https://www.eclipse.org">Eclipse IDE</a>: <a href="https://gitlab-org.gitlab.io/eclipse-gitlab-slides">GitLab with Eclipse IDE Slidedeck</a> hosted in the corresponding <a href="https://gitlab.com/gitlab-org/eclipse-gitlab-slides">training project</a>.
%br/
.centered-form.training-form
%script{src: "//app-ab13.marketo.com/js/forms2/js/forms2.min.js"}
%form#mktoForm_1068
:javascript
MktoForms2.loadForm("//app-ab13.marketo.com", "194-VVC-221", 1068, 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 touch shortly.
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