diff --git a/.gitmodules b/.gitmodules index 33bcdc7..b14b9aa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "src/assets/common-assets"] path = src/assets/common-assets url = gitea@code-repo.d4science.org:MaDgIK/openaire-assets.git -[submodule "src/assets/dashboard-theme"] - path = src/assets/dashboard-theme - url = gitea@code-repo.d4science.org:MaDgIK/dashboard-theme.git [submodule "src/assets/openaire-theme"] path = src/assets/openaire-theme url = gitea@code-repo.d4science.org:MaDgIK/openaire-theme.git diff --git a/angular.json b/angular.json index 71801a2..233f5ab 100644 --- a/angular.json +++ b/angular.json @@ -48,7 +48,6 @@ "styles": [ "src/mining.scss", "src/styles.less", - "src/deprecated.css", "src/assets/common-assets/library-css/material.scss" ], "scripts": [ diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index c5da95f..01fd4ac 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit c5da95fb48e1f4964396b2a9c1358a0d6d4b93cc +Subproject commit 01fd4ac49f2758bb992529478562358bf45e6370 diff --git a/src/app/pages/projects/add-projects.component.html b/src/app/pages/projects/add-projects.component.html index f3bb270..e9e6060 100644 --- a/src/app/pages/projects/add-projects.component.html +++ b/src/app/pages/projects/add-projects.component.html @@ -1,29 +1,23 @@

-
+
-
+
    - - -
  • - - - {{selectedFunder.name}} - - - -
  • - - +
  • + + + {{selectedFunder.name}} + + + +
-
- - -
+ +

@@ -76,7 +70,7 @@
-
+
@@ -141,4 +135,4 @@
-
\ No newline at end of file + diff --git a/src/assets/common-assets b/src/assets/common-assets index d577c6d..bb96e1c 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit d577c6d69a55901e319cf0cf5b93f900f1cdeaab +Subproject commit bb96e1c48fbc2090220d2b72415b929c3cc23492 diff --git a/src/assets/dashboard-theme b/src/assets/dashboard-theme deleted file mode 160000 index 3027af3..0000000 --- a/src/assets/dashboard-theme +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3027af352f9bc72d8870550d61138d66e219cb32 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index a61c749..3bc96a4 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit a61c749816accd456cf30c9e4983d61282f28a89 +Subproject commit 3bc96a4bdccd2f09dab039759375fa8980e8e59e diff --git a/src/deprecated.css b/src/deprecated.css deleted file mode 100644 index 84ce55b..0000000 --- a/src/deprecated.css +++ /dev/null @@ -1,4 +0,0 @@ -@import "assets/openaire-theme/css/structure/variables.css"; -@import "assets/openaire-theme/css/openaire.css"; -@import "assets/common-assets/library.css"; -@import "assets/dashboard-theme/main.css"; diff --git a/src/styles.less b/src/styles.less index 9cf5f1d..91173f0 100644 --- a/src/styles.less +++ b/src/styles.less @@ -1,2 +1,3 @@ /* You can add global styles to this file, and also import other style files */ @import "~src/assets/openaire-theme/less/_import"; +@import "~src/assets/common-assets/less/_import";