3022786948
Conflicts: app/assets/stylesheets/sections/notes.scss app/contexts/notes/load_context.rb app/models/project.rb app/observers/note_observer.rb app/roles/votes.rb app/views/commit/show.html.haml app/views/merge_requests/_show.html.haml app/views/merge_requests/diffs.js.haml app/views/merge_requests/show.js.haml app/views/notes/_note.html.haml features/steps/project/project_merge_requests.rb spec/models/note_spec.rb
256 lines
4.1 KiB
SCSS
256 lines
4.1 KiB
SCSS
/**
|
|
*
|
|
* COMMIT SHOw
|
|
*
|
|
*/
|
|
.commit-committer-link,
|
|
.commit-author-link {
|
|
font-size: 13px;
|
|
color: #555;
|
|
&:hover {
|
|
color: #999;
|
|
}
|
|
}
|
|
|
|
.diff_file {
|
|
border: 1px solid #CCC;
|
|
margin-bottom: 1em;
|
|
|
|
.diff_file_header {
|
|
@extend .clearfix;
|
|
padding: 5px 5px 5px 10px;
|
|
color: #555;
|
|
border-bottom: 1px solid #CCC;
|
|
background: #eee;
|
|
// TODO Replace with linear-gradient mixin
|
|
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
|
|
background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
|
|
background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
|
|
background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
|
|
|
|
> span {
|
|
font-family: $monospace;
|
|
font-size: 14px;
|
|
line-height: 30px;
|
|
}
|
|
|
|
a.view-commit{
|
|
font-weight: bold;
|
|
}
|
|
|
|
.commit-short-id{
|
|
font-family: $monospace;
|
|
font-size: smaller;
|
|
}
|
|
|
|
.file-mode{
|
|
font-family: $monospace;
|
|
}
|
|
}
|
|
.diff_file_content {
|
|
overflow: auto;
|
|
overflow-y: hidden;
|
|
background: #fff;
|
|
color: #333;
|
|
font-size: 12px;
|
|
font-family: $monospace;
|
|
.old{
|
|
span.idiff{
|
|
background-color: #FAA;
|
|
}
|
|
}
|
|
.new{
|
|
span.idiff{
|
|
background-color: #AFA;
|
|
}
|
|
}
|
|
|
|
table {
|
|
td {
|
|
line-height: 18px;
|
|
}
|
|
}
|
|
}
|
|
.diff_file_content_image {
|
|
background: #eee;
|
|
text-align: center;
|
|
.image {
|
|
display: inline-block;
|
|
margin: 50px;
|
|
max-width: 400px;
|
|
|
|
img{
|
|
background: url('trans_bg.gif');
|
|
}
|
|
|
|
&.diff_removed {
|
|
img{
|
|
border: 1px solid #C00;
|
|
}
|
|
}
|
|
|
|
&.diff_added {
|
|
img{
|
|
border: 1px solid #0C0;
|
|
}
|
|
}
|
|
|
|
.image-info{
|
|
margin: 5px 0 0 0;
|
|
}
|
|
}
|
|
|
|
&.img_compared {
|
|
.image {
|
|
max-width: 300px;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
.diff_file_content{
|
|
table {
|
|
border: none;
|
|
margin: 0px;
|
|
padding: 0px;
|
|
tr {
|
|
td {
|
|
font-size: 12px;
|
|
}
|
|
}
|
|
}
|
|
.new_line,
|
|
.old_line,
|
|
.notes_line {
|
|
margin:0px;
|
|
padding:0px;
|
|
border:none;
|
|
background:#EEE;
|
|
color:#666;
|
|
padding: 0px 5px;
|
|
border-right: 1px solid #ccc;
|
|
text-align: right;
|
|
min-width: 35px;
|
|
max-width: 35px;
|
|
width: 35px;
|
|
moz-user-select: none;
|
|
-khtml-user-select: none;
|
|
user-select: none;
|
|
|
|
a {
|
|
float: left;
|
|
width: 35px;
|
|
font-weight: normal;
|
|
color: #666;
|
|
&:hover {
|
|
text-decoration: underline;
|
|
}
|
|
}
|
|
}
|
|
.line_content {
|
|
white-space: pre;
|
|
height: 14px;
|
|
margin: 0px;
|
|
padding: 0px;
|
|
border: none;
|
|
&.new {
|
|
background: #CFD;
|
|
}
|
|
&.old {
|
|
background: #FDD;
|
|
}
|
|
&.matched {
|
|
color: #ccc;
|
|
background: #fafafa;
|
|
}
|
|
}
|
|
}
|
|
|
|
/** COMMIT BLOCK **/
|
|
.commit-title{display: block;}
|
|
.commit-title{margin-bottom: 10px}
|
|
.commit-author, .commit-committer{display: block;color: #999; font-weight: normal; font-style: italic;}
|
|
.commit-author strong, .commit-committer strong{font-weight: bold; font-style: normal;}
|
|
|
|
|
|
/** COMMIT ROW **/
|
|
.commit {
|
|
.browse_code_link_holder {
|
|
@extend .span2;
|
|
float: right;
|
|
}
|
|
|
|
.committed_ago {
|
|
float: right;
|
|
@extend .cgray;
|
|
}
|
|
|
|
.notes_count {
|
|
float: right;
|
|
margin: -6px 8px 6px;
|
|
}
|
|
|
|
code {
|
|
background: #FCEEC1;
|
|
color: $style_color;
|
|
}
|
|
|
|
.commit_short_id {
|
|
float: left;
|
|
@extend .lined;
|
|
min-width: 65px;
|
|
font-family: $monospace;
|
|
}
|
|
}
|
|
|
|
.diff_file_header a,
|
|
.file-stats a {
|
|
color: $style_color;
|
|
}
|
|
|
|
.file-stats {
|
|
.new-file{
|
|
i{
|
|
color: #1BCF00;
|
|
}
|
|
}
|
|
.renamed-file{
|
|
i{
|
|
color: #FE9300;
|
|
}
|
|
}
|
|
.deleted-file{
|
|
i{
|
|
color: #FF0000;
|
|
}
|
|
}
|
|
.edit-file{
|
|
i{
|
|
color: #555;
|
|
}
|
|
}
|
|
}
|
|
|
|
.label_commit {
|
|
@include border-radius(4px);
|
|
padding: 2px 4px;
|
|
font-size: 13px;
|
|
background: #474D57;
|
|
color: #fff;
|
|
font-family: $monospace;
|
|
}
|
|
|
|
|
|
.commits-compare-switch{
|
|
background: url("switch_icon.png") no-repeat center center;
|
|
width: 16px;
|
|
height: 18px;
|
|
text-indent: -9999px;
|
|
float: left;
|
|
margin-right: 9px;
|
|
border: 1px solid #DDD;
|
|
@include border-radius(4px);
|
|
padding: 4px;
|
|
background-color: #EEE;
|
|
}
|