diff --git a/frontend/css/global.scss b/frontend/css/global.scss
index 388fd6354..98c6b1655 100644
--- a/frontend/css/global.scss
+++ b/frontend/css/global.scss
@@ -937,7 +937,6 @@ ul {
}
}
-.farmware-button,
.farmware-settings-menu {
position: absolute !important;
top: 3rem;
diff --git a/frontend/css/image_flipper.scss b/frontend/css/image_flipper.scss
index d48c07c31..32ee9a77b 100644
--- a/frontend/css/image_flipper.scss
+++ b/frontend/css/image_flipper.scss
@@ -1,6 +1,7 @@
.image-flipper {
position: relative;
margin-top: 1rem;
+ display: inline-block;
}
.image-flipper-image {
@@ -88,6 +89,24 @@
}
}
+.photos{
+ .farmware-button{
+ position: relative!important;
+ height: 0px;
+ bottom: 2rem;
+ float: right!important;
+ }
+}
+
+.weed-detector{
+ .farmware-button{
+ position: relative;
+ height: 0px;
+ top: 0rem;
+ float: right;
+ }
+}
+
.farmware-button {
div {
float: right;
diff --git a/frontend/css/sequences.scss b/frontend/css/sequences.scss
index 45709235c..24e64a351 100644
--- a/frontend/css/sequences.scss
+++ b/frontend/css/sequences.scss
@@ -53,6 +53,7 @@
padding-left: 15px;
}
.title-help-text {
+ margin-bottom: 1.5rem;
padding-left: 15px;
padding-right: 15px;
}
@@ -77,8 +78,8 @@
.farmware-input-panel-contents {
.farmware-info-button {
position: absolute;
- top: 7rem;
- left: 35%;
+ top: 5rem;
+ left: 61%;
}
}
diff --git a/frontend/css/tooltips.scss b/frontend/css/tooltips.scss
index afb7406b5..098d0a399 100644
--- a/frontend/css/tooltips.scss
+++ b/frontend/css/tooltips.scss
@@ -24,53 +24,39 @@
}
.title-help {
- display: inline;
- .fa {
- color: $dark_gray;
- }
- &:hover {
- .fa {
+ display: inline;
+ .title-help-text {
+ overflow: hidden;
+ max-height: 0;
+ color: transparent;
+ transition: all 0.5s ease;
+ transition-delay: 0.2s;
+ font-style: italic;
+ line-height: 2rem;
+ font-family: sans-serif;
+ a {
+ pointer-events: all;
+ }
+ a:link {
+ font-style: normal;
color: $black;
}
- }
-}
-
-.title-help-text {
- overflow: hidden;
- max-height: 0;
- color: transparent;
- transition: all 0.5s ease;
- transition-delay: 0.5s;
- font-style: italic;
- color: $black;
- line-height: 2rem;
- font-family: sans-serif;
- a {
- pointer-events: all;
- }
- a:link {
- font-style: normal;
- color: $black;
- }
- a:hover {
- font-weight: 600;
- color: $black;
- }
- a:active {
- color: $black;
- }
-}
-
-.title-help-icon {
- margin: 0 1rem;
- display: inline;
- &.open{
- .title-help-text {
+ a:hover {
+ font-weight: 600;
+ color: $black;
+ }
+ a:active {
+ color: $black;
+ }
+ &.open{
max-height: 16rem;
- transition-delay: 0.2s;
color: $black;
transition: all 0.5s ease;
margin-bottom: 4rem;
}
}
}
+ .title-help-icon {
+ margin: 0 1rem;
+ display: inline;
+ }
diff --git a/frontend/css/widgets.scss b/frontend/css/widgets.scss
index 3d8fe1053..6b1ef9921 100644
--- a/frontend/css/widgets.scss
+++ b/frontend/css/widgets.scss
@@ -26,22 +26,36 @@
background: $dark_gray;
letter-spacing: .05rem;
padding: .75rem 1rem;
- >*:not(h5):not(.help-icon) {
+ >*:not(h5):not(.title-help-icon):not(.title-help) {
margin-left: 1rem;
}
- i.help-icon {
+ .title-help{
display: inline;
- padding: 1rem 0;
- color: $medium_gray;
- &:hover {
- color: $gray;
- transition-delay: 0.1s;
+ .title-help-text {
+ &.open{
+ opacity: 100;
+ padding: 0.5rem 0.3rem;
+ max-height: 200px;
+ transition: 0.5s;
+ color: $white;
+ display: block;
+ margin-bottom: 0%;
+ }
}
+ .title-help-icon {
+ display: inline;
+ padding: 1rem 0;
+ color: $medium_gray;
+ &:hover {
+ color: $gray;
+ transition-delay: 0.1s;
+ }
+ }
}
i.fa-cog {
color: $white;
}
- .help-text {
+ .title-help-text {
font-style: italic;
color: $off_white;
line-height: 2rem;
@@ -51,7 +65,7 @@
max-height: 0px;
transition: all 0.5s ease;
transition-delay: 0.2s;
- pointer-events: none;
+ display: table-column-group;
a {
pointer-events: all;
}
@@ -72,7 +86,6 @@
color: $gray;
font-size: 1.2rem;
text-transform: uppercase;
- margin-right: 1rem;
}
}
diff --git a/frontend/extras/__tests__/fallback_widget_test.tsx b/frontend/extras/__tests__/fallback_widget_test.tsx
index a61d33263..2a72c312b 100644
--- a/frontend/extras/__tests__/fallback_widget_test.tsx
+++ b/frontend/extras/__tests__/fallback_widget_test.tsx
@@ -18,8 +18,8 @@ describe("