From fccd6cc19b8be3843b4cdfc065cc58c14e53a579 Mon Sep 17 00:00:00 2001 From: UnchartedBull Date: Tue, 26 Nov 2019 14:25:31 +0100 Subject: [PATCH 1/3] Slightly update object icon --- icons.txt | 2 +- src/assets/object.svg | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/icons.txt b/icons.txt index b3730d3d5..5cb8e6bb6 100644 --- a/icons.txt +++ b/icons.txt @@ -23,4 +23,4 @@ "discard" by Alice Design from the Noun Project "Heat" by Adrien Coquet from the Noun Project "sleeping" by AomAm from the Noun Project -"3d modeling" by Template, TH from the Noun Project \ No newline at end of file +"cubes" by artworkbean from the Noun Project \ No newline at end of file diff --git a/src/assets/object.svg b/src/assets/object.svg index a5e9768a2..1e5c77f4c 100644 --- a/src/assets/object.svg +++ b/src/assets/object.svg @@ -1 +1,5 @@ - \ No newline at end of file + + + + + From 8b26e26f109b877731968ba977373502240394a7 Mon Sep 17 00:00:00 2001 From: UnchartedBull Date: Tue, 26 Nov 2019 14:30:56 +0100 Subject: [PATCH 2/3] Now working --- .../main-screen/main-screen.component.html | 8 +++--- .../print-control.component.html | 28 +++++++++++++------ .../print-control/print-control.component.ts | 3 +- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/app/main-screen/main-screen.component.html b/src/app/main-screen/main-screen.component.html index 466c38dc8..e2407648b 100644 --- a/src/app/main-screen/main-screen.component.html +++ b/src/app/main-screen/main-screen.component.html @@ -1,12 +1,12 @@ -
- +
+
-
+ diff --git a/src/app/print-control/print-control.component.html b/src/app/print-control/print-control.component.html index 6aeac66ec..5bb0f9831 100644 --- a/src/app/print-control/print-control.component.html +++ b/src/app/print-control/print-control.component.html @@ -55,50 +55,60 @@