From 4d6fd423106a7e4c93c82a90eb4c33b4cd0bfa8e Mon Sep 17 00:00:00 2001
From: lucile varloteaux <lucile.varloteaux@inrae.fr>
Date: Tue, 9 Aug 2022 11:13:37 +0200
Subject: [PATCH 1/3] uniformisation affichage icon et btn
---
ui/src/components/common/CollapsibleTree.vue | 4 ++--
ui/src/style/_variables.scss | 2 +-
ui/src/views/application/ApplicationsView.vue | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ui/src/components/common/CollapsibleTree.vue b/ui/src/components/common/CollapsibleTree.vue
index 203eeb1d8..5a555b564 100644
--- a/ui/src/components/common/CollapsibleTree.vue
+++ b/ui/src/components/common/CollapsibleTree.vue
@@ -90,7 +90,7 @@
@input="() => onUploadCb(option.label, refFile) && showChildren()"
>
<span class="file-cta">
- <b-icon icon="upload" style="font-size: 0.75rem"></b-icon>
+ <b-icon icon="upload"></b-icon>
</span>
</b-upload>
</div>
@@ -105,7 +105,7 @@
<b-icon
class="file-icon"
icon="archive"
- style="font-size: 0.75rem; color: white"
+ style="color: white"
></b-icon>
</span>
</b-button>
diff --git a/ui/src/style/_variables.scss b/ui/src/style/_variables.scss
index 74bd3a08c..9f2825921 100644
--- a/ui/src/style/_variables.scss
+++ b/ui/src/style/_variables.scss
@@ -13,7 +13,7 @@ $info-transparent: rgba(78, 198, 194, 0.3);
$container-padding-hor: 3rem;
$container-padding-vert: $container-padding-hor / 2;
$title-margin-top: 1.5rem;
-$size-icon-small: 0.75rem;
+$size-icon-small: 1.15rem;
// MenuView
$menu-height: 80px;
diff --git a/ui/src/views/application/ApplicationsView.vue b/ui/src/views/application/ApplicationsView.vue
index ab58b770a..20af5b267 100644
--- a/ui/src/views/application/ApplicationsView.vue
+++ b/ui/src/views/application/ApplicationsView.vue
@@ -357,6 +357,7 @@ export default class ApplicationsView extends Vue {
.card-footer-item {
border-right: none;
+ padding: 0.5rem;
}
}
}
--
GitLab
From 3ba12adb7b0b0cba0cdb9316a423aef05bb2bc86 Mon Sep 17 00:00:00 2001
From: lucile varloteaux <lucile.varloteaux@inrae.fr>
Date: Tue, 9 Aug 2022 11:46:07 +0200
Subject: [PATCH 2/3] finis
---
.../components/common/AuthorizationForPeriodDatagroups.vue | 6 +++---
ui/src/style/_common.scss | 7 ++++++-
ui/src/style/_variables.scss | 1 +
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ui/src/components/common/AuthorizationForPeriodDatagroups.vue b/ui/src/components/common/AuthorizationForPeriodDatagroups.vue
index 01c733ee4..5408b8d19 100644
--- a/ui/src/components/common/AuthorizationForPeriodDatagroups.vue
+++ b/ui/src/components/common/AuthorizationForPeriodDatagroups.vue
@@ -1,19 +1,19 @@
<template>
<span>
<b-tooltip position="is-right" multilined>
- <a
+ <b-button
v-if="(column.withDataGroups && dataGroups.length > 1) || column.withPeriods"
class="show-check-details"
:type="state.state !== 1 ? 'is-grey ' : 'is-primary '"
@click="showDetail"
- style="color: #006464ff; margin-left: 10px"
+ style="border: none; background-color: transparent; margin: 0px"
><b-icon
:type="disabled?'is-warning-light':'is-primary'"
v-if="(column.withDataGroups && dataGroups.length > 1) || column.withPeriods"
icon="eye"
size="fa-4x"
></b-icon
- ></a>
+ ></b-button>
<template v-slot:content>
<div v-if="disabled"
class="has-background-warning-light has-text-black-bis">
diff --git a/ui/src/style/_common.scss b/ui/src/style/_common.scss
index ab3c11a67..90fc4d0bb 100644
--- a/ui/src/style/_common.scss
+++ b/ui/src/style/_common.scss
@@ -26,13 +26,18 @@ a {
// affichage icon uniformisé
.control.has-icons-right .input.is-small ~ .icon,
.control.has-icons-left .input.is-small ~ .icon {
- font-size: 0.5rem;
+ font-size: 0.75rem;
+ top: 0;
+ margin-left: 0;
}
.button .icon, .button .icon.is-small, .icon{
font-size: $size-icon-small;
align-items: center;
display: inline-flex;
}
+.icon.is-medium {
+ font-size: $size-icon-medium;
+}
.inputAuth .control.has-icons-left .icon.is-left{
top: 8px;
diff --git a/ui/src/style/_variables.scss b/ui/src/style/_variables.scss
index 9f2825921..166c28c0b 100644
--- a/ui/src/style/_variables.scss
+++ b/ui/src/style/_variables.scss
@@ -14,6 +14,7 @@ $container-padding-hor: 3rem;
$container-padding-vert: $container-padding-hor / 2;
$title-margin-top: 1.5rem;
$size-icon-small: 1.15rem;
+$size-icon-medium: 1.5rem;
// MenuView
$menu-height: 80px;
--
GitLab
From b0772b55e831fa73638b1600785e4e71de1458ab Mon Sep 17 00:00:00 2001
From: lucile varloteaux <lucile.varloteaux@inrae.fr>
Date: Wed, 10 Aug 2022 09:21:41 +0200
Subject: [PATCH 3/3] =?UTF-8?q?j'en=20avais=20oubli=C3=A9=20quelques=20uns?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ui/src/style/_common.scss | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/ui/src/style/_common.scss b/ui/src/style/_common.scss
index 90fc4d0bb..5ad39bd60 100644
--- a/ui/src/style/_common.scss
+++ b/ui/src/style/_common.scss
@@ -38,20 +38,17 @@ a {
.icon.is-medium {
font-size: $size-icon-medium;
}
+.control.has-icons-right .icon.is-right {
+ top: -2px;
+}
+.control.has-icons-left .icon {
+ top: -5px;
+}
.inputAuth .control.has-icons-left .icon.is-left{
- top: 8px;
- font-size: 0.5rem;
+ font-size: $size-icon-small;
align-items: center;
}
-.control.has-icons-left .icon, .control.has-icons-left .icon.is-left{
- top: 5px;
- left: 5px;
-}
-.control.has-icons-right .icon.is-right{
- top: 5px;
- right: 15px;
-}
.clickable {
cursor: pointer;
--
GitLab