extern/git-flow-cheatsheet
1
0
Fork 0
mirror of https://github.com/danielkummer/git-flow-cheatsheet.git synced 2025-06-04 00:45:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

smaller version (print optimized width)

Browse Source
This commit is contained in:
Daniel 2012-08-12 15:58:13 +02:00
parent e6ee0aed2a
commit 72603e6cc7
18 changed files with 69 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.idea/

117
css/style.css
View File

@ -4,9 +4,8 @@ body {
background-color: powderblue; background-color: powderblue;
font-family: Georgia, Times New Roman, Times, serif; font-family: Georgia, Times New Roman, Times, serif;
font-weight: bold; font-weight: bold;
font-size: 30px; font-size: 22px;
text-align: center; text-align: center;
padding: 0; padding: 0;
margin: 0; margin: 0;
} }
@ -26,11 +25,11 @@ footer {
-moz-box-shadow: 0px -5px 7px #8db7bd; -moz-box-shadow: 0px -5px 7px #8db7bd;
background-color: #8db7bd; background-color: #8db7bd;
border-top: 1px solid #698b91; border-top: 1px solid #698b91;
position:relative; position: relative;
} }
h1 { h1 {
font-size: 120px; font-size: 100px;
font-weight: normal; font-weight: normal;
margin: 0; margin: 0;
font-family: 'Sansita One', cursive; font-family: 'Sansita One', cursive;
@ -40,7 +39,7 @@ h1 {
} }
h2 { h2 {
font-size: 80px; font-size: 60px;
font-weight: normal; font-weight: normal;
margin: 0; margin: 0;
text-shadow: 0 2px 1px #000; text-shadow: 0 2px 1px #000;
@ -49,7 +48,7 @@ h2 {
} }
h3 { h3 {
font-size: 40px; font-size: 34px;
font-weight: normal; font-weight: normal;
margin: 0; margin: 0;
color: #D92B00; color: #D92B00;
@ -64,6 +63,7 @@ p {
color: #222438; color: #222438;
} }
a, a:visited { a, a:visited {
color: #D92B00; color: #D92B00;
font-weight: bold; font-weight: bold;
@ -111,7 +111,7 @@ code {
.initialize { .initialize {
background: url("../img/initialize.png") no-repeat scroll center center transparent; background: url("../img/initialize.png") no-repeat scroll center center transparent;
height: 300px; height: 244px;
width: 100%; width: 100%;
position: relative; position: relative;
z-index: 99; z-index: 99;
@ -119,42 +119,48 @@ code {
} }
.lines-small { .lines-small {
width: 500px; width: 300px;
height: 150px; height: 150px;
background-repeat: repeat-y; background-repeat: repeat-y;
background: url("../img/lines-small.png"); background: url("../img/lines-small.png");
position: relative; position: relative;
left: 11px;
} }
.lines-small-end { .lines-small-end {
width: 500px; width: 300px;
height: 500px; height: 500px;
background-repeat: repeat-y; background-repeat: repeat-y;
background: url("../img/lines-small.png"); background: url("../img/lines-small.png");
position: absolute; position: absolute;
left: 361px;
} }
.lines-big { .lines-big {
width: 500px; width: 300px;
height: 5620px; height: 4390px;
background-repeat: repeat-y; background-repeat: repeat-y;
background: url("../img/lines-big.png"); background: url("../img/lines-big.png");
position: absolute; position: absolute;
left: 697px; left: 360px;
} }
.lines-open { .lines-open {
width: 500px; width: 300px;
height: 86px; height: 52px;
background: url("../img/lines-open.png"); background: url("../img/lines-open.png");
position: relative;
left: 11px;
} }
.lines-close { .lines-close {
width: 500px; width: 300px;
height: 86px; height: 52px;
background: url("../img/lines-close.png"); background: url("../img/lines-close.png");
position: relative;
left: 11px;
} }
.hotfix-end, .hotfix-start, .release-end, .release-start, .feature-end, .feature-start { .hotfix-end, .hotfix-start, .release-end, .release-start, .feature-end, .feature-start {
@ -164,8 +170,8 @@ code {
background-color: rgba(173, 215, 223, 0.8); background-color: rgba(173, 215, 223, 0.8);
border: 2px dashed #008098; border: 2px dashed #008098;
border-radius: 25px; border-radius: 25px;
width: 500px; width: 300px;
height: 370px; height: 222px;
position: relative; position: relative;
z-index: 99; z-index: 99;
@ -177,93 +183,92 @@ code {
.feature-publish { .feature-publish {
display: inline-block; display: inline-block;
background-repeat: no-repeat; background-repeat: no-repeat;
background-color: rgba(173, 215, 223, 0.8); background-color: rgba(173, 215, 223, 0.8);
border: 2px dashed #008098; border: 2px dashed #008098;
border-radius: 25px; border-radius: 25px;
width: 500px; width: 300px;
height: 370px; height: 120px;
position: relative; position: relative;
box-shadow: 5px 5px 7px #8db7bd;
box-shadow: 5px 5px 7px #8db7bd; -webkit-box-shadow: 5px 5px 7px #8db7bd;
-webkit-box-shadow: 5px 5px 7px #8db7bd; -moz-box-shadow: 5px 5px 7px #8db7bd;
-moz-box-shadow: 5px 5px 7px #8db7bd;
background-image: url('../img/feature-publish.png'); background-image: url('../img/feature-publish.png');
background-position:center; background-position: center;
} }
.feature-pull { .feature-pull {
display: inline-block; display: inline-block;
background-repeat: no-repeat; background-repeat: no-repeat;
background-color: rgba(173, 215, 223, 0.8); background-color: rgba(173, 215, 223, 0.8);
border: 2px dashed #008098; border: 2px dashed #008098;
border-radius: 25px; border-radius: 25px;
width: 500px; width: 300px;
height: 370px; height: 120px;
position: relative; position: relative;
z-index: 99; z-index: 99;
margin-left: -21px;
box-shadow: 5px 5px 7px #8db7bd; box-shadow: 5px 5px 7px #8db7bd;
-webkit-box-shadow: 5px 5px 7px #8db7bd; -webkit-box-shadow: 5px 5px 7px #8db7bd;
-moz-box-shadow: 5px 5px 7px #8db7bd; -moz-box-shadow: 5px 5px 7px #8db7bd;
background-image: url('../img/feature-pull.png'); background-image: url('../img/feature-pull.png');
background-position:center; background-position: center;
} }
.hotfix-end { .hotfix-end {
background-position: 0px 0px; background-position: 0px 0px;
} }
.hotfix-start { .hotfix-start {
background-position: 0px -370px; background-position: 0px -222px;
} }
.release-end { .release-end {
background-position: 0px -740px; background-position: 0px -444px;
} }
.release-start { .release-start {
background-position: 0px -1110px; background-position: 0px -666px;
} }
.feature-end { .feature-end {
background-position: 0px -1480px; background-position: 0px -888px;
} }
.feature-start { .feature-start {
background-position: 0px -1850px; background-position: 0px -1110px;
} }
/*---------------------------------------- BLOCKS */ /*---------------------------------------- BLOCKS */
.col-1 { .col-1 {
float: left; float: left;
width: 600px; width: 320px;
} }
.col-2 { .col-2 {
float: right; float: right;
width: 500px; width: 320px;
margin-left: 30px; margin-left: 30px;
} }
#main { #main {
margin: 0 auto; margin: 0 auto;
position: relative; position: relative;
width: 1200px; width: 670px;
} }
.scrollblock { .scrollblock {
width: 100%; width: 100%;
padding-top: 100px; padding-top: 50px;
min-height: 450px;
position: relative; position: relative;
clear: both;
} }
.divider, .accent { .divider, .accent {
@ -274,7 +279,7 @@ code {
#title { #title {
margin: auto; margin: auto;
padding-top: 40px; padding-top: 40px;
width: 1150px; width: 670px;
position: relative; position: relative;
z-index: 99; z-index: 99;
} }
@ -282,7 +287,7 @@ code {
#author { #author {
width: 640px; width: 640px;
position: absolute; position: absolute;
top: 180px; top: 230px;
right: 15%; right: 15%;
font-size: 20px; font-size: 20px;
text-align: right; text-align: right;
@ -299,7 +304,7 @@ code {
#desc { #desc {
position: absolute; position: absolute;
top: 250px; top: 300px;
width: 100%; width: 100%;
} }

BIN
img/download.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
img/feature-end.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 13 KiB

BIN
img/feature-publish.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

BIN
img/feature-pull.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

BIN
img/feature-start.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 13 KiB

BIN
img/flow-sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 104 KiB

BIN
img/hotfix-end.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 27 KiB

BIN
img/hotfix-start.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
img/initialize.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 26 KiB

BIN
img/lines-big.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 266 B

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
img/lines-close.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
img/lines-open.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
img/lines-small.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 227 B

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
img/release-end.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 23 KiB

BIN
img/release-start.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

14
index.html
View File

@ -78,9 +78,10 @@
</div> </div>
<div class="scrollblock" style="height: 800px;"> <div class="scrollblock">
<h2>Setup</h2> <h2>Setup</h2>
<p>You need a working git installation as prerequirement.</p>
<p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>OSX</h3> <h3>OSX</h3>
<blockquote> <blockquote>
@ -100,7 +101,6 @@
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
You need a working git installation as prerequirement.<br/>
For detailed instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow For detailed instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow
wiki</a>. wiki</a>.
</p> </p>
@ -135,7 +135,7 @@
</div> </div>
<div class="scrollblock" style="height: 600px;"> <div class="scrollblock">
<h2>Features</h2> <h2>Features</h2>
<ul class="narrow"> <ul class="narrow">
<li>Develop new features for upcoming releases</li> <li>Develop new features for upcoming releases</li>
@ -236,7 +236,7 @@
</div> </div>
<div class="scrollblock" style="height: 900px;"> <div class="scrollblock">
<h2>Make a release</h2> <h2>Make a release</h2>
<ul> <ul>
@ -264,7 +264,7 @@
</div> </div>
</div> </div>
<div class="scrollblock" style="height: 900px;"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish up a release</h3> <h3>Finish up a release</h3>
@ -296,7 +296,7 @@
</div> </div>
</div> </div>
<div class="scrollblock" style="height: 800px;"> <div class="scrollblock">
<h2>Hotfixes</h2> <h2>Hotfixes</h2>
<ul> <ul>