Skip to content

Commit

Permalink
Fixed conflicts in global.css.
Browse files Browse the repository at this point in the history
  • Loading branch information
Paddy Foran committed Oct 16, 2012
2 parents e541d55 + 28e9d11 commit 1d8b1ae
Showing 1 changed file with 23 additions and 14 deletions.
37 changes: 23 additions & 14 deletions css/global.css
Expand Up @@ -759,17 +759,26 @@ a.grid-box span.grid-box-text h3 {
line-height:14px;
}
.flow-steps a.number {
display:block;
margin:0 auto;
position:relative;
text-align:center;
vertical-align:middle;
height:48px;
width:58px;
background:url(/images/flow-steps-step-bg.png) no-repeat;
font-size:30px;
color:#ffffff;
text-decoration:none;
padding:16px 0 0;

}
display: block;
margin: 0 auto;
position: relative;
text-align: center;
vertical-align: middle;
height: 40px;
width: 58px;
font-size: 30px;
color: white;
text-decoration: none;
border-radius: 28px;
padding-top: 16px;
margin-top: -10px;
background: #6D0019;
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPHJhZGlhbEdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgY3g9IjUwJSIgY3k9IjUwJSIgcj0iNzUlIj4KICAgIDxzdG9wIG9mZnNldD0iMCUiIHN0b3AtY29sb3I9IiM2ZDAwMTkiIHN0b3Atb3BhY2l0eT0iMSIvPgogICAgPHN0b3Agb2Zmc2V0PSI1NiUiIHN0b3AtY29sb3I9IiM4ZjAyMjIiIHN0b3Atb3BhY2l0eT0iMSIvPgogICAgPHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjYTkwMzI5IiBzdG9wLW9wYWNpdHk9IjEiLz4KICA8L3JhZGlhbEdyYWRpZW50PgogIDxyZWN0IHg9Ii01MCIgeT0iLTUwIiB3aWR0aD0iMTAxIiBoZWlnaHQ9IjEwMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
background: -moz-radial-gradient(center, ellipse cover, #6D0019 0%, #8F0222 56%, #A90329 100%);
background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%,#6D0019), color-stop(56%,#8F0222), color-stop(100%,#A90329));
background: -webkit-radial-gradient(center, ellipse cover, #A90329 0%,#6D0019 100%);
background: -o-radial-gradient(center, ellipse cover, #6D0019 0%,#8F0222 56%,#A90329 100%);
background: -ms-radial-gradient(center, ellipse cover, #6D0019 0%,#8F0222 56%,#A90329 100%);
background: radial-gradient(ellipse at center, #6D0019 0%,#8F0222 56%,#A90329 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#6d0019', endColorstr='#a90329',GradientType=1 );
}

0 comments on commit 1d8b1ae

Please sign in to comment.