frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add commit-diff view

Browse Source
This commit is contained in:
Nick O'Leary
2017-10-25 15:26:24 +01:00
parent b9a3563e5b
commit 57533fd831
14 changed files with 617 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
editor/sass/diff.scss
View File

@@ -15,15 +15,15 @@
**/
#node-dialog-view-diff {
.node-dialog-view-diff-panel {
.red-ui-editableList-container {
border-radius:1px;
padding:0;
background: #f9f9f9;
}
#node-dialog-view-diff-diff {
.node-dialog-view-diff-diff {
position: absolute;
top:80px;
top:30px;
bottom:10px;
left:10px;
right:10px;
@@ -38,12 +38,22 @@
padding: 5px;
// padding-bottom: 5px;
}
&.node-dialog-view-diff-panel-merge {
.node-dialog-view-diff-diff {
top: 80px
}
.node-dialog-view-diff-headers {
top: 55px;
}
}
}
#node-dialog-view-diff-headers {
.node-dialog-view-diff-headers {
position: absolute;
left:237px;
right:18px;
top: 55px;
top: 5px;
height: 25px;
div {
height: 25px;
@@ -553,7 +563,6 @@
margin: 10px;
border: 1px solid $secondary-border-color;
border-radius: 3px;
font-family: monospace;
table-layout: fixed;
width: calc(100% - 20px);
}
@@ -562,6 +571,7 @@
word-wrap: break-word;
}
td.lineno {
font-family: monospace;
text-align: right;
color: #999;
background: #fafafa;
@@ -571,6 +581,7 @@
border-left: 1px solid $secondary-border-color;
}
td.linetext {
font-family: monospace;
white-space: pre-wrap;
padding: 1px 5px;
span.prefix {
@@ -602,12 +613,42 @@
border-bottom: 1px solid #f0f0f0;
}
tr.node-text-diff-file-header td {
font-family: monospace;
background: #f3f3f3;
padding: 5px 10px 5px 0;
color: #333;
cursor: pointer;
i.node-diff-chevron {
width: 30px;
}
}
tr.node-text-diff-file-header.collapsed {
td i.node-diff-chevron {
transform: rotate(-90deg);
}
}
tr.node-text-diff-commit-header td {
background: #f3f3f3;
padding: 5px 10px;
color: #333;
h3 {
font-size: 1.4em;
margin: 0;
}
.commit-summary {
border-top: 1px solid $secondary-border-color;
padding-top: 5px;
color: #999;
}
.commit-body {
margin-bottom:15px;
white-space: pre;
line-height: 1.2em;
}
}
tr.node-text-diff-header td {
font-family: monospace;
padding: 5px 10px;
text-align: left;
color: #666;

18
editor/sass/projects.scss
View File

@@ -23,10 +23,23 @@
.projects-edit-form form {
margin: 0;
.form-row {
margin-bottom: 20px;
margin-bottom: 15px;
label {
width: auto;
color: #555;
width: 100%;
display: block;
font-weight: 500;
&.projects-edit-form-sublabel {
color: #999;
text-align: right;
margin-bottom: -15px;
font-weight: normal;
}
&.projects-edit-form-inline-label {
font-weight: normal;
color: inherit;
width: auto;
}
}
input[type=text], input[type=password],textarea {
width: 100%;
@@ -36,6 +49,7 @@
vertical-align: top;
}
}
}
.projects-dialog-spinner {
position: absolute;