extern/git-flow-cheatsheet
1
0
Fork 0
mirror of https://github.com/danielkummer/git-flow-cheatsheet.git synced 2025-02-16 18:31:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

update style

Browse Source
This commit is contained in:
Daniel Kummer 2012-08-09 12:52:39 +02:00
parent 65b23492c5
commit b3d3561b7e
2 changed files with 51 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
css/style.css
View File

@ -28,7 +28,8 @@ footer {
-webkit-box-shadow: 0px -5px 7px #8db7bd; -webkit-box-shadow: 0px -5px 7px #8db7bd;
-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;
} }
h1 { h1 {
@ -130,7 +131,7 @@ code {
.lines-small-end { .lines-small-end {
width: 500px; width: 500px;
height: 464px; 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;
@ -143,6 +144,7 @@ code {
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;
} }
@ -176,6 +178,47 @@ code {
} }
.feature-publish {
display: inline-block;
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;
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;
}
.feature-pull {
display: inline-block;
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;
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;
}
.hotfix-end { .hotfix-end {
background-position: 0px 0px; background-position: 0px 0px;
} }

11
index.html
View File

@ -211,7 +211,7 @@
</blockquote> </blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<img src="img/feature-publish.png" alt="publish feature"/> <div class="feature-publish"></div>
</div> </div>
</div> </div>
@ -230,7 +230,7 @@
</blockquote> </blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<img src="img/feature-pull.png" alt="publish feature"/> <div class="feature-pull"></div>
</div> </div>
</div> </div>
@ -287,10 +287,11 @@
git flow release publish RELEASE git flow release publish RELEASE
</code> </code>
</blockquote> </blockquote>
<p>(You can track a remote release with the <br/><code>git flow release track RELEASE</code> command)</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
<p>(You can track a remote release with the <br/><code>git flow release track RELEASE</code> command)</p>
</div> </div>
</div> </div>
@ -323,10 +324,10 @@
<div class="col-1"> <div class="col-1">
<h3>Finish a hotfix</h3> <h3>Finish a hotfix</h3>
<p>TODO</p> <p>By finishing a hotfix it gets merged back into develp and master. Additionally the master merge ist tagged.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-finish"></div> <div class="hotfix-end"></div>
</div> </div>
</div> </div>