diff --git a/arches/app/media/css/arches.css b/arches/app/media/css/arches.css index 676fb87767c..5acf5e1dfb8 100644 --- a/arches/app/media/css/arches.css +++ b/arches/app/media/css/arches.css @@ -531,7 +531,7 @@ input[type="checkbox"] { .workflow-step-body { background-color: #eee; height: 100%; - padding: 20px 35px 200px 40px; + padding: 20px 35px 300px 40px; overflow-y: auto; } @@ -3264,6 +3264,17 @@ ul.nav.nav-tabs.nav-justified { min-width: 468px; } +.function-node-alert { + background: #0ab1fc; + padding: 15px 10px; + margin-top: -15px; + margin-left: -5px; + margin-bottom: 15px; + font-size: 14px; + font-weight: 400; + color: #fff; +} + .edtf-input { padding-bottom: 15px; } @@ -6911,12 +6922,12 @@ ul div .card-tree-list span .card-tree-list-item .card-tree-list-icon { cursor: default; padding: 3px 5px 5px 5px; margin-right: 10px; - background: #F5BB25; + background: #FFB700; color: #fff; } .has-provisional-edits { - color: #F5BB25; + color: #FFD15B; } .provisional-edits-list { @@ -6930,9 +6941,10 @@ ul div .card-tree-list span .card-tree-list-item .card-tree-list-icon { } .edit-message-container { - background: #F799B9; + background: #FFD15B; color: #fff; - border-bottom: 1px solid #DF2E6A; + font-weight: 700; + border-bottom: 1px solid #FFB700; height: 50px; margin-top: -15px; margin-bottom: 15px; @@ -6943,7 +6955,8 @@ ul div .card-tree-list span .card-tree-list-item .card-tree-list-icon { .edit-message-container .reset-authoritative { float: right; - color: white; + color: #fff; + font-weight: 600; } @@ -12363,6 +12376,7 @@ a.filter-tools:hover { background: white; width: 100%; overflow-y: auto; + height: 100vh; } .editor-report .rp-report-section { @@ -13351,6 +13365,17 @@ ul.select2-choices:after { margin-top: 5px; } +.card-component-panel .card-component .is-function-node { + /*background: #0ab1fc; + color: #fff; + padding: 15px 10px; + margin-bottom: 15px;*/ + font-size: 13px; + font-weight: 600; + margin-top: -5px; + margin-bottom: 15px; +} + .card-component-panel hr { border-color: #e9e9e9; } diff --git a/arches/app/media/css/tree/tree.css b/arches/app/media/css/tree/tree.css index e8fee99e973..35daee2e3cd 100644 --- a/arches/app/media/css/tree/tree.css +++ b/arches/app/media/css/tree/tree.css @@ -205,7 +205,7 @@ a.filtered > span:hover { } .jstree-default .func-node { - background: #3acaa1; + background: #0ab1fc; color: #fff; border-width: 2px; } diff --git a/arches/app/media/js/viewmodels/card.js b/arches/app/media/js/viewmodels/card.js index afe7baa9f92..fdedb54539a 100644 --- a/arches/app/media/js/viewmodels/card.js +++ b/arches/app/media/js/viewmodels/card.js @@ -356,9 +356,9 @@ define([ } nodegroupId = params.card.nodegroup_id; if(nodegroupId === appFuncDesc) { - return "* This card data will show as the resource description."; + return "(This card data will define the resource description.)"; } else if(nodegroupId === appFuncName) { - return "* This card data will show as the resource name."; + return "(This card data will define the resource name.)"; } } } diff --git a/arches/app/templates/views/components/cards/default.htm b/arches/app/templates/views/components/cards/default.htm index f0803dea143..51f93a6e430 100644 --- a/arches/app/templates/views/components/cards/default.htm +++ b/arches/app/templates/views/components/cards/default.htm @@ -267,7 +267,7 @@ {% block form_header %}
- + diff --git a/arches/app/templates/views/graph/graph-designer/node-form.htm b/arches/app/templates/views/graph/graph-designer/node-form.htm index 116b91f01a5..129a5ea726b 100644 --- a/arches/app/templates/views/graph/graph-designer/node-form.htm +++ b/arches/app/templates/views/graph/graph-designer/node-form.htm @@ -30,7 +30,7 @@