From 9199ac324c59e9409c477aee07aeb7daba2b30e6 Mon Sep 17 00:00:00 2001 From: Bogdan Deynega Date: Fri, 9 Jul 2021 15:15:38 +0200 Subject: [PATCH 1/6] =?UTF-8?q?"Keine=20doku=20f=C3=BCr=20parameter"=20kon?= =?UTF-8?q?sistent=20einger=C3=BCckt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/Components/ParameterView/ParameterNode.tsx | 2 +- client/src/index.css | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/client/src/Components/ParameterView/ParameterNode.tsx b/client/src/Components/ParameterView/ParameterNode.tsx index a1b768100..9211906aa 100644 --- a/client/src/Components/ParameterView/ParameterNode.tsx +++ b/client/src/Components/ParameterView/ParameterNode.tsx @@ -62,7 +62,7 @@ export default function ParameterNode(props: ParameterNodeProps): JSX.Element { } { !props.pythonParameter.description && -

There is no documentation for this parameter.

+

There is no documentation for this parameter.

} ); diff --git a/client/src/index.css b/client/src/index.css index 0acae2047..19aa4de40 100644 --- a/client/src/index.css +++ b/client/src/index.css @@ -40,6 +40,10 @@ code { padding-left: 4rem; } +.pl-4-2rem { + padding-left: 4.2rem; +} + .pl-4-5rem { padding-left: 4.5rem; } From 50e87dae4d50ad32fc738afdcbdb1174bbe0e772 Mon Sep 17 00:00:00 2001 From: Bogdan Deynega Date: Fri, 9 Jul 2021 16:01:50 +0200 Subject: [PATCH 2/6] =?UTF-8?q?Funktion=20doku=20konsistent=20einger=C3=BC?= =?UTF-8?q?ckt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/Components/ParameterView/DocumentationText.tsx | 1 - client/src/Components/ParameterView/ParameterNode.tsx | 2 +- client/src/index.css | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/client/src/Components/ParameterView/DocumentationText.tsx b/client/src/Components/ParameterView/DocumentationText.tsx index accbcc5fe..75e5ff06a 100644 --- a/client/src/Components/ParameterView/DocumentationText.tsx +++ b/client/src/Components/ParameterView/DocumentationText.tsx @@ -23,7 +23,6 @@ export default function DocumentationText({inputText = ""}: DocumentationTextPro const cssClasses = classNames( "read-more-button", { - "pl-1-5rem": !hasMultipleLines, } ); diff --git a/client/src/Components/ParameterView/ParameterNode.tsx b/client/src/Components/ParameterView/ParameterNode.tsx index 9211906aa..820eb1410 100644 --- a/client/src/Components/ParameterView/ParameterNode.tsx +++ b/client/src/Components/ParameterView/ParameterNode.tsx @@ -62,7 +62,7 @@ export default function ParameterNode(props: ParameterNodeProps): JSX.Element { } { !props.pythonParameter.description && -

There is no documentation for this parameter.

+

There is no documentation for this parameter.

} ); diff --git a/client/src/index.css b/client/src/index.css index 19aa4de40..30d02aa58 100644 --- a/client/src/index.css +++ b/client/src/index.css @@ -28,6 +28,10 @@ code { padding-left: 2.5rem; } +.pl-2-7rem { + padding-left: 2.7rem; +} + .pl-3rem { padding-left: 3rem; } @@ -40,10 +44,6 @@ code { padding-left: 4rem; } -.pl-4-2rem { - padding-left: 4.2rem; -} - .pl-4-5rem { padding-left: 4.5rem; } From c726637dd91b0a65009bada7955e9565e9fd9fc4 Mon Sep 17 00:00:00 2001 From: Bogdan Deynega Date: Fri, 16 Jul 2021 10:39:26 +0200 Subject: [PATCH 3/6] =?UTF-8?q?Weitere=20fix=20f=C3=BCr=20einr=C3=BCckung?= =?UTF-8?q?=20und=20whitespacing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/Components/ParameterView/DocumentationText.tsx | 4 ++-- client/src/Components/ParameterView/ParameterNode.tsx | 4 ++-- client/src/Components/ParameterView/ParameterView.css | 1 - client/src/Components/ParameterView/ParameterView.tsx | 4 ++-- client/src/index.css | 4 ---- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/client/src/Components/ParameterView/DocumentationText.tsx b/client/src/Components/ParameterView/DocumentationText.tsx index 043f096a7..aade43444 100644 --- a/client/src/Components/ParameterView/DocumentationText.tsx +++ b/client/src/Components/ParameterView/DocumentationText.tsx @@ -27,10 +27,10 @@ export default function DocumentationText({inputText = ""}: DocumentationTextPro ); return ( -
{ +
{ setReadMore(!readMore); }}> -
+
diff --git a/client/src/Components/ParameterView/ParameterNode.tsx b/client/src/Components/ParameterView/ParameterNode.tsx index 820eb1410..fad4e7019 100644 --- a/client/src/Components/ParameterView/ParameterNode.tsx +++ b/client/src/Components/ParameterView/ParameterNode.tsx @@ -29,7 +29,7 @@ export default function ParameterNode(props: ParameterNodeProps): JSX.Element { return (
-
+

{props.pythonParameter.name}

@@ -62,7 +62,7 @@ export default function ParameterNode(props: ParameterNodeProps): JSX.Element { } { !props.pythonParameter.description && -

There is no documentation for this parameter.

+

There is no documentation for this parameter.

}
); diff --git a/client/src/Components/ParameterView/ParameterView.css b/client/src/Components/ParameterView/ParameterView.css index 91df59eff..49f27b80c 100644 --- a/client/src/Components/ParameterView/ParameterView.css +++ b/client/src/Components/ParameterView/ParameterView.css @@ -17,7 +17,6 @@ } .parameter-list { - padding-left: 1rem; padding-bottom: .5rem; } diff --git a/client/src/Components/ParameterView/ParameterView.tsx b/client/src/Components/ParameterView/ParameterView.tsx index b05524159..9b43bdbea 100644 --- a/client/src/Components/ParameterView/ParameterView.tsx +++ b/client/src/Components/ParameterView/ParameterView.tsx @@ -24,7 +24,7 @@ export default function ParameterView(props: ParameterViewProps): JSX.Element { <>

{declaration.name}

-

Parameters

+

Parameters

{ !isEmptyList(declaration.parameters) ? declaration.parameters.map(parameters => ( @@ -35,7 +35,7 @@ export default function ParameterView(props: ParameterViewProps): JSX.Element { setAnnotationStore={props.setAnnotationStore} /> )) : - There are no parameters. + There are no parameters. } } diff --git a/client/src/index.css b/client/src/index.css index 30d02aa58..0acae2047 100644 --- a/client/src/index.css +++ b/client/src/index.css @@ -28,10 +28,6 @@ code { padding-left: 2.5rem; } -.pl-2-7rem { - padding-left: 2.7rem; -} - .pl-3rem { padding-left: 3rem; } From e4f8f09aa7713130e8823fc6c3f72062b69ec570 Mon Sep 17 00:00:00 2001 From: Bogdan Deynega Date: Fri, 16 Jul 2021 13:12:13 +0200 Subject: [PATCH 4/6] =?UTF-8?q?Noch=20Weitere=20fix=20f=C3=BCr=20einr?= =?UTF-8?q?=C3=BCckung=20und=20whitespacing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/Components/SelectionView/FunctionView.tsx | 2 +- client/src/Components/SelectionView/SelectionView.css | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/client/src/Components/SelectionView/FunctionView.tsx b/client/src/Components/SelectionView/FunctionView.tsx index 8c37abb52..748826855 100644 --- a/client/src/Components/SelectionView/FunctionView.tsx +++ b/client/src/Components/SelectionView/FunctionView.tsx @@ -36,7 +36,7 @@ export default function FunctionView(props: FunctionViewProps): JSX.Element { isTitle={false} /> )) : - There are no parameters. + There are no parameters. } } diff --git a/client/src/Components/SelectionView/SelectionView.css b/client/src/Components/SelectionView/SelectionView.css index 92035d019..853e982b9 100644 --- a/client/src/Components/SelectionView/SelectionView.css +++ b/client/src/Components/SelectionView/SelectionView.css @@ -57,7 +57,6 @@ h2 { padding-bottom: 15px; - padding-top: 15px; } h1 { From 603223511d97496de2bd43d6465099f398e18c07 Mon Sep 17 00:00:00 2001 From: Bogdan Deynega Date: Fri, 16 Jul 2021 13:37:58 +0200 Subject: [PATCH 5/6] Refactoring von Fixes --- client/src/Components/SelectionView/DocumentationText.tsx | 4 ++-- client/src/Components/SelectionView/FunctionView.tsx | 2 +- client/src/Components/SelectionView/ModuleView.tsx | 4 ++-- client/src/Components/SelectionView/ParameterNode.tsx | 2 +- client/src/Components/SelectionView/ParameterView.tsx | 2 +- client/src/Components/SelectionView/SectionListViewItem.tsx | 4 ++-- client/src/Components/SelectionView/SelectionView.css | 4 +++- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/client/src/Components/SelectionView/DocumentationText.tsx b/client/src/Components/SelectionView/DocumentationText.tsx index 8c03dc8b8..546b25694 100644 --- a/client/src/Components/SelectionView/DocumentationText.tsx +++ b/client/src/Components/SelectionView/DocumentationText.tsx @@ -23,7 +23,7 @@ export default function DocumentationText({inputText = ""}: DocumentationTextPro const cssClasses = classNames( "read-more-button", { - "pl-2rem": !hasMultipleLines, + "pl-1rem": !hasMultipleLines, } ); @@ -32,7 +32,7 @@ export default function DocumentationText({inputText = ""}: DocumentationTextPro }); return ( -
{ +
{ setReadMore(!readMore); }}> {hasMultipleLines &&
diff --git a/client/src/Components/SelectionView/FunctionView.tsx b/client/src/Components/SelectionView/FunctionView.tsx index 748826855..1dae0c4bb 100644 --- a/client/src/Components/SelectionView/FunctionView.tsx +++ b/client/src/Components/SelectionView/FunctionView.tsx @@ -36,7 +36,7 @@ export default function FunctionView(props: FunctionViewProps): JSX.Element { isTitle={false} /> )) : - There are no parameters. + There are no parameters. } } diff --git a/client/src/Components/SelectionView/ModuleView.tsx b/client/src/Components/SelectionView/ModuleView.tsx index 3ee88de65..8a1fe549d 100644 --- a/client/src/Components/SelectionView/ModuleView.tsx +++ b/client/src/Components/SelectionView/ModuleView.tsx @@ -29,7 +29,7 @@ export default function ModuleView(props: ModuleViewProps): JSX.Element { ))} : There are no imports. + style={{paddingLeft: '1rem'}}>There are no imports. }

Imported from

{!isEmptyList(declaration.fromImports) ? @@ -41,7 +41,7 @@ export default function ModuleView(props: ModuleViewProps): JSX.Element { ))} : There are no modules that import this module.} + style={{paddingLeft: '1rem'}}>There are no modules that import this module.} } diff --git a/client/src/Components/SelectionView/ParameterNode.tsx b/client/src/Components/SelectionView/ParameterNode.tsx index 48783852d..2bea373e9 100644 --- a/client/src/Components/SelectionView/ParameterNode.tsx +++ b/client/src/Components/SelectionView/ParameterNode.tsx @@ -70,7 +70,7 @@ export default function ParameterNode(props: ParameterNodeProps): JSX.Element { } { !props.pythonParameter.description && -

There is no documentation for this parameter.

+

There is no documentation for this parameter.

}
); diff --git a/client/src/Components/SelectionView/ParameterView.tsx b/client/src/Components/SelectionView/ParameterView.tsx index e99de8e07..a98e1dc61 100644 --- a/client/src/Components/SelectionView/ParameterView.tsx +++ b/client/src/Components/SelectionView/ParameterView.tsx @@ -28,7 +28,7 @@ export default function ParameterView(props: ParameterViewProps): JSX.Element { {declaration.hasDefault && } {declaration.type && - <>

Type

{declaration.type} + <>

Type

{declaration.type} } } diff --git a/client/src/Components/SelectionView/SectionListViewItem.tsx b/client/src/Components/SelectionView/SectionListViewItem.tsx index 394419711..62940f9b2 100644 --- a/client/src/Components/SelectionView/SectionListViewItem.tsx +++ b/client/src/Components/SelectionView/SectionListViewItem.tsx @@ -18,10 +18,10 @@ export default function SectionListViewItem(props: ClassViewItemProps): JSX.Elem { !isEmptyList(props.inputElements) ? props.inputElements.map((listElement, index) => ( -
{listElement}
+
{listElement}
)) : There are no {props.title.toLowerCase()}. + style={{paddingLeft: '1rem'}}>There are no {props.title.toLowerCase()}. } ); diff --git a/client/src/Components/SelectionView/SelectionView.css b/client/src/Components/SelectionView/SelectionView.css index 853e982b9..1764633b8 100644 --- a/client/src/Components/SelectionView/SelectionView.css +++ b/client/src/Components/SelectionView/SelectionView.css @@ -17,6 +17,7 @@ } .parameter-list { + padding-left: 1rem; padding-bottom: .5rem; } @@ -56,7 +57,8 @@ } h2 { - padding-bottom: 15px; + padding-top: 30px; + padding-bottom: 10px; } h1 { From f5bf4cb3c853e4bffc6f72ca0a8c5e595d328ab8 Mon Sep 17 00:00:00 2001 From: Bogdan Deynega Date: Fri, 16 Jul 2021 14:00:03 +0200 Subject: [PATCH 6/6] =?UTF-8?q?Weitere=20einr=C3=BCckung=20fixes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/Components/SelectionView/DocumentationText.tsx | 8 ++------ client/src/Components/SelectionView/ParameterNode.tsx | 7 +------ .../src/Components/SelectionView/RenameAnnotationView.tsx | 4 ++-- client/src/Components/SelectionView/SelectionView.css | 8 +++++++- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/client/src/Components/SelectionView/DocumentationText.tsx b/client/src/Components/SelectionView/DocumentationText.tsx index 546b25694..633c6a71f 100644 --- a/client/src/Components/SelectionView/DocumentationText.tsx +++ b/client/src/Components/SelectionView/DocumentationText.tsx @@ -27,17 +27,13 @@ export default function DocumentationText({inputText = ""}: DocumentationTextPro } ); - const iconCssClasses = classNames({ - "pl-1rem": hasMultipleLines, - }); - return (
{ setReadMore(!readMore); }}> - {hasMultipleLines &&
+ {hasMultipleLines && -
} + } diff --git a/client/src/Components/SelectionView/ParameterNode.tsx b/client/src/Components/SelectionView/ParameterNode.tsx index 2bea373e9..c4b6fcb74 100644 --- a/client/src/Components/SelectionView/ParameterNode.tsx +++ b/client/src/Components/SelectionView/ParameterNode.tsx @@ -4,7 +4,6 @@ import AnnotationStore from "../../model/annotation/AnnotationStore"; import PythonParameter from "../../model/python/PythonParameter"; import {Nullable, Setter} from "../../util/types"; import RenameDialog from "../Dialog/RenameDialog"; -import DocumentationText from "./DocumentationText"; import "./SelectionView.css"; import RenameAnnotationView from "./RenameAnnotationView"; import classNames from "classnames"; @@ -34,7 +33,7 @@ export default function ParameterNode(props: ParameterNodeProps): JSX.Element { }); return ( -
+
{props.isTitle ?

{props.pythonParameter.name}

:

{props.pythonParameter.name}

}
@@ -64,10 +63,6 @@ export default function ParameterNode(props: ParameterNodeProps): JSX.Element { setNewName={setNewName} />} - { - props.pythonParameter.description && - - } { !props.pythonParameter.description &&

There is no documentation for this parameter.

diff --git a/client/src/Components/SelectionView/RenameAnnotationView.tsx b/client/src/Components/SelectionView/RenameAnnotationView.tsx index 19ad14587..d30886e54 100644 --- a/client/src/Components/SelectionView/RenameAnnotationView.tsx +++ b/client/src/Components/SelectionView/RenameAnnotationView.tsx @@ -14,8 +14,8 @@ const RenameAnnotationView: React.FC = (props) => { const deleteRenameAnnotation = () => props.setNewName(null); if (props.newName !== null) { - return (
-
Annotations
+ return (
+

Annotations

{`@rename: ${props.newName}`} diff --git a/client/src/Components/SelectionView/SelectionView.css b/client/src/Components/SelectionView/SelectionView.css index 1764633b8..1d565f3dd 100644 --- a/client/src/Components/SelectionView/SelectionView.css +++ b/client/src/Components/SelectionView/SelectionView.css @@ -62,12 +62,13 @@ h2 { } h1 { + font-weight: bold; padding-bottom: 15px; } .module-list { list-style: none; - padding-left: 2rem; + padding-left: 1rem; } .module-list li:not(:first-child) { @@ -79,4 +80,9 @@ h1 { margin-bottom: 10px; padding-bottom: 20px; align-self: flex-end; +} + +.annotation-list { + padding-bottom: 20px; + padding-left: 1rem; } \ No newline at end of file