Skip to content
Snippets Groups Projects
Commit c47a0dc6 authored by Jeroen Nijhof's avatar Jeroen Nijhof
Browse files

Merge branch 'master' into 'fix-nginx-and-generate' 

# Conflicts:
#   generate.rb
parents bdd4eca3 f263c56c
No related branches found
No related tags found
1 merge request!41Fix nginx templator for ssl and change the quiet option for pull
Hide whitespace changes
Inline Side-by-side
generate.rb
+ 1
− 1
View file @ c47a0dc6
@@ -141,4 +141,4 @@ else
$progress = StringIO.new
end
 
main
main
\ No newline at end of file
index.html
+ 1
− 2
View file @ c47a0dc6
@@ -9,8 +9,7 @@
 
<link rel="shortcut icon" href="/favicon.ico">
<link rel="icon" href="/favicon.ico" sizes="32x32">
<link rel="stylesheet" href="/stylesheets/styles.css">
<link rel="stylesheet" href="/stylesheets/pygment_trac.css">
<link rel="stylesheet" href="/stylesheets/landing.css">
<link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600" rel="stylesheet">
 
<!--[if lt IE 9]>
stylesheets/landing.css 0 → 100644
+ 181
− 0
View file @ c47a0dc6
/* http://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126
License: none (public domain)
*/
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}
body {
line-height: 1;
}
ol, ul {
list-style: none;
}
blockquote, q {
quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
/* docs.gitlab.com */
body {
font-family: "Source Sans Pro", sans-serif;
font-size: 16px;
line-height: 1.6;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
background-color: #f9f9f9;
}
#header {
padding: 75px 35px 200px 35px;
background-color: #34373c;
text-align: center;
color: #fff;
}
h1 {
font-size: 36px;
font-weight: 300;
margin-top: 20px;
}
h1 a {
color: #fff;
text-decoration: none;
}
#header input {
margin-top: 50px;
font-family: "Source Sans Pro", sans-serif;
border-radius: 0px;
webkit-border-radius: 0px;
-moz-border-radius: 0px;
font-size: 20px;
}
.st-ui-search-input, .st-default-search-input {
width: 300px !important;
height: 35px !important;
padding: 15px 15px 15px 40px !important;
}
.st-ui-search-input, .st-default-search-input, span.st-ui-search-icon {
background-size: 16px 16px !important;
background-position: 15px 25px !important;
}
.topics {
text-align: center;
position: relative;
top: -100px;
margin: 0 35px;
}
.topics li {
display: inline-block;
background-color: #fff;
border: 1px solid rgb(215, 215, 215);
vertical-align: top;
margin-bottom: 50px;
}
.circle {
border-radius: 50%;
width: 56px;
height: 56px;
text-align: center;
font-size: 24px;
font-weight: 900;
line-height: 2.35;
color: #fff;
position: relative;
top: -28px;
left: 112px;
}
.topic-ee {
margin: 0 20px;
}
.topic-ce .circle {
background-color: rgb(1, 136, 101);
}
.topic-ee .circle {
background-color: rgb(25, 112, 169);
}
.topic-omnibus .circle {
background-color: rgb(107, 79, 187);
}
.topics li a, .topics li a:visited {
text-decoration: none;
}
.topics li a h2, .topics li a:visited h2 {
height: 70px;
margin-bottom: 25px;
}
.topic-ce h2 {
color: rgb(1, 120, 85);
}
.topic-ee h2 {
color: rgb(9, 96, 153);
}
.topic-omnibus h2 {
color: rgb(107, 79, 187);
}
.topics li a p, .topics li a:visited p {
color: #553a3a;
vertical-align: bottom;
}
.topics li .wrapper {
padding: 0px 35px 40px;
width: 280px;
height: 240px;
}
.topics li h2 {
text-align: center;
font-size: 21px;
}
stylesheets/styles.css
+ 278
− 128
View file @ c47a0dc6
@import url(https://fonts.googleapis.com/css?family=Roboto:300,700,300italic,700italic,400,400italic);
 
/* http://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126
License: none (public domain)
*/
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}
body {
line-height: 1;
padding: 50px;
font: 15px/1.4 'Roboto', "Helvetica Neue", Helvetica, Arial, sans-serif;
color: #514b4b;
font-weight: 400;
}
h1, h2, h3, h4, h5, h6 {
color: #222;
margin: 0 0 20px;
}
p, ul, ol, table, pre, dl {
margin: 0 0 20px;
}
h1, h2, h3 {
line-height: 1.1;
}
h1 {
font-size: 28px;
}
h2 {
color: #393939;
}
h3, h4, h5, h6 {
color: #494949;
}
a {
color: #39c;
font-weight: 400;
text-decoration: none;
}
a:hover {
color: #069;
}
a small {
font-size: 11px;
color: #777;
margin-top: -0.6em;
display: block;
}
a:hover small {
color: #777;
}
.wrapper {
width: 860px;
margin: 0 auto;
}
ol, ul {
list-style: none;
blockquote {
border-left: 1px solid #e5e5e5;
margin: 0;
padding: 0 0 0 20px;
font-style: italic;
}
blockquote, q {
quotes: none;
code, pre {
font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace;
color: #333;
font-size: 14px;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
pre {
padding: 8px 15px;
background: #f8f8f8;
border-radius: 5px;
border: 1px solid #e5e5e5;
overflow-x: auto;
}
table {
border-collapse: collapse;
border-spacing: 0;
width: 100%;
border-collapse: collapse;
}
th, td {
text-align: left;
padding: 5px 10px;
border-bottom: 1px solid #e5e5e5;
}
 
/* docs.gitlab.com */
dt {
color: #444;
font-weight: 700;
}
 
body {
font-family: "Source Sans Pro", sans-serif;
font-size: 16px;
line-height: 1.6;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
background-color: #f9f9f9;
}
#header {
padding: 75px 35px 200px 35px;
background-color: #34373c;
text-align: center;
color: #fff;
th {
color: #444;
}
 
h1 {
font-size: 36px;
font-weight: 300;
margin-top: 20px;
img {
max-width: 100%;
border: 1px solid rgb(240, 240, 240);
padding: 5px;
margin: 5px;
}
 
h1 a {
color: #fff;
text-decoration: none;
header {
width: 270px;
float: left;
position: fixed;
}
header ul {
list-style: none;
height: 40px;
padding: 0;
background: #eee;
background: linear-gradient(top, #f8f8f8 0%, #ddd 100%);
border-radius: 5px;
border: 1px solid #d2d2d2;
box-shadow: inset #fff 0 1px 0, inset rgba(0,0,0,0.03) 0 -1px 0;
width: 270px;
}
 
#header input {
margin-top: 50px;
font-family: "Source Sans Pro", sans-serif;
border-radius: 0px;
webkit-border-radius: 0px;
-moz-border-radius: 0px;
font-size: 20px;
header li {
width: 89px;
float: left;
border-right: 1px solid #d2d2d2;
height: 40px;
}
 
.st-ui-search-input, .st-default-search-input {
width: 300px !important;
height: 35px !important;
padding: 15px 15px 15px 40px !important;
header li:first-child a {
border-radius: 5px 0 0 5px;
}
 
.st-ui-search-input, .st-default-search-input, span.st-ui-search-icon {
background-size: 16px 16px !important;
background-position: 15px 25px !important;
header li:last-child a {
border-radius: 0 5px 5px 0;
}
 
.topics {
header ul a {
line-height: 1;
font-size: 11px;
color: #999;
display: block;
text-align: center;
position: relative;
top: -100px;
margin: 0 35px;
padding-top: 6px;
height: 34px;
}
 
.topics li {
display: inline-block;
background-color: #fff;
border: 1px solid rgb(215, 215, 215);
vertical-align: top;
margin-bottom: 50px;
header ul a:hover {
color: #999;
background: linear-gradient(top, #fff 0%, #ddd 100%);
}
 
.circle {
border-radius: 50%;
width: 56px;
height: 56px;
text-align: center;
font-size: 24px;
font-weight: 900;
line-height: 2.35;
color: #fff;
position: relative;
top: -28px;
left: 112px;
header ul a:active {
box-shadow: inset 0 2px 2px 0 #ddd;
}
 
.topic-ee {
margin: 0 20px;
strong {
color: #222;
font-weight: 700;
}
 
.topic-ce .circle {
background-color: rgb(1, 136, 101);
header ul li + li {
width: 88px;
border-left: 1px solid #fff;
}
 
.topic-ee .circle {
background-color: rgb(25, 112, 169);
header ul li + li + li {
border-right: none;
width: 89px;
}
 
.topic-omnibus .circle {
background-color: rgb(107, 79, 187);
header ul a strong {
font-size: 14px;
display: block;
color: #222;
}
 
.topics li a, .topics li a:visited {
text-decoration: none;
section {
width: 500px;
float: right;
padding-bottom: 50px;
}
small {
font-size: 11px;
}
hr {
border: 0;
background: #e5e5e5;
height: 1px;
margin: 0 0 20px;
}
footer {
width: 270px;
float: left;
position: fixed;
bottom: 50px;
}
 
.topics li a h2, .topics li a:visited h2 {
height: 70px;
margin-bottom: 25px;
@media print, screen and (max-width: 960px) {
div.wrapper {
width: auto;
margin: 0;
}
header, section, footer {
float: none;
position: static;
width: auto;
}
header {
padding-right: 320px;
}
section {
border: 1px solid #e5e5e5;
border-width: 1px 0;
padding: 20px 0;
margin: 0 0 20px;
}
header a small {
display: inline;
}
header ul {
position: absolute;
right: 50px;
top: 52px;
}
}
 
.topic-ce h2 {
color: rgb(1, 120, 85);
@media print, screen and (max-width: 720px) {
body {
word-wrap: break-word;
}
header {
padding: 0;
}
header ul, header p.view {
position: static;
}
pre, code {
word-wrap: normal;
}
}
 
.topic-ee h2 {
color: rgb(9, 96, 153);
@media print, screen and (max-width: 480px) {
body {
padding: 15px;
}
header ul {
display: none;
}
}
 
.topic-omnibus h2 {
color: rgb(107, 79, 187);
@media print {
body {
padding: 0.4in;
font-size: 12pt;
color: #444;
}
}
 
.topics li a p, .topics li a:visited p {
color: #553a3a;
vertical-align: bottom;
img.profile {
padding: 5px;
background: white;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15);
width: 210px;
height: 210px;
border: 1px solid #DDD;
}
 
.topics li .wrapper {
padding: 0px 35px 40px;
width: 280px;
height: 240px;
.software-tiles {
margin: 0;
padding: 0;
}
 
.topics li h2 {
.software-tiles li {
list-style-type: none;
margin: 0;
display: table-cell;
width: 1%;
text-align: center;
font-size: 21px;
background: #444;
border: 2px solid #fff;
}
.software-tiles li a {
padding: 120px 20px;
font-size: 24px;
color: #fff;
letter-spacing: -1px;
display: inline-block;
font-weight: 300;
}
.software-tiles .software-ce {
background: #56f;
}
.software-tiles .software-ee {
background: #f64;
}
.software-tiles .software-ci {
background: #4B5;
}
.software-tiles .software-omnibus {
background: #548;
}
.software-tiles li:hover {
background-color: #63a;
transition: background-color 300ms linear;
}
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