diff --git a/dmp-frontend/src/app/app.component.scss b/dmp-frontend/src/app/app.component.scss index f0b0cde9c..ddc6df33c 100644 --- a/dmp-frontend/src/app/app.component.scss +++ b/dmp-frontend/src/app/app.component.scss @@ -12,7 +12,7 @@ // } .main-container { - top: 80px; + top: 80px !important; left: 0; right: 0; } diff --git a/dmp-frontend/src/app/ui/about/about.component.scss b/dmp-frontend/src/app/ui/about/about.component.scss index 0e23f5206..38187f826 100644 --- a/dmp-frontend/src/app/ui/about/about.component.scss +++ b/dmp-frontend/src/app/ui/about/about.component.scss @@ -8,6 +8,6 @@ img { width: 100%; } -.about-component { - margin-top: 80px; -} +// .about-component { +// margin-top: 80px; +// } diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss index bc01a5020..5121e378f 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss @@ -1,5 +1,5 @@ .dataset-profile-editor { - margin-top: 6.3rem; + margin-top: 1.3rem; .full-width { width: 100%; diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss index 2308f6c79..b2318bf16 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/dataset-profile-listing.component.scss @@ -1,5 +1,5 @@ .dataset-profile-listing { - margin-top: 6rem; + margin-top: 1rem; } .mat-table { diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss index 58b3b99c6..972e19d7b 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/editor/dmp-profile-editor.component.scss @@ -1,5 +1,5 @@ .dmp-profile-editor { - margin-top: 6.3rem; + margin-top: 1.3rem; .centered-row-item { align-items: center; diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss index c89bf8721..ca94110d8 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/dmp-profile-listing.component.scss @@ -3,7 +3,7 @@ } .dmp-profile-listing { - margin-top: 6.3rem; + margin-top: 1.3rem; .mat-row { cursor: pointer; diff --git a/dmp-frontend/src/app/ui/admin/index-managment/index-managment.component.scss b/dmp-frontend/src/app/ui/admin/index-managment/index-managment.component.scss index 4ec878d3b..780978d9c 100644 --- a/dmp-frontend/src/app/ui/admin/index-managment/index-managment.component.scss +++ b/dmp-frontend/src/app/ui/admin/index-managment/index-managment.component.scss @@ -1,5 +1,4 @@ .root { - padding-top: 5em; padding-bottom: 2em; .button { diff --git a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss index eacec96b8..fde655468 100644 --- a/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss +++ b/dmp-frontend/src/app/ui/admin/user/listing/user-listing.component.scss @@ -3,7 +3,7 @@ } .user-listing { - margin-top: 6rem; + margin-top: 1rem; .mat-card { margin: 1em 0; 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 df405f7e3..6756da047 100644 --- a/dmp-frontend/src/app/ui/auth/login/login.component.scss +++ b/dmp-frontend/src/app/ui/auth/login/login.component.scss @@ -1,6 +1,5 @@ .login-screen { // margin-top: 70px; - padding-top: 80px; min-height: calc(100vh - 10px); } diff --git a/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.scss b/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.scss index e4d7c4d28..be18850f2 100644 --- a/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.scss +++ b/dmp-frontend/src/app/ui/contact/contact-content/contact-content.component.scss @@ -9,7 +9,7 @@ img { } .contact-component { - margin-top: 80px; + // margin-top: 80px; } .contact-container { @@ -28,14 +28,14 @@ img { border: 1px solid #129d99; border-radius: 30px; opacity: 1; - width: 101px; + min-width: 101px; height: 43px; color: #129d99; font-weight: 500; } .send-btn-disabled { - width: 6.64em; + min-width: 6.64em; height: 2.93em; background: #FFFFFF; border: 1px solid #B5B5B5; diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss b/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss index 4fac12c82..47f7f7baa 100644 --- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss +++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss @@ -1,6 +1,6 @@ .main-content { background-color: #f5f5f5; - padding-top: 4.68rem; + padding-top: 2.16rem; padding-bottom: 3rem; // padding-left: 3.31rem; // padding-left: 0rem; @@ -78,7 +78,7 @@ .yellow-btn { min-width: 162px; - max-width: 256px; + //max-width: 256px; height: 40px; cursor: pointer; background: #f7dd72 0% 0% no-repeat padding-box; @@ -200,7 +200,7 @@ input[type="text"] { background: #129d99 0% 0% no-repeat padding-box; border-radius: 4px 0px; opacity: 1; - width: 67px; + min-width: 67px; height: 37px; color: #ffffff; line-height: 2.4; diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css index bb8b7ba9f..1ee1781f7 100644 --- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css +++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css @@ -50,7 +50,7 @@ input[type="text"] { background: #129d99 0% 0% no-repeat padding-box; border-radius: 4px 0px; opacity: 1; - width: 67px; + min-width: 67px; height: 37px; color: #ffffff; line-height: 2.4; diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css index a25ff592b..170e24672 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css @@ -50,7 +50,7 @@ input[type="text"] { background: #129d99 0% 0% no-repeat padding-box; border-radius: 4px 0px; opacity: 1; - width: 67px; + min-width: 67px; height: 37px; color: #ffffff; line-height: 2.4; diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.scss b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.scss index ff803031c..3aadd6111 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.scss +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.scss @@ -50,7 +50,7 @@ input[type="text"] { background: #129d99 0% 0% no-repeat padding-box; border-radius: 4px 0px; opacity: 1; - width: 67px; + min-width: 67px; height: 37px; color: #ffffff; line-height: 2.4; diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.css b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.css index c046cc2db..44bd0a482 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.css +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.css @@ -49,7 +49,7 @@ input[type="text"] { background: #129d99 0% 0% no-repeat padding-box; border-radius: 4px 0px; opacity: 1; - width: 67px; + min-width: 67px; height: 37px; color: #ffffff; line-height: 2.4; diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss index 5b6e350d1..ec93c30a3 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss @@ -1,5 +1,6 @@ .main-content { height: 100vh !important; + margin-top: -80px; } .dataset-wizard { @@ -239,7 +240,7 @@ } .dmp-label { - width: 67px; + min-width: 67px; height: 37px; background: #129d99 0% 0% no-repeat padding-box; color: white; diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss index 8f2734609..c0077a83d 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss +++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss @@ -43,7 +43,7 @@ .main-content { background-color: #f5f5f5; - padding-top: 9.68rem; + padding-top: 4.68rem; padding-bottom: 3rem; padding-left: 3rem; padding-right: 3rem; diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss index e646e211c..659ab566b 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss @@ -118,7 +118,7 @@ input[type="text"] { background: #129d99 0% 0% no-repeat padding-box; border-radius: 4px 0px; opacity: 1; - width: 67px; + min-width: 67px; height: 37px; color: #ffffff; line-height: 2.4; diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss index cfbe6ccb6..33bf2bc8b 100644 --- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss +++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss @@ -4,7 +4,7 @@ } .dataset-overview { - margin-top: 5rem; + // margin-top: 5rem; } // ********ICONS******** diff --git a/dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.scss b/dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.scss index c91ee2322..c1d49452c 100644 --- a/dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.scss +++ b/dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.scss @@ -42,7 +42,7 @@ } .confirm-btn { - width: 84px; + min-width: 84px; height: 43px; background: #ffffff; color: #129d99; diff --git a/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.scss b/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.scss index 96f41c9cc..9f4c70e5f 100644 --- a/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.scss +++ b/dmp-frontend/src/app/ui/dmp/clone/dmp-clone.component.scss @@ -320,7 +320,7 @@ a:hover { } .dmp-label { - width: 67px; + min-width: 67px; height: 37px; background: #129d99 0% 0% no-repeat padding-box; color: white; diff --git a/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.scss b/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.scss index 1d5db8b55..01fd3d2a2 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.scss +++ b/dmp-frontend/src/app/ui/dmp/dmp-to-dataset/dmp-to-dataset-dialog.component.scss @@ -42,7 +42,7 @@ border: 1px solid #129d99; border-radius: 30px; opacity: 1; - width: 101px; + min-width: 101px; height: 43px; color: #ffffff; font-weight: 500; diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss index 99891458e..029d8a922 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss @@ -23,6 +23,7 @@ a:hover { .main-content { height: 100vh !important; + margin-top: -80px; } .menu-item { @@ -328,7 +329,7 @@ mat-icon.size-16 { border-radius: 30px; opacity: 1; width: 154px; - height: 40px; + min-height: 40px; display: flex; justify-content: center; align-items: center; @@ -399,7 +400,7 @@ mat-icon.size-16 { } .dmp-label { - width: 67px; + min-width: 67px; height: 37px; background: #129d99 0% 0% no-repeat padding-box; color: white; diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss index 30e3772d8..4919dc0e8 100644 --- a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss +++ b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss @@ -98,14 +98,14 @@ border: 1px solid #129d99; border-radius: 30px; opacity: 1; - width: 101px; + min-width: 101px; height: 43px; color: #129d99; font-weight: 500; } .invite-btn-disabled { - width: 6.64em; + min-width: 6.64em; height: 2.93em; background: #ffffff; border: 1px solid #b5b5b5; diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss index 6c5f839cb..234707e72 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss +++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss @@ -105,7 +105,7 @@ .main-content { background-color: #f5f5f5; - padding-top: 9.68rem; + padding-top: 4.68rem; padding-bottom: 3rem; padding-left: 3rem; padding-right: 3rem; diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss index 5fa60b06f..e77d00b31 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss @@ -152,7 +152,7 @@ input[type="text"] { background: #129d99 0% 0% no-repeat padding-box; border-radius: 4px 0px; opacity: 1; - width: 67px; + min-width: 67px; height: 37px; color: #ffffff; line-height: 2.4; diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss index 825c73c00..a757866a1 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss @@ -4,7 +4,7 @@ } .dmp-overview { - margin-top: 5rem; + //margin-top: 5rem; } // ********ICONS******** @@ -113,7 +113,8 @@ // ********TEXT******** .dmp-logo { - width: 4.8em; + padding: 10px; + min-width: 4.8em; height: 2.6em; background: #129d99; border-radius: 4px; diff --git a/dmp-frontend/src/app/ui/faq/faq-content/faq-content.component.scss b/dmp-frontend/src/app/ui/faq/faq-content/faq-content.component.scss index ce11947c3..91beac1bf 100644 --- a/dmp-frontend/src/app/ui/faq/faq-content/faq-content.component.scss +++ b/dmp-frontend/src/app/ui/faq/faq-content/faq-content.component.scss @@ -8,5 +8,5 @@ img { } .faq-component { - margin-top: 80px; + //margin-top: 80px; } diff --git a/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.scss b/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.scss index 74c44a92e..2d066c10e 100644 --- a/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.scss +++ b/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.scss @@ -9,5 +9,5 @@ img { } .glossary-component { - margin-top: 80px; + //margin-top: 80px; } diff --git a/dmp-frontend/src/app/ui/language-editor/language-editor.component.scss b/dmp-frontend/src/app/ui/language-editor/language-editor.component.scss index 874288730..c92bc2ed4 100644 --- a/dmp-frontend/src/app/ui/language-editor/language-editor.component.scss +++ b/dmp-frontend/src/app/ui/language-editor/language-editor.component.scss @@ -1,5 +1,5 @@ .language-editor { - padding-top: 6em; + padding-top: 1em; padding-bottom: 2em; .language-area { diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.scss b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.scss index 8dd94641d..ae3eb886e 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.scss +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.scss @@ -9,5 +9,5 @@ img { } .terms-component { - margin-top: 80px; + //margin-top: 80px; } diff --git a/dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.scss b/dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.scss index b1a0769e8..b53bc7ae5 100644 --- a/dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.scss +++ b/dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.scss @@ -1,5 +1,5 @@ .user-guide-editor { - padding-top: 5em; + //padding-top: 5em; padding-bottom: 2em; margin-top: 1em; diff --git a/dmp-frontend/src/app/ui/user-guide/user-guide-content/user-guide-content.component.scss b/dmp-frontend/src/app/ui/user-guide/user-guide-content/user-guide-content.component.scss index 111eef3c1..78912a37f 100644 --- a/dmp-frontend/src/app/ui/user-guide/user-guide-content/user-guide-content.component.scss +++ b/dmp-frontend/src/app/ui/user-guide/user-guide-content/user-guide-content.component.scss @@ -7,5 +7,5 @@ } #userguide { - margin: 100px; + margin: 20px; } diff --git a/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss b/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss index 462ec45e8..56842b157 100644 --- a/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss +++ b/dmp-frontend/src/app/ui/user-profile/user-profile.component.scss @@ -1,6 +1,6 @@ .profile { height: fit-content; - margin-top: 80px; + //margin-top: 80px; min-height: 100vh; background-color: #ffffff; }