From 75a9f050d7b92996b464488001829042cb5051a0 Mon Sep 17 00:00:00 2001 From: YuanHu Date: Tue, 27 Mar 2018 15:57:07 +0800 Subject: Modify css files Modify css files Issue-ID: SDC-1130,SDC-1131 Change-Id: I5da79bb12b7f9e52a4317bae190f873d2949b84f Signed-off-by: YuanHu --- .../editable-property.component.css | 51 ++++++++++++++++++---- .../src/app/components/menus/menus.component.css | 13 +++--- .../app/components/menus/menus.component.spec.ts | 36 +++++++-------- .../src/app/components/node/node.component.css | 5 ++- .../components/parameter/parameter.component.css | 40 +++++++++++------ .../components/property/properties.component.css | 13 ++---- .../node-parameters/node-parameters.component.css | 0 .../rest-parameters/rest-parameters.component.css | 11 +++++ .../service-task/service-task.component.css | 11 +++++ .../property/start-event/start-event.component.css | 44 +++++++++++++++++++ .../app/components/toolbar/toolbar.component.css | 31 ++++++++----- 11 files changed, 186 insertions(+), 69 deletions(-) create mode 100644 sdc-workflow-designer-ui/src/app/components/property/rest-task/node-parameters/node-parameters.component.css create mode 100644 sdc-workflow-designer-ui/src/app/components/property/rest-task/rest-parameters/rest-parameters.component.css create mode 100644 sdc-workflow-designer-ui/src/app/components/property/service-task/service-task.component.css create mode 100644 sdc-workflow-designer-ui/src/app/components/property/start-event/start-event.component.css (limited to 'sdc-workflow-designer-ui/src/app/components') diff --git a/sdc-workflow-designer-ui/src/app/components/editable-property/editable-property.component.css b/sdc-workflow-designer-ui/src/app/components/editable-property/editable-property.component.css index 257a07df..35d21fce 100644 --- a/sdc-workflow-designer-ui/src/app/components/editable-property/editable-property.component.css +++ b/sdc-workflow-designer-ui/src/app/components/editable-property/editable-property.component.css @@ -10,17 +10,52 @@ * ZTE - initial API and implementation and/or initial documentation */ -.edit{ - font-size: 24px; +.editable-content { + display: inline-block; width: 300px; - height: 30px; - border: 1px solid #fff; + visibility: visible; +} + +.editable-main { + border: 1px solid transparent; + border-radius: 3px; + cursor: pointer; + font-size: 24px; + min-height: 34px; + padding: 2px 20px 2px 2px; + position: relative; + word-wrap: break-word; +} + +.editable-main:hover { + border: 1px solid #ddd; +} + +.editable-main span { + background-color: #f0f0f0; + border-left: 1px solid #ddd; + display: none; + padding: 0 4px 0 4px; + height: 100%; + position: absolute; + right: 0; + top: 0; + -moz-border-radius-topright: 3px; + -moz-border-radius-bottomright: 3px; + -webkit-border-top-right-radius: 3px; + -webkit-border-bottom-right-radius: 3px; +} + +.editable-main span i { + font-size: 16px; + color: #707070; } -.edit:hover{ - border-color: #80bdff; +.editable-main:hover span { + display: inline; } -.edit:focus{ - border-color: #80bdff; +.editable-field { + display: inline-block; + width: 100%; } \ No newline at end of file diff --git a/sdc-workflow-designer-ui/src/app/components/menus/menus.component.css b/sdc-workflow-designer-ui/src/app/components/menus/menus.component.css index 6ba4133b..ac50221e 100644 --- a/sdc-workflow-designer-ui/src/app/components/menus/menus.component.css +++ b/sdc-workflow-designer-ui/src/app/components/menus/menus.component.css @@ -10,14 +10,17 @@ * ZTE - initial API and implementation and/or initial documentation */ -.btn-right{ - float: right; +.wf-name{ + float: left; + font-size: 20px; + font-weight: bold; } -.btn-left{ - float: left; +.btn-right{ + float: right; + margin-right: 5px; } button i{ padding-right: 3px; -} +} \ No newline at end of file diff --git a/sdc-workflow-designer-ui/src/app/components/menus/menus.component.spec.ts b/sdc-workflow-designer-ui/src/app/components/menus/menus.component.spec.ts index b80edce7..6ac02fde 100644 --- a/sdc-workflow-designer-ui/src/app/components/menus/menus.component.spec.ts +++ b/sdc-workflow-designer-ui/src/app/components/menus/menus.component.spec.ts @@ -11,26 +11,26 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MenuComponent } from './menu.component'; +import { MenusComponent } from './menus.component'; -describe('MenuComponent', () => { - let component: MenuComponent; - let fixture: ComponentFixture; +describe('MenusComponent', () => { + let component: MenusComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [MenuComponent] - }) - .compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ MenusComponent ] + }) + .compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(MenuComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(MenusComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should be created', () => { - expect(component).toBeTruthy(); - }); + it('should be created', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/sdc-workflow-designer-ui/src/app/components/node/node.component.css b/sdc-workflow-designer-ui/src/app/components/node/node.component.css index 85cb0422..f1fead94 100644 --- a/sdc-workflow-designer-ui/src/app/components/node/node.component.css +++ b/sdc-workflow-designer-ui/src/app/components/node/node.component.css @@ -18,6 +18,7 @@ } .node-icon{ + position: relative; border-radius: 4px; } @@ -54,12 +55,12 @@ .anchor-left { left: -6px; - top: calc(50%); + top: calc(50% - 6px); } .anchor-right { right: -6px; - top: calc(50%); + top: calc(50% - 6px); } .anchor-top { diff --git a/sdc-workflow-designer-ui/src/app/components/parameter/parameter.component.css b/sdc-workflow-designer-ui/src/app/components/parameter/parameter.component.css index 9cf5d60f..4002997c 100644 --- a/sdc-workflow-designer-ui/src/app/components/parameter/parameter.component.css +++ b/sdc-workflow-designer-ui/src/app/components/parameter/parameter.component.css @@ -9,30 +9,42 @@ * Contributors: * ZTE - initial API and implementation and/or initial documentation */ -.form-control-label{ - margin-bottom: 0; - width: 100px; - vertical-align: middle; + +.parameter{ + margin-bottom: 1rem; +} + +.parameter-section{ + display: inline; + margin-right: 5px; } .parameter-item{ display: inline; - margin-left: 5px; - vertical-align: middle; } -.form-control-required{ +.parameter-required{ color: red; - height: 30px; - line-height: 30px; } -.form-control-input{ - width: 120px; - vertical-align: middle; +.parameter-label{ + width: 100px; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + vertical-align: bottom; + /* display: inline-table; */ } -.form-control-value{ +.parameter-value{ width: 160px; - display: inline-block; + vertical-align: baseline; +} + +.plx-input{ + vertical-align: baseline; +} + +.plx-btn{ + vertical-align: baseline; } diff --git a/sdc-workflow-designer-ui/src/app/components/property/properties.component.css b/sdc-workflow-designer-ui/src/app/components/property/properties.component.css index 6c8c67d3..5189f551 100644 --- a/sdc-workflow-designer-ui/src/app/components/property/properties.component.css +++ b/sdc-workflow-designer-ui/src/app/components/property/properties.component.css @@ -30,14 +30,7 @@ overflow: auto; } -.edit { - display: none; -} - -.editing .view { - display: none; -} - -.editing .edit { - display: block; +.plx-btn{ + float: right; + margin-right: 0; } diff --git a/sdc-workflow-designer-ui/src/app/components/property/rest-task/node-parameters/node-parameters.component.css b/sdc-workflow-designer-ui/src/app/components/property/rest-task/node-parameters/node-parameters.component.css new file mode 100644 index 00000000..e69de29b diff --git a/sdc-workflow-designer-ui/src/app/components/property/rest-task/rest-parameters/rest-parameters.component.css b/sdc-workflow-designer-ui/src/app/components/property/rest-task/rest-parameters/rest-parameters.component.css new file mode 100644 index 00000000..a2dc6ff6 --- /dev/null +++ b/sdc-workflow-designer-ui/src/app/components/property/rest-task/rest-parameters/rest-parameters.component.css @@ -0,0 +1,11 @@ +/******************************************************************************* + * Copyright (c) 2017 ZTE Corporation. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * and the Apache License 2.0 which both accompany this distribution, + * and are available at http://www.eclipse.org/legal/epl-v10.html + * and http://www.apache.org/licenses/LICENSE-2.0 + * + * Contributors: + * ZTE - initial API and implementation and/or initial documentation + *******************************************************************************/ \ No newline at end of file diff --git a/sdc-workflow-designer-ui/src/app/components/property/service-task/service-task.component.css b/sdc-workflow-designer-ui/src/app/components/property/service-task/service-task.component.css new file mode 100644 index 00000000..670c050a --- /dev/null +++ b/sdc-workflow-designer-ui/src/app/components/property/service-task/service-task.component.css @@ -0,0 +1,11 @@ +/** + * Copyright (c) 2017 ZTE Corporation. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * and the Apache License 2.0 which both accompany this distribution, + * and are available at http://www.eclipse.org/legal/epl-v10.html + * and http://www.apache.org/licenses/LICENSE-2.0 + * + * Contributors: + * ZTE - initial API and implementation and/or initial documentation + */ \ No newline at end of file diff --git a/sdc-workflow-designer-ui/src/app/components/property/start-event/start-event.component.css b/sdc-workflow-designer-ui/src/app/components/property/start-event/start-event.component.css new file mode 100644 index 00000000..ac88051d --- /dev/null +++ b/sdc-workflow-designer-ui/src/app/components/property/start-event/start-event.component.css @@ -0,0 +1,44 @@ +/** + * Copyright (c) 2017 ZTE Corporation. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * and the Apache License 2.0 which both accompany this distribution, + * and are available at http://www.eclipse.org/legal/epl-v10.html + * and http://www.apache.org/licenses/LICENSE-2.0 + * + * Contributors: + * ZTE - initial API and implementation and/or initial documentation + */ +table{ + border: 1px solid #eceeef; + width: 100%; +} + +.table-body{ + background-color: #fff; +} + +th{ + background-color: #f5f5f5; +} + +td input{ + width: 100%; +} + +td span{ + color: #ff5b55; +} + +.delete-icon{ + color: #ff5b55; + font-size: 16px; +} + +.delete-icon:hover{ + cursor: pointer; +} + +.plx-btn{ + margin-top: 10px; +} \ No newline at end of file diff --git a/sdc-workflow-designer-ui/src/app/components/toolbar/toolbar.component.css b/sdc-workflow-designer-ui/src/app/components/toolbar/toolbar.component.css index 4da64d16..6b0d5436 100644 --- a/sdc-workflow-designer-ui/src/app/components/toolbar/toolbar.component.css +++ b/sdc-workflow-designer-ui/src/app/components/toolbar/toolbar.component.css @@ -9,22 +9,22 @@ * Contributors: * ZTE - initial API and implementation and/or initial documentation */ -.toolbar-head{ - color:#404040; +.toolbar-head { + color: #404040; font-size: 14px; } -.toolbar-head:hover{ +.toolbar-head:hover { cursor: pointer; } -.fold-icon{ +.fold-icon { width: 15px; font-size: 8px; color: #00abff; } -.item{ +.item { width: 50px; height: 50px; text-align: center; @@ -33,30 +33,37 @@ margin-bottom: 10px; } -.item:hover{ +.item:hover { cursor: pointer; } -.item svg{ - width:24px; - height:24px; +.item svg { + width: 24px; + height: 24px; margin: 4px 13px; display: block; /* fill: #A9B2BA; */ fill: #00ABFF; } -.item span{ +.item img { + width: 24px; + height: 24px; + margin: 4px 13px; + display: block; +} + +.item span { font-size: 12px; color: #595959; display: block; } -.getway{ +.getway { padding-top: 5px; } -.getway div{ +.getway div { width: 30px !important; height: 30px !important; } \ No newline at end of file -- cgit 1.2.3-korg