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 initial version control sidebar with commit function

Browse Source
This commit is contained in:
Nick O'Leary
2017-10-07 00:18:20 +01:00
parent 522f7e6844
commit 9a2fd0e2b2
18 changed files with 852 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
editor/sass/diff.scss
View File

@@ -357,6 +357,7 @@
.node-diff-added { color: #009900}
.node-diff-deleted { color: #f80000}
.node-diff-changed { color: #f89406}
.node-diff-unchanged { color: #bbb}
.node-diff-conflicted { color: purple}

2
editor/sass/editor.scss
View File

@@ -213,7 +213,7 @@
height: 34px;
line-height: 32px;
font-size: 13px;
border-radius: 4px;
border-radius: 2px;
padding: 0 10px;
&.toggle {
@include workspace-button-toggle;

47
editor/sass/mixins.scss
View File

@@ -97,6 +97,23 @@
&:focus {
outline: 1px solid $workspace-button-color-focus-outline;
}
&.primary {
border-color: $editor-button-background-primary;
color: $editor-button-color-primary !important;
background: $editor-button-background-primary;
&.disabled, &.ui-state-disabled {
background: none;
color: $editor-button-color !important;
border-color: $form-input-border-color;
}
&:not(.disabled):not(.ui-button-disabled):hover {
border-color: $editor-button-background-primary-hover;
background: $editor-button-background-primary-hover;
color: $editor-button-color-primary !important;
}
}
}
.button-group-vertical {
display: inline-block;
@@ -132,21 +149,21 @@
color: $editor-button-color !important;
background: $editor-button-background;
&.primary {
border-color: $editor-button-background-primary;
color: $editor-button-color-primary !important;
background: $editor-button-background-primary;
&.disabled, &.ui-state-disabled {
background: none;
color: $editor-button-color !important;
border-color: $form-input-border-color;
}
&:not(.disabled):not(.ui-button-disabled):hover {
border-color: $editor-button-background-primary-hover;
background: $editor-button-background-primary-hover;
color: $editor-button-color-primary !important;
}
}
// &.primary {
// border-color: $editor-button-background-primary;
// color: $editor-button-color-primary !important;
// background: $editor-button-background-primary;
// &.disabled, &.ui-state-disabled {
// background: none;
// color: $editor-button-color !important;
// border-color: $form-input-border-color;
// }
// &:not(.disabled):not(.ui-button-disabled):hover {
// border-color: $editor-button-background-primary-hover;
// background: $editor-button-background-primary-hover;
// color: $editor-button-color-primary !important;
// }
// }
&:not(.disabled):hover {
//color: $editor-button-color;
}

2
editor/sass/palette.scss
View File

@@ -95,7 +95,7 @@
text-overflow: ellipsis;
}
.palette-header i {
.palette-header > i {
margin: 3px 10px 3px 3px;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;

102
editor/sass/projects.scss
View File

@@ -65,6 +65,13 @@
width: 40px;
}
}
&.projects-version-control-spinner-sidebar {
background: white;
padding:0;
img {
width: 20px;
}
}
}
@@ -72,7 +79,7 @@
button.editor-button {
width: calc(50% - 40px);
margin: 20px;
height: 200px;
height: 175px;
line-height: 2em;
font-size: 1.5em !important;
i {
@@ -173,10 +180,10 @@
}
.sidebar-projects {
.sidebar-version-control {
height: 100%;
}
.sidebar-projects-stack-info {
.sidebar-version-control-stack-info {
height: 100px;
box-sizing: border-box;
border-bottom: 1px solid $secondary-border-color;
@@ -185,13 +192,13 @@
color: #999;
}
}
.sidebar-projects-stack {
.sidebar-version-control-stack {
position: absolute;
top: 100px;
top: 0px;
bottom: 0;
left: 0;
right: 0;
overflow-y: scroll;
overflow: hidden;
.palette-category {
&:not(.palette-category-expanded) button {
@@ -240,3 +247,86 @@
overflow-y: auto;
padding: 8px 20px 20px;
}
.sidebar-version-control-change-container {
position: relative;
height: 50%;
box-sizing: border-box;
border-top: 1px solid $secondary-border-color;
transition: height 0.2s ease-in-out;
&:first-child {
// border-bottom: 1px solid $primary-border-color;
}
.red-ui-editableList-container {
background: #f9f9f9;
padding: 0;
li {
padding:0;
background: #fff;
}
}
.red-ui-editableList-border {
border: none;
border-radius: 0;
}
}
.sidebar-version-control-change-commit-box {
position:absolute;
bottom: 0;
left:0;
right:0;
height:0;
transition: height 0.2s ease-in-out;
background: #f6f6f6;
box-sizing: border-box;
overflow: hidden;
border-top: 1px solid $secondary-border-color;
textarea {
height: 110px;
margin: 10px;
width: calc(100% - 20px);
box-sizing: border-box;
border-radius: 1px;
resize: none;
}
}
.sidebar-version-control-change-commit-toolbar {
padding: 0 20px;
text-align: right;
}
.sidebar-version-control-change-entry {
height: 20px;
padding: 5px 10px;
position: relative;
white-space: nowrap;
span {
margin: 0 6px;
}
.button-group {
position: absolute;
top: 4px;
right: 4px;
display: none;
}
button {
width: 24px;
}
&:hover {
.button-group {
display: block;
}
}
}
.sidebar-version-control-change-header {
color: #666;
background: #f6f6f6;
padding: 4px 10px;
height: 30px;
box-sizing: border-box;
border-bottom: 1px solid $secondary-border-color;
i {
transition: all 0.2s ease-in-out;
}
}

4
editor/sass/ui/common/stack.scss
View File

@@ -18,5 +18,9 @@
background: white;
.palette-category {
background: white;
&:last-child {
border-bottom: none;
}
}
}