From 45e584895615d74bb40120d41a08853d588d4aa3 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Fri, 11 Sep 2020 12:19:31 +0300 Subject: [PATCH 1/3] Adds hover effects on login buttons and reverts error on form-composite-field --- .../app/ui/auth/login/login.component.html | 14 ++-- .../app/ui/auth/login/login.component.scss | 74 ++++++++++++------- .../form-composite-field.component.html | 6 +- 3 files changed, 59 insertions(+), 35 deletions(-) diff --git a/dmp-frontend/src/app/ui/auth/login/login.component.html b/dmp-frontend/src/app/ui/auth/login/login.component.html index 62fbd3676..ba900fc39 100644 --- a/dmp-frontend/src/app/ui/auth/login/login.component.html +++ b/dmp-frontend/src/app/ui/auth/login/login.component.html @@ -7,21 +7,21 @@
-
-
-
@@ -30,21 +30,21 @@
-
-
-
@@ -147,4 +147,4 @@
{{ 'HOME.LOGIN.TEXT' | translate }}
-
--> \ No newline at end of file +
--> diff --git a/dmp-frontend/src/app/ui/auth/login/login.component.scss b/dmp-frontend/src/app/ui/auth/login/login.component.scss index 11ce873d2..0b52e1d95 100644 --- a/dmp-frontend/src/app/ui/auth/login/login.component.scss +++ b/dmp-frontend/src/app/ui/auth/login/login.component.scss @@ -32,13 +32,13 @@ font: Bold 38px/82px Roboto; height: 60px; letter-spacing: -0.95px; - color: #23BCBA; + color: #23bcba; margin-top: 11px; margin-bottom: 21px; } .line { - border-top: 5px solid #23BCBA; + border-top: 5px solid #23bcba; width: 116px; margin-bottom: 97px; } @@ -165,18 +165,18 @@ } .accesss-methods .configurable-logo { - flex-grow: 0; - padding-top: 21px; - padding-bottom: 21px; - margin-top: 5px; - height: 90px; + flex-grow: 0; + padding-top: 21px; + padding-bottom: 21px; + margin-top: 5px; + height: 90px; } .accesss-methods .zenodo-logo { - height: 75px; - padding-top: 8px; - margin-top: 13px; - } + height: 75px; + padding-top: 8px; + margin-top: 13px; +} .tip { margin-top: -20px; @@ -234,16 +234,38 @@ span.facebookIcon { span.twitterIcon { background: url("../../../../assets/images/argos-login/NoPath\ -\ Copy\ \(5\).png") no-repeat; - } -span.googleIcon, span.facebookIcon, span.twitterIcon { +span.googleIcon, +span.facebookIcon, +span.twitterIcon { float: left; transform: scale(0.8); width: 45px; height: 45px; } +#googleSignInButton, +.facebookIconButton, +.twitterIconButton, +.openaireIconButton, +.orcidIconMediumButton, +.iconmediumButton { + width: 60px !important; + height: 60px !important; +} + +#googleSignInButton:hover, +.facebookIconButton:hover, +.twitterIconButton:hover, +.openaireIconButton:hover, +.orcidIconMediumButton:hover, +.iconmediumButton:hover { + // background-color: #129d993b; + background-color: #ececec; + border-radius: 60%; +} + span.openaireIcon { background: url("../../../../assets/images/argos-login/NoPath\ -\ Copy\ \(6\).png") no-repeat; background-position: center; @@ -257,7 +279,7 @@ span.orcidIconMedium { background: url("../../../../assets/images/argos-login/NoPath\ -\ Copy.png") no-repeat; background-position: center; float: left; - transform: scale(0.80); + transform: scale(0.8); width: 50px; height: 45px; } @@ -271,17 +293,17 @@ span.iconmedium { } span.configurableIcon { - float: right; - width: 80px; - height: 56px; + float: right; + width: 80px; + height: 56px; } span.zenodoIcon { - background: url("../../../../assets/images/argos-login/zenodo-gradient-200.png") no-repeat; + background: url("../../../../assets/images/argos-login/zenodo-gradient-200.png") no-repeat; background-position: center; float: right; - transform: scale(0.70); - width: 200px; + transform: scale(0.7); + width: 200px; height: 80px; } @@ -301,14 +323,14 @@ span.zenodoIcon { } .configurable-button { - margin-top: 10px; - width: fit-content; + margin-top: 10px; + width: fit-content; } .zenodo-button { - margin-top: 10px; - width: fit-content; - } + margin-top: 10px; + width: fit-content; +} // .login-logo { // background: url(img/open-dmp.png) no-repeat; @@ -318,7 +340,7 @@ span.zenodoIcon { // } .laptop-img { -// background: url("../../../../assets/splash/assets/img/laptop.png") no-repeat; + // background: url("../../../../assets/splash/assets/img/laptop.png") no-repeat; background: url("../../../../assets/splash/assets/img/1_Main/Png/Who\ \ \ Benefits\ Small.png") no-repeat; width: 164px; height: 200px; diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html index ad16c09ff..ca7f20f7d 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html @@ -1,6 +1,7 @@
-
+ +
@@ -22,7 +23,8 @@
-
+ +
From 0648dfb58de4add16bdcf1286dbb02210a416bde Mon Sep 17 00:00:00 2001 From: apapachristou Date: Fri, 11 Sep 2020 13:37:55 +0300 Subject: [PATCH 2/3] Adds more hover effects --- .../src/app/ui/navbar/navbar.component.scss | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.scss b/dmp-frontend/src/app/ui/navbar/navbar.component.scss index 988b1529d..53999807b 100644 --- a/dmp-frontend/src/app/ui/navbar/navbar.component.scss +++ b/dmp-frontend/src/app/ui/navbar/navbar.component.scss @@ -45,8 +45,9 @@ $mat-card-header-size: 40px !default; cursor: pointer; } -.faq-title:hover { - color: #23bcba; +.faq-title:hover, +.lang:hover { + color: #23bcba !important; } .lang { @@ -56,7 +57,14 @@ $mat-card-header-size: 40px !default; .hamburger { display: inline-block; cursor: pointer; - padding: 0.4rem 1.5rem 0rem; + padding: 0.6rem; + margin-left: 0.8rem; + margin-right: 0.8rem; +} + +.hamburger:hover { + background-color: #ececec !important; + border-radius: 50%; } .icon-bar1, @@ -121,3 +129,8 @@ $mat-card-header-size: 40px !default; .login-label { text-transform: uppercase; } + +.navbar-nav:hover { + background-color: #ececec; + border-radius: 6px; +} From 22b59ea6b6ebcbaf8b255ab99909a9b26bcb8f73 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Fri, 11 Sep 2020 14:18:00 +0300 Subject: [PATCH 3/3] Moves option my datasets on sidebar inner --- .../src/app/ui/sidebar/sidebar.component.html | 12 +++++++++--- .../src/app/ui/sidebar/sidebar.component.scss | 9 +++++++++ dmp-frontend/src/app/ui/sidebar/sidebar.component.ts | 2 +- dmp-frontend/src/assets/i18n/de.json | 1 + dmp-frontend/src/assets/i18n/en.json | 1 + dmp-frontend/src/assets/i18n/es.json | 1 + dmp-frontend/src/assets/i18n/gr.json | 1 + dmp-frontend/src/assets/i18n/tr.json | 1 + 8 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.html b/dmp-frontend/src/app/ui/sidebar/sidebar.component.html index d043ed575..8f6b468e9 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.html +++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.html @@ -4,10 +4,16 @@
- + {{ groupMenuRoute.icon }} - person - {{groupMenuRoute.title | translate}} + person + {{groupMenuRoute.title | translate}} + + + + {{ groupMenuRoute.icon }} + person + {{groupMenuRoute.title | translate}} {{ groupMenuRoute.icon }} diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.scss b/dmp-frontend/src/app/ui/sidebar/sidebar.component.scss index cf2df085a..5909d05b7 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.scss +++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.scss @@ -37,6 +37,15 @@ $mat-card-header-size: 30px !default; color: #23BCBA; } +.inner-line { + margin-left: 12px; + margin-right: 10px; + width: 20px; + height: 13px; + border-left: 1px solid #CCCCCC; + border-bottom: 1px solid #CCCCCC; +} + mat-list-item { display: flex !important; height: auto !important; diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts index 2120bfdca..7000b8c9e 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts +++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.ts @@ -28,7 +28,7 @@ export const GENERAL_ROUTES: RouteInfo[] = [ ]; export const DMP_ROUTES: RouteInfo[] = [ { path: '/plans', title: 'SIDE-BAR.MY-DMPS', icon: 'library_books' }, - { path: '/datasets', title: 'SIDE-BAR.MY-DATASET-DESC', icon: 'dns' }, + { path: '/datasets', title: 'SIDE-BAR.MY-DATASETS', icon: 'dns' }, // { path: '/quick-wizard', title: 'SIDE-BAR.QUICK-WIZARD', icon: 'play_circle_outline' }, // { path: '/plans/new', title: 'SIDE-BAR.ADD-EXPERT', icon: 'playlist_add' } ]; diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json index 7e6a0c4e5..316ea10a6 100644 --- a/dmp-frontend/src/assets/i18n/de.json +++ b/dmp-frontend/src/assets/i18n/de.json @@ -210,6 +210,7 @@ "QUICK-WIZARD-DATASET": "Füge Datensatzbeschreibung hinzu (Assistent)", "ADD-EXPERT": "Neuer DMP (Experte)", "MY-DATASET-DESC": "Meine Datensatzbeschreibungen", + "MY-DATASETS": "Meine Datensatzbeschreibungen", "MY-GRANTS": "Meine Förderungen", "HISTORY": "CHRONIK", "HISTORY-VISITED": "ZULETZT BESUCHT", diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index 1609c414e..940b08830 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -222,6 +222,7 @@ "QUICK-WIZARD-DATASET": "Add Dataset Description (Wizard)", "ADD-EXPERT": "New DMP (Expert)", "MY-DATASET-DESC": "My Dataset Desc.", + "MY-DATASETS": "My Datasets", "MY-GRANTS": "My Grants", "HISTORY": "HISTORY", "HISTORY-VISITED": "LAST VISITED", diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json index bd589666c..aa9eb0be0 100644 --- a/dmp-frontend/src/assets/i18n/es.json +++ b/dmp-frontend/src/assets/i18n/es.json @@ -189,6 +189,7 @@ "DMP-PROFILES": "Plantillas del PGD", "ABOUT": "Acerca de", "MY-DATASET-DESCRIPTIONS": "MIS DESCRIPCIONES DEL DATASET", + "MY-DATASETS": "Mis Descripciones Del Dataset", "DATASET-DESCRIPTION-WIZARD": "Asistente de la descripción del dataset", "PUBLIC DATASETS": "DESCRIPCIONES DEL DATASET PUBLICADA", "PUBLIC-DMPS": "PGDS PUBLICADOS", diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json index ee678ec31..b0384f733 100644 --- a/dmp-frontend/src/assets/i18n/gr.json +++ b/dmp-frontend/src/assets/i18n/gr.json @@ -186,6 +186,7 @@ "DMP-PROFILES": "Templates Σχεδίων Διαχείρισης Δεδομένων", "ABOUT": "Σχετικά", "MY-DATASET-DESCRIPTIONS": "ΤΑ ΣΧΕΔΙΑ ΔΙΑΧΕΙΡΙΣΗΣ ΔΕΔΟΜΕΝΩΝ ΜΟΥ", + "MY-DATASETS": "ΤΑ ΣΧΕΔΙΑ ΔΙΑΧΕΙΡΙΣΗΣ ΔΕΔΟΜΕΝΩΝ ΜΟΥ", "DATASET-DESCRIPTION-WIZARD": "Wizard Περιγραφών Συνόλων Δεδομένων", "PUBLIC DATASETS": "ΔΗΜΟΣΙΕΥΜΕΝΕΣ ΠΕΡΙΓΡΑΦΕΣ ΣΥΝΟΛΩΝ ΔΕΔΟΜΕΝΩΝ", "PUBLIC-DMPS": "ΔΗΜΟΣΙΕΥΜΕΝΑ ΣΧΕΔΙΑ ΔΙΑΧΕΙΡΙΣΗΣ ΔΕΔΟΜΕΝΩΝ", diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json index 5a426bcd2..576d14c82 100644 --- a/dmp-frontend/src/assets/i18n/tr.json +++ b/dmp-frontend/src/assets/i18n/tr.json @@ -187,6 +187,7 @@ "DMP-PROFILES": "VYP Şablonları", "ABOUT": "Hakkında", "MY-DATASET-DESCRIPTIONS": "Veri Seti Şablonlarım", + "MY-DATASETS": "Veri Seti Şablonlarım", "DATASET-DESCRIPTION-WIZARD": "Veri Seti Tanım Sihirbazı", "PUBLIC DATASETS": "Yayınlanmış Veri Seti TANIMLARI", "PUBLIC-DMPS": "YAYINLANMIŞ VYP'LARI",