deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge_requests restyle with forms

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2011-12-13 23:24:31 +02:00
parent 18be3e4c17
commit e8860594a9
6 changed files with 130 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

84
app/assets/stylesheets/projects.css.scss
View file

@ -555,44 +555,78 @@ h4.middle-panel {
.merge-tabs {
margin: 0;
border: 1px solid #ccc;
padding: 10px;
font-size: 11px;
font-weight: bold; text-transform: uppercase;
padding: 5px;
font-size: 12px;
background: #F7F7F7;
margin-bottom:20px;
height:26px;
a {
margin-right:5px;
@include round-borders-all(4px);
border: 1px solid #ddd;
.tab {
font-weight: bold;
text-transform: uppercase;
border-right: 1px solid #ddd;
background:none;
padding: 4px 10px;
width:160px;
padding: 10px;
width:60px;
float:left;
position:relative;
top:-5px;
left:-5px;
height:16px;
padding-left:34px;
span {
width: 20px;
height: 20px;
display: inline-block;
position: absolute;
left: 8px;
top: 8px;
}
&.active {
background: #eaeaea;
}
}
}
.merge-tabs .reopen-request {
@include round-borders-all(4px);
padding:2px 4px;
border:1px solid #aaa;
text-shadow:none;
background: #D12F19;
color:white;
}
.merge-tabs .close-request {
@include round-borders-all(4px);
padding:2px 4px;
border:1px solid #aaa;
text-shadow:none;
background: #44aa22;
color:white;
}
.merge-notes-tab span { background: url("images.png") no-repeat -161px -1px; }
.merge-commits-tab span { background: url("images.png") no-repeat -86px 1px; }
.merge-diffs-tab span { background: url("images.png") no-repeat -118px 1px; }
.merge-tabs .dashboard-loader { padding:8px; }
.user-mention {
color: #2FA0BB;
font-weight: bold;
}
.author {
color: #999;
}
.red-button{
border-radius: 5px;
font-size: 12px;
font-weight: bold;
padding: 5px 17px;
border: 1px solid #999;
color: #666;
display: inline-block;
box-shadow: 0 1px 2px rgba(0,0,0,.3);
background: #D12F19;
color: white;
}
.positive-button{
border-radius: 5px;
font-size: 12px;
font-weight: bold;
padding: 5px 17px;
border: 1px solid #999;
color: #666;
display: inline-block;
box-shadow: 0 1px 2px rgba(0,0,0,.3);
background: #4A2;
color: white;
}