mirror of
https://github.com/danielkummer/git-flow-cheatsheet.git
synced 2024-11-22 07:54:03 +01:00
update style
This commit is contained in:
parent
65b23492c5
commit
b3d3561b7e
@ -28,7 +28,8 @@ footer {
|
||||
-webkit-box-shadow: 0px -5px 7px #8db7bd;
|
||||
-moz-box-shadow: 0px -5px 7px #8db7bd;
|
||||
background-color: #8db7bd;
|
||||
border-top: 1px solid #698b91
|
||||
border-top: 1px solid #698b91;
|
||||
position:relative;
|
||||
}
|
||||
|
||||
h1 {
|
||||
@ -130,7 +131,7 @@ code {
|
||||
|
||||
.lines-small-end {
|
||||
width: 500px;
|
||||
height: 464px;
|
||||
height: 500px;
|
||||
background-repeat: repeat-y;
|
||||
background: url("../img/lines-small.png");
|
||||
position: absolute;
|
||||
@ -143,6 +144,7 @@ code {
|
||||
background-repeat: repeat-y;
|
||||
background: url("../img/lines-big.png");
|
||||
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 {
|
||||
background-position: 0px 0px;
|
||||
}
|
||||
|
11
index.html
11
index.html
@ -211,7 +211,7 @@
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<img src="img/feature-publish.png" alt="publish feature"/>
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -230,7 +230,7 @@
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<img src="img/feature-pull.png" alt="publish feature"/>
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -287,10 +287,11 @@
|
||||
git flow release publish RELEASE
|
||||
</code>
|
||||
</blockquote>
|
||||
<p>(You can track a remote release with the <br/><code>git flow release track RELEASE</code> command)</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<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>
|
||||
|
||||
@ -323,10 +324,10 @@
|
||||
<div class="col-1">
|
||||
<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 class="col-2">
|
||||
<div class="hotfix-finish"></div>
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user