2014-09-02 18:07:02 +05:30
|
|
|
.diff-file {
|
2015-09-25 12:07:36 +05:30
|
|
|
margin-left: -$gl-padding;
|
|
|
|
margin-right: -$gl-padding;
|
|
|
|
border: none;
|
|
|
|
border-bottom: 1px solid #E7E9EE;
|
2014-09-02 18:07:02 +05:30
|
|
|
|
|
|
|
.diff-header {
|
2015-04-26 12:48:37 +05:30
|
|
|
position: relative;
|
|
|
|
background: $background-color;
|
|
|
|
border-bottom: 1px solid $border-color;
|
2015-09-25 12:07:36 +05:30
|
|
|
padding: 10px 16px;
|
2014-09-02 18:07:02 +05:30
|
|
|
color: #555;
|
2015-04-26 12:48:37 +05:30
|
|
|
z-index: 10;
|
2014-09-02 18:07:02 +05:30
|
|
|
|
|
|
|
> span {
|
|
|
|
font-family: $monospace_font;
|
2015-04-26 12:48:37 +05:30
|
|
|
word-break: break-all;
|
|
|
|
margin-right: 200px;
|
|
|
|
display: block;
|
|
|
|
|
|
|
|
.file-mode {
|
|
|
|
margin-left: 10px;
|
|
|
|
color: #777;
|
|
|
|
}
|
2014-09-02 18:07:02 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
.diff-btn-group {
|
|
|
|
float: right;
|
2015-04-26 12:48:37 +05:30
|
|
|
position: absolute;
|
|
|
|
top: 5px;
|
|
|
|
right: 15px;
|
2014-09-02 18:07:02 +05:30
|
|
|
|
|
|
|
.btn {
|
2015-04-26 12:48:37 +05:30
|
|
|
padding: 0px 10px;
|
|
|
|
font-size: 13px;
|
|
|
|
line-height: 28px;
|
2014-09-02 18:07:02 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
.commit-short-id {
|
|
|
|
font-family: $monospace_font;
|
|
|
|
font-size: smaller;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
.diff-content {
|
|
|
|
overflow: auto;
|
|
|
|
overflow-y: hidden;
|
|
|
|
background: #FFF;
|
|
|
|
color: #333;
|
2015-09-25 12:07:36 +05:30
|
|
|
|
2014-09-02 18:07:02 +05:30
|
|
|
.old {
|
|
|
|
span.idiff {
|
2015-04-26 12:48:37 +05:30
|
|
|
background-color: #f8cbcb;
|
2014-09-02 18:07:02 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
.new {
|
|
|
|
span.idiff {
|
2015-04-26 12:48:37 +05:30
|
|
|
background-color: #a6f3a6;
|
2014-09-02 18:07:02 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
.unfold {
|
|
|
|
cursor: pointer;
|
|
|
|
}
|
|
|
|
|
|
|
|
.file-mode-changed {
|
|
|
|
padding: 10px;
|
|
|
|
color: #777;
|
|
|
|
}
|
|
|
|
|
2015-09-11 14:41:01 +05:30
|
|
|
.suppressed-container {
|
|
|
|
padding: ($padding-base-vertical + 5px) $padding-base-horizontal;
|
|
|
|
text-align: center;
|
|
|
|
|
|
|
|
// "Changes suppressed. Click to show." link
|
|
|
|
.show-suppressed-diff {
|
|
|
|
font-size: 110%;
|
|
|
|
font-weight: bold;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-09-02 18:07:02 +05:30
|
|
|
table {
|
|
|
|
width: 100%;
|
|
|
|
font-family: $monospace_font;
|
|
|
|
border: none;
|
|
|
|
margin: 0px;
|
|
|
|
padding: 0px;
|
2015-09-25 12:07:36 +05:30
|
|
|
.line_holder td {
|
2015-04-26 12:48:37 +05:30
|
|
|
line-height: $code_line_height;
|
|
|
|
font-size: $code_font_size;
|
2014-09-02 18:07:02 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
tr.line_holder.parallel{
|
|
|
|
.old_line, .new_line, .diff_line {
|
|
|
|
min-width: 50px;
|
|
|
|
}
|
|
|
|
|
|
|
|
td.line_content.parallel{
|
|
|
|
width: 50%;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
.old_line, .new_line, .diff_line {
|
|
|
|
margin: 0px;
|
|
|
|
padding: 0px;
|
|
|
|
border: none;
|
2015-04-26 12:48:37 +05:30
|
|
|
background: $background-color;
|
|
|
|
color: rgba(0,0,0,0.3);
|
2014-09-02 18:07:02 +05:30
|
|
|
padding: 0px 5px;
|
2015-04-26 12:48:37 +05:30
|
|
|
border-right: 1px solid $border-color;
|
2014-09-02 18:07:02 +05:30
|
|
|
text-align: right;
|
|
|
|
min-width: 35px;
|
|
|
|
max-width: 50px;
|
|
|
|
width: 35px;
|
|
|
|
@include user-select(none);
|
|
|
|
a {
|
|
|
|
float: left;
|
|
|
|
width: 35px;
|
|
|
|
font-weight: normal;
|
2015-04-26 12:48:37 +05:30
|
|
|
color: rgba(0,0,0,0.3);
|
2014-09-02 18:07:02 +05:30
|
|
|
&:hover {
|
|
|
|
text-decoration: underline;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
&.new {
|
|
|
|
background: #CFD;
|
|
|
|
}
|
|
|
|
&.old {
|
|
|
|
background: #FDD;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
.diff_line {
|
|
|
|
padding: 0;
|
|
|
|
}
|
|
|
|
.line_holder {
|
|
|
|
&.old .old_line,
|
|
|
|
&.old .new_line {
|
2015-04-26 12:48:37 +05:30
|
|
|
background: #ffdddd;
|
|
|
|
border-color: #f1c0c0;
|
2014-09-02 18:07:02 +05:30
|
|
|
}
|
|
|
|
&.new .old_line,
|
|
|
|
&.new .new_line {
|
2015-04-26 12:48:37 +05:30
|
|
|
background: #dbffdb;
|
|
|
|
border-color: #c1e9c1;
|
2014-09-02 18:07:02 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
.line_content {
|
|
|
|
display: block;
|
|
|
|
margin: 0px;
|
|
|
|
padding: 0px 0.5em;
|
|
|
|
border: none;
|
|
|
|
&.new {
|
2015-04-26 12:48:37 +05:30
|
|
|
background: #eaffea;
|
2014-09-02 18:07:02 +05:30
|
|
|
}
|
|
|
|
&.old {
|
2015-04-26 12:48:37 +05:30
|
|
|
background: #ffecec;
|
2014-09-02 18:07:02 +05:30
|
|
|
}
|
|
|
|
&.matched {
|
2015-04-26 12:48:37 +05:30
|
|
|
color: $border-color;
|
2014-09-02 18:07:02 +05:30
|
|
|
background: #fafafa;
|
|
|
|
}
|
|
|
|
&.parallel {
|
|
|
|
display: table-cell;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
.image {
|
|
|
|
background: #ddd;
|
|
|
|
text-align: center;
|
|
|
|
padding: 30px;
|
|
|
|
.wrap{
|
|
|
|
display: inline-block;
|
|
|
|
}
|
|
|
|
|
|
|
|
.frame {
|
|
|
|
display: inline-block;
|
|
|
|
background-color: #fff;
|
|
|
|
line-height: 0;
|
|
|
|
img{
|
|
|
|
border: 1px solid #FFF;
|
|
|
|
background: image-url('trans_bg.gif');
|
|
|
|
max-width: 100%;
|
|
|
|
}
|
|
|
|
&.deleted {
|
|
|
|
border: 1px solid $deleted;
|
|
|
|
}
|
|
|
|
|
|
|
|
&.added {
|
|
|
|
border: 1px solid $added;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
.image-info{
|
|
|
|
font-size: 12px;
|
|
|
|
margin: 5px 0 0 0;
|
|
|
|
color: grey;
|
|
|
|
}
|
|
|
|
|
|
|
|
.view.swipe{
|
|
|
|
position: relative;
|
|
|
|
|
|
|
|
.swipe-frame{
|
|
|
|
display: block;
|
|
|
|
margin: auto;
|
|
|
|
position: relative;
|
|
|
|
}
|
|
|
|
.swipe-wrap{
|
|
|
|
overflow: hidden;
|
|
|
|
border-left: 1px solid #999;
|
|
|
|
position: absolute;
|
|
|
|
display: block;
|
|
|
|
top: 13px;
|
|
|
|
right: 7px;
|
|
|
|
}
|
|
|
|
.frame{
|
|
|
|
top: 0;
|
|
|
|
right: 0;
|
|
|
|
position: absolute;
|
|
|
|
&.deleted{
|
|
|
|
margin: 0;
|
|
|
|
display: block;
|
|
|
|
top: 13px;
|
|
|
|
right: 7px;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
.swipe-bar{
|
|
|
|
display: block;
|
|
|
|
height: 100%;
|
|
|
|
width: 15px;
|
|
|
|
z-index: 100;
|
|
|
|
position: absolute;
|
|
|
|
cursor: pointer;
|
|
|
|
&:hover{
|
|
|
|
.top-handle{
|
|
|
|
background-position: -15px 3px;
|
|
|
|
}
|
|
|
|
.bottom-handle{
|
|
|
|
background-position: -15px -11px;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
.top-handle{
|
|
|
|
display: block;
|
|
|
|
height: 14px;
|
|
|
|
width: 15px;
|
|
|
|
position: absolute;
|
|
|
|
top: 0px;
|
|
|
|
background: image-url('swipemode_sprites.gif') 0 3px no-repeat;
|
|
|
|
}
|
|
|
|
.bottom-handle{
|
|
|
|
display: block;
|
|
|
|
height: 14px;
|
|
|
|
width: 15px;
|
|
|
|
position: absolute;
|
|
|
|
bottom: 0px;
|
|
|
|
background: image-url('swipemode_sprites.gif') 0 -11px no-repeat;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} //.view.swipe
|
|
|
|
.view.onion-skin{
|
|
|
|
.onion-skin-frame{
|
|
|
|
display: block;
|
|
|
|
margin: auto;
|
|
|
|
position: relative;
|
|
|
|
}
|
|
|
|
.frame.added, .frame.deleted {
|
|
|
|
position: absolute;
|
|
|
|
display: block;
|
|
|
|
top: 0px;
|
|
|
|
left: 0px;
|
|
|
|
}
|
|
|
|
.controls{
|
|
|
|
display: block;
|
|
|
|
height: 14px;
|
|
|
|
width: 300px;
|
|
|
|
z-index: 100;
|
|
|
|
position: absolute;
|
|
|
|
bottom: 0px;
|
|
|
|
left: 50%;
|
|
|
|
margin-left: -150px;
|
|
|
|
|
|
|
|
.drag-track{
|
|
|
|
display: block;
|
|
|
|
position: absolute;
|
|
|
|
left: 12px;
|
|
|
|
height: 10px;
|
|
|
|
width: 276px;
|
|
|
|
background: image-url('onion_skin_sprites.gif') -4px -20px repeat-x;
|
|
|
|
}
|
|
|
|
|
|
|
|
.dragger {
|
|
|
|
display: block;
|
|
|
|
position: absolute;
|
|
|
|
left: 0px;
|
|
|
|
top: 0px;
|
|
|
|
height: 14px;
|
|
|
|
width: 14px;
|
|
|
|
background: image-url('onion_skin_sprites.gif') 0px -34px repeat-x;
|
|
|
|
cursor: pointer;
|
|
|
|
}
|
|
|
|
|
|
|
|
.transparent {
|
|
|
|
display: block;
|
|
|
|
position: absolute;
|
|
|
|
top: 2px;
|
|
|
|
right: 0px;
|
|
|
|
height: 10px;
|
|
|
|
width: 10px;
|
|
|
|
background: image-url('onion_skin_sprites.gif') -2px 0px no-repeat;
|
|
|
|
}
|
|
|
|
|
|
|
|
.opaque {
|
|
|
|
display: block;
|
|
|
|
position: absolute;
|
|
|
|
top: 2px;
|
|
|
|
left: 0px;
|
|
|
|
height: 10px;
|
|
|
|
width: 10px;
|
|
|
|
background: image-url('onion_skin_sprites.gif') -2px -10px no-repeat;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} //.view.onion-skin
|
|
|
|
}
|
|
|
|
.view-modes{
|
|
|
|
padding: 10px;
|
|
|
|
text-align: center;
|
|
|
|
background: #EEE;
|
|
|
|
|
|
|
|
ul, li{
|
|
|
|
list-style: none;
|
|
|
|
margin: 0;
|
|
|
|
padding: 0;
|
|
|
|
display: inline-block;
|
|
|
|
}
|
|
|
|
|
|
|
|
li{
|
|
|
|
color: grey;
|
|
|
|
border-left: 1px solid #c1c1c1;
|
|
|
|
padding: 0 12px 0 16px;
|
|
|
|
cursor: pointer;
|
|
|
|
&:first-child{
|
|
|
|
border-left: none;
|
|
|
|
}
|
|
|
|
&:hover{
|
|
|
|
text-decoration: underline;
|
|
|
|
}
|
|
|
|
&.active{
|
|
|
|
&:hover{
|
|
|
|
text-decoration: none;
|
|
|
|
}
|
|
|
|
cursor: default;
|
|
|
|
color: #333;
|
|
|
|
}
|
|
|
|
&.disabled{
|
|
|
|
display: none;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
.file-content .diff-file {
|
|
|
|
margin: 0;
|
|
|
|
border: none;
|
|
|
|
}
|
2015-04-26 12:48:37 +05:30
|
|
|
|
|
|
|
.diff-file .line_content {
|
|
|
|
white-space: pre;
|
|
|
|
}
|
|
|
|
|
|
|
|
.diff-wrap-lines .line_content {
|
|
|
|
white-space: pre-wrap;
|
|
|
|
}
|
|
|
|
|
2015-09-25 12:07:36 +05:30
|
|
|
.inline-parallel-buttons {
|
|
|
|
float: right;
|
|
|
|
margin-top: -5px;
|
|
|
|
}
|