Merge branch 'features/smaller' into gh-pages
Conflicts: css/print.css css/style.css index.html
Daniel Kummer
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
.idea/
|
||||
275
css/print.css
@ -1,275 +0,0 @@
|
||||
/*---------------------------------------- Text */
|
||||
|
||||
body {
|
||||
font-family: Georgia, Times New Roman, Times, serif;
|
||||
font-weight: bold;
|
||||
font-size: 30px;
|
||||
text-align: center;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
header {
|
||||
height: 400px;
|
||||
border-bottom: 1px solid #698b91
|
||||
}
|
||||
|
||||
footer {
|
||||
display: none;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 120px;
|
||||
font-weight: normal;
|
||||
margin: 0;
|
||||
font-family: 'Sansita One', cursive;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
h2 {
|
||||
font-size: 80px;
|
||||
font-weight: normal;
|
||||
margin: 0;
|
||||
font-family: 'Sansita One', cursive;
|
||||
}
|
||||
|
||||
h3 {
|
||||
font-size: 40px;
|
||||
font-weight: normal;
|
||||
margin: 0;
|
||||
font-family: 'Sansita One', cursive;
|
||||
}
|
||||
|
||||
p {
|
||||
width: 95%;
|
||||
margin: 20px auto;
|
||||
text-shadow: 0 2px 1px #fff;
|
||||
}
|
||||
|
||||
a, a:visited {
|
||||
font-weight: bold;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
ul {
|
||||
list-style: none;
|
||||
margin-left: 0;
|
||||
padding-left: 1em;
|
||||
text-indent: -1em;
|
||||
text-shadow: 0 2px 1px #fff;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
ul li:before {
|
||||
content: "\2605\a0"
|
||||
}
|
||||
|
||||
/** coding block */
|
||||
blockquote {
|
||||
text-align: left;
|
||||
margin: 10px auto;
|
||||
background: #131420;
|
||||
border-bottom: 2px solid #30334F;
|
||||
border-right: 2px solid #30334F;
|
||||
border-radius: 10px;
|
||||
padding: 5px 20px;
|
||||
color: white;
|
||||
font-family: menlo, monospace;
|
||||
}
|
||||
|
||||
code {
|
||||
font-style: normal;
|
||||
padding-left: 5px;
|
||||
border-radius: 10px;
|
||||
color: white;
|
||||
padding: 5px 15px;
|
||||
font-family: menlo, monospace;
|
||||
background: #131420;
|
||||
text-shadow: none;
|
||||
font-size: 0.8em;
|
||||
}
|
||||
|
||||
/*---------------------------------------- Images */
|
||||
|
||||
.initialize {
|
||||
background: url("../img/initialize.png") no-repeat scroll center center transparent;
|
||||
height: 300px;
|
||||
width: 100%;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.lines-small {
|
||||
width: 500px;
|
||||
height: 150px;
|
||||
background-repeat: repeat-y;
|
||||
background: url("../img/lines-small.png");
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.lines-small-end {
|
||||
width: 500px;
|
||||
height: 500px;
|
||||
background-repeat: repeat-y;
|
||||
background: url("../img/lines-small.png");
|
||||
position: absolute;
|
||||
|
||||
}
|
||||
|
||||
.lines-big {
|
||||
width: 500px;
|
||||
height: 5500px;
|
||||
background-repeat: repeat-y;
|
||||
background: url("../img/lines-big.png");
|
||||
position: absolute;
|
||||
left: 697px;
|
||||
|
||||
}
|
||||
|
||||
.lines-open {
|
||||
width: 500px;
|
||||
height: 86px;
|
||||
background: url("../img/lines-open.png");
|
||||
}
|
||||
|
||||
.lines-close {
|
||||
width: 500px;
|
||||
height: 86px;
|
||||
background: url("../img/lines-close.png");
|
||||
}
|
||||
|
||||
.hotfix-end, .hotfix-start, .release-end, .release-start, .feature-end, .feature-start {
|
||||
display: inline-block;
|
||||
background-repeat: no-repeat;
|
||||
background-image: url('../img/flow-sprites.png');
|
||||
background-color: rgba(218, 218, 218, 0.78);
|
||||
border: 2px dashed grey;
|
||||
border-radius: 25px;
|
||||
width: 500px;
|
||||
height: 370px;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
}
|
||||
|
||||
.feature-publish {
|
||||
display: inline-block;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
background-color: rgba(218, 218, 218, 0.78);
|
||||
border: 2px dashed grey;
|
||||
border-radius: 25px;
|
||||
width: 500px;
|
||||
height: 370px;
|
||||
position: relative;
|
||||
|
||||
background-image: url('../img/feature-publish.png');
|
||||
background-position: center;
|
||||
|
||||
}
|
||||
|
||||
.feature-pull {
|
||||
display: inline-block;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
background-color: rgba(218, 218, 218, 0.78);
|
||||
border: 2px dashed grey;
|
||||
border-radius: 25px;
|
||||
width: 500px;
|
||||
height: 370px;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
|
||||
background-image: url('../img/feature-pull.png');
|
||||
background-position: center;
|
||||
|
||||
}
|
||||
|
||||
.hotfix-end {
|
||||
background-position: 0px 0px;
|
||||
}
|
||||
|
||||
.hotfix-start {
|
||||
background-position: 0px -370px;
|
||||
}
|
||||
|
||||
.release-end {
|
||||
background-position: 0px -740px;
|
||||
}
|
||||
|
||||
.release-start {
|
||||
background-position: 0px -1110px;
|
||||
}
|
||||
|
||||
.feature-end {
|
||||
background-position: 0px -1480px;
|
||||
}
|
||||
|
||||
.feature-start {
|
||||
background-position: 0px -1850px;
|
||||
}
|
||||
|
||||
/*---------------------------------------- BLOCKS */
|
||||
|
||||
.col-1 {
|
||||
float: left;
|
||||
width: 600px;
|
||||
}
|
||||
|
||||
.col-2 {
|
||||
float: right;
|
||||
width: 500px;
|
||||
margin-left: 30px;
|
||||
}
|
||||
|
||||
#main {
|
||||
margin: 0 auto;
|
||||
position: relative;
|
||||
width: 1200px;
|
||||
}
|
||||
|
||||
.scrollblock {
|
||||
width: 100%;
|
||||
padding-top: 100px;
|
||||
min-height: 450px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.divider, .accent {
|
||||
text-shadow: none;
|
||||
}
|
||||
|
||||
#title {
|
||||
margin: auto;
|
||||
padding-top: 40px;
|
||||
width: 1150px;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
}
|
||||
|
||||
#author {
|
||||
width: 640px;
|
||||
position: absolute;
|
||||
top: 180px;
|
||||
right: 15%;
|
||||
font-size: 20px;
|
||||
text-align: right;
|
||||
font-style: italic;
|
||||
z-index: 100;
|
||||
}
|
||||
|
||||
.twitter-share-button {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#desc {
|
||||
position: absolute;
|
||||
top: 250px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/*---------------------------------------- Github Banner */
|
||||
#banner {
|
||||
display: none;
|
||||
}
|
||||
|
||||
120
css/style.css
@ -4,9 +4,8 @@ body {
|
||||
background-color: powderblue;
|
||||
font-family: Georgia, Times New Roman, Times, serif;
|
||||
font-weight: bold;
|
||||
font-size: 30px;
|
||||
font-size: 20px;
|
||||
text-align: center;
|
||||
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
@ -26,11 +25,11 @@ footer {
|
||||
-moz-box-shadow: 0px -5px 7px #8db7bd;
|
||||
background-color: #8db7bd;
|
||||
border-top: 1px solid #698b91;
|
||||
position:relative;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 120px;
|
||||
font-size: 100px;
|
||||
font-weight: normal;
|
||||
margin: 0;
|
||||
font-family: 'Sansita One', cursive;
|
||||
@ -40,16 +39,17 @@ h1 {
|
||||
}
|
||||
|
||||
h2 {
|
||||
font-size: 80px;
|
||||
font-size: 60px;
|
||||
font-weight: normal;
|
||||
margin: 0;
|
||||
margin-bottom: 25px;
|
||||
text-shadow: 0 2px 1px #000;
|
||||
color: #FFB000;
|
||||
font-family: 'Sansita One', cursive;
|
||||
}
|
||||
|
||||
h3 {
|
||||
font-size: 40px;
|
||||
font-size: 34px;
|
||||
font-weight: normal;
|
||||
margin: 0;
|
||||
color: #D92B00;
|
||||
@ -64,6 +64,7 @@ p {
|
||||
color: #222438;
|
||||
}
|
||||
|
||||
|
||||
a, a:visited {
|
||||
color: #D92B00;
|
||||
font-weight: bold;
|
||||
@ -102,7 +103,7 @@ code {
|
||||
border-radius: 10px;
|
||||
color: white;
|
||||
padding: 5px 15px;
|
||||
font-family: menlo, monospace;
|
||||
|
||||
background: #131420;
|
||||
text-shadow: none;
|
||||
font-size: 0.8em;
|
||||
@ -112,7 +113,7 @@ code {
|
||||
|
||||
.initialize {
|
||||
background: url("../img/initialize.png") no-repeat scroll center center transparent;
|
||||
height: 300px;
|
||||
height: 244px;
|
||||
width: 100%;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
@ -120,42 +121,48 @@ code {
|
||||
}
|
||||
|
||||
.lines-small {
|
||||
width: 500px;
|
||||
width: 300px;
|
||||
height: 150px;
|
||||
background-repeat: repeat-y;
|
||||
background: url("../img/lines-small.png");
|
||||
position: relative;
|
||||
left: 11px;
|
||||
}
|
||||
|
||||
.lines-small-end {
|
||||
width: 500px;
|
||||
width: 300px;
|
||||
height: 500px;
|
||||
background-repeat: repeat-y;
|
||||
background: url("../img/lines-small.png");
|
||||
position: absolute;
|
||||
left: 361px;
|
||||
|
||||
}
|
||||
|
||||
.lines-big {
|
||||
width: 500px;
|
||||
height: 5500px;
|
||||
width: 300px;
|
||||
height: 4140px;
|
||||
background-repeat: repeat-y;
|
||||
background: url("../img/lines-big.png");
|
||||
position: absolute;
|
||||
left: 697px;
|
||||
left: 360px;
|
||||
|
||||
}
|
||||
|
||||
.lines-open {
|
||||
width: 500px;
|
||||
height: 86px;
|
||||
width: 300px;
|
||||
height: 52px;
|
||||
background: url("../img/lines-open.png");
|
||||
position: relative;
|
||||
left: 11px;
|
||||
}
|
||||
|
||||
.lines-close {
|
||||
width: 500px;
|
||||
height: 86px;
|
||||
width: 300px;
|
||||
height: 52px;
|
||||
background: url("../img/lines-close.png");
|
||||
position: relative;
|
||||
left: 11px;
|
||||
}
|
||||
|
||||
.hotfix-end, .hotfix-start, .release-end, .release-start, .feature-end, .feature-start {
|
||||
@ -165,8 +172,8 @@ code {
|
||||
background-color: rgba(173, 215, 223, 0.8);
|
||||
border: 2px dashed #008098;
|
||||
border-radius: 25px;
|
||||
width: 500px;
|
||||
height: 370px;
|
||||
width: 300px;
|
||||
height: 222px;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
|
||||
@ -178,93 +185,92 @@ code {
|
||||
|
||||
.feature-publish {
|
||||
display: inline-block;
|
||||
background-repeat: no-repeat;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
background-color: rgba(173, 215, 223, 0.8);
|
||||
border: 2px dashed #008098;
|
||||
border-radius: 25px;
|
||||
width: 500px;
|
||||
height: 370px;
|
||||
position: relative;
|
||||
background-color: rgba(173, 215, 223, 0.8);
|
||||
border: 2px dashed #008098;
|
||||
border-radius: 25px;
|
||||
width: 300px;
|
||||
height: 120px;
|
||||
position: relative;
|
||||
|
||||
|
||||
box-shadow: 5px 5px 7px #8db7bd;
|
||||
-webkit-box-shadow: 5px 5px 7px #8db7bd;
|
||||
-moz-box-shadow: 5px 5px 7px #8db7bd;
|
||||
box-shadow: 5px 5px 7px #8db7bd;
|
||||
-webkit-box-shadow: 5px 5px 7px #8db7bd;
|
||||
-moz-box-shadow: 5px 5px 7px #8db7bd;
|
||||
background-image: url('../img/feature-publish.png');
|
||||
background-position:center;
|
||||
background-position: center;
|
||||
|
||||
}
|
||||
|
||||
.feature-pull {
|
||||
display: inline-block;
|
||||
background-repeat: no-repeat;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
background-color: rgba(173, 215, 223, 0.8);
|
||||
border: 2px dashed #008098;
|
||||
border-radius: 25px;
|
||||
width: 500px;
|
||||
height: 370px;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
background-color: rgba(173, 215, 223, 0.8);
|
||||
border: 2px dashed #008098;
|
||||
border-radius: 25px;
|
||||
width: 300px;
|
||||
height: 120px;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
margin-left: -21px;
|
||||
|
||||
box-shadow: 5px 5px 7px #8db7bd;
|
||||
-webkit-box-shadow: 5px 5px 7px #8db7bd;
|
||||
-moz-box-shadow: 5px 5px 7px #8db7bd;
|
||||
box-shadow: 5px 5px 7px #8db7bd;
|
||||
-webkit-box-shadow: 5px 5px 7px #8db7bd;
|
||||
-moz-box-shadow: 5px 5px 7px #8db7bd;
|
||||
background-image: url('../img/feature-pull.png');
|
||||
background-position:center;
|
||||
background-position: center;
|
||||
|
||||
}
|
||||
|
||||
|
||||
.hotfix-end {
|
||||
background-position: 0px 0px;
|
||||
}
|
||||
|
||||
.hotfix-start {
|
||||
background-position: 0px -370px;
|
||||
background-position: 0px -222px;
|
||||
}
|
||||
|
||||
.release-end {
|
||||
background-position: 0px -740px;
|
||||
background-position: 0px -444px;
|
||||
}
|
||||
|
||||
.release-start {
|
||||
background-position: 0px -1110px;
|
||||
background-position: 0px -666px;
|
||||
}
|
||||
|
||||
.feature-end {
|
||||
background-position: 0px -1480px;
|
||||
background-position: 0px -888px;
|
||||
}
|
||||
|
||||
.feature-start {
|
||||
background-position: 0px -1850px;
|
||||
background-position: 0px -1110px;
|
||||
}
|
||||
|
||||
/*---------------------------------------- BLOCKS */
|
||||
|
||||
.col-1 {
|
||||
float: left;
|
||||
width: 600px;
|
||||
width: 320px;
|
||||
}
|
||||
|
||||
.col-2 {
|
||||
float: right;
|
||||
width: 500px;
|
||||
width: 320px;
|
||||
margin-left: 30px;
|
||||
}
|
||||
|
||||
#main {
|
||||
margin: 0 auto;
|
||||
position: relative;
|
||||
width: 1200px;
|
||||
width: 670px;
|
||||
}
|
||||
|
||||
.scrollblock {
|
||||
width: 100%;
|
||||
padding-top: 100px;
|
||||
min-height: 450px;
|
||||
padding-top: 50px;
|
||||
position: relative;
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.divider, .accent {
|
||||
@ -275,7 +281,7 @@ code {
|
||||
#title {
|
||||
margin: auto;
|
||||
padding-top: 40px;
|
||||
width: 1150px;
|
||||
width: 670px;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
}
|
||||
@ -283,7 +289,7 @@ code {
|
||||
#author {
|
||||
width: 640px;
|
||||
position: absolute;
|
||||
top: 180px;
|
||||
top: 230px;
|
||||
right: 15%;
|
||||
font-size: 20px;
|
||||
text-align: right;
|
||||
@ -300,7 +306,7 @@ code {
|
||||
|
||||
#desc {
|
||||
position: absolute;
|
||||
top: 250px;
|
||||
top: 300px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
|
||||
BIN
img/download.png
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 8.0 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 7.9 KiB |
|
Before Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 113 KiB After Width: | Height: | Size: 104 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 266 B After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 5.3 KiB |
|
Before Width: | Height: | Size: 227 B After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 14 KiB |
21
index.html
@ -5,9 +5,8 @@
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,handheld,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,handheld">
|
||||
<link rel="stylesheet" href="css/print.css" type="text/css" media="print">
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
@ -79,7 +78,7 @@
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock" style="height: 800px;">
|
||||
<div class="scrollblock">
|
||||
<h2>Setup</h2>
|
||||
<ul>
|
||||
<li>You need a working git installation as prerequisite.</li>
|
||||
@ -97,10 +96,8 @@
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
<code>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | bash
|
||||
</code>
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
@ -108,7 +105,7 @@
|
||||
For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow
|
||||
wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow" width="300" height="235"/>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -138,7 +135,7 @@
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock" style="height: 600px;">
|
||||
<div class="scrollblock">
|
||||
<h2>Features</h2>
|
||||
|
||||
<ul class="narrow">
|
||||
@ -152,7 +149,7 @@
|
||||
<p>Development of new features starting from the 'develop' branch.</p>
|
||||
<p>Start developing a new feature with</p>
|
||||
<blockquote>
|
||||
git-flow feature start MYFEATURE
|
||||
git-flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>This action creates a new feature branch based on 'develop' and switches to it</p>
|
||||
|
||||
@ -231,7 +228,7 @@
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock" style="height: 900px;">
|
||||
<div class="scrollblock">
|
||||
<h2>Make a release</h2>
|
||||
|
||||
<ul>
|
||||
@ -257,7 +254,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock" style="height: 900px;">
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Finish up a release</h3>
|
||||
|
||||
@ -285,7 +282,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock" style="height: 800px;">
|
||||
<div class="scrollblock">
|
||||
<h2>Hotfixes</h2>
|
||||
|
||||
<ul>
|
||||
|
||||