fix rebase issues

ui/ui-frontend/projects/archive-search/src/sass/styles.scss

-<<<<<<< HEAD
 @import '~ui-frontend-common/sass/icons/vitamui-icons.css';
 @import '~ui-frontend-common/sass/theme';
-=======
-@import '~@angular/material/prebuilt-themes/indigo-pink.css';
-@import '~material-design-icons/iconfont/material-icons.css';
+@import '~bootstrap/scss/bootstrap-grid';
 
-@import '~ui-frontend-common/sass/icons/vitamui-icons.css';
-@import '~ui-frontend-common/sass/theme';
 @import '~ui-frontend-common/sass/fonts/font-styles.css';
 
-$grid-gutter-width: 20px;
-
->>>>>>> 7f97a853a... import Mulish googleApi fonts
-@import '~bootstrap/scss/bootstrap-grid';
-
 @import 'form';
 @import 'login';
 @import 'sidepanel';
 @import 'profile-tag';
 @import 'vitamui-tab-group';
 @import 'tooltip';
-<<<<<<< HEAD
 
 .mat-drawer-container {
     background-color: var(--vitamui-background);
 }
-=======
-@import "text";
 
->>>>>>> 7f97a853a... import Mulish googleApi fonts

ui/ui-frontend/projects/demo/src/styles.scss

@@ -2,17 +2,9 @@
 
 @import '~ui-frontend-common/sass/icons/vitamui-icons.css';
 @import '~ui-frontend-common/sass/theme';
-<<<<<<< HEAD
 @import '~bootstrap/scss/bootstrap-grid';
-=======
 @import '~ui-frontend-common/sass/fonts/font-styles.css';
 
-
-* {
-    box-sizing: border-box;
-}
->>>>>>> 7f97a853a... import Mulish googleApi fonts
-
 .demo-block {
     margin: 20px 0;
 }

ui/ui-frontend/projects/identity/src/sass/styles.scss

 @import '~ui-frontend-common/sass/icons/vitamui-icons.css';
 @import '~ui-frontend-common/sass/theme';
-<<<<<<< HEAD
-=======
 @import '~ui-frontend-common/sass/fonts/font-styles.css';
 
 $grid-gutter-width: 20px;
 
->>>>>>> 7f97a853a... import Mulish googleApi fonts
 @import '~bootstrap/scss/bootstrap-grid';
 
 @import 'form';
@@ -18,4 +15,4 @@ $grid-gutter-width: 20px;
 
 .mat-drawer-container {
     background-color: var(--vitamui-background);
-}
\ No newline at end of file
+}

ui/ui-frontend/projects/ingest/src/sass/styles.scss

@@ -17,4 +17,3 @@ $grid-gutter-width: 20px;
 @import 'vitamui-tab-group';
 @import 'tooltip';
 @import "text";
-

ui/ui-frontend/projects/portal/src/sass/styles.scss

 @import '~ui-frontend-common/sass/icons/vitamui-icons.css';
 @import '~ui-frontend-common/sass/theme';
-<<<<<<< HEAD
 @import '~bootstrap/scss/bootstrap-grid';
-=======
-@import '~ui-frontend-common/sass/fonts/font-styles.css';
-
-@import 'login';
-
-@import '~bootstrap/scss/bootstrap-grid';
-
-body {
-    margin: 0;
-    color: $charcoal-grey;
-    background: $pale-grey;
-}
 
-* {
-    box-sizing: border-box;
-}
-
-.background {
-    position: absolute;
-    width: 100%;
-    height: 390px;
-    z-index: -1;
-}
-
-.primary {
-    color: var(--vitamui-primary);
-}
-
-h2 {
-    color: $charcoal-grey;
-    font-weight: 500;
-}
-
-.material-icons {
-    vertical-align: middle;
-}
->>>>>>> 7f97a853a... import Mulish googleApi fonts
+@import '~ui-frontend-common/sass/fonts/font-styles.css';

ui/ui-frontend/projects/referential/src/sass/styles.scss

-<<<<<<< HEAD
 @import "~ui-frontend-common/sass/icons/vitamui-icons.css";
 @import "~ui-frontend-common/sass/theme";
 @import '~bootstrap/scss/bootstrap-grid';
-=======
-@import "~@angular/material/prebuilt-themes/indigo-pink.css";
-@import "~material-design-icons/iconfont/material-icons.css";
 
-@import "~ui-frontend-common/sass/icons/vitamui-icons.css";
-@import "~ui-frontend-common/sass/theme";
 @import '~ui-frontend-common/sass/fonts/font-styles.css';
->>>>>>> 7f97a853a... import Mulish googleApi fonts
+
 
 @import "form";
 @import "login";
@@ -19,6 +13,7 @@
 @import "tooltip";
 @import "text";
 
+
 @import '../../../../dist/sass/icons/vitamui-icons.css';
 @import '../../../../dist/sass/styles';
 
@@ -69,4 +64,4 @@ vitamui-common-slide-toggle {
     max-width: 1280px;
     margin: 0 auto;
     padding: 0 40px;
-}
\ No newline at end of file
+}

ui/ui-frontend/projects/starter-kit/src/sass/styles.scss

 @import '~ui-frontend-common/sass/icons/vitamui-icons.css';
 @import '~ui-frontend-common/sass/theme';
 @import '~bootstrap/scss/bootstrap-grid';
+@import '~ui-frontend-common/sass/fonts/font-styles.css';
 
 body {
     margin: 0;
@@ -11,4 +12,4 @@ body {
 h2 {
     color: var(--vitamui-grey-900);
     font-weight: 500;
-}
\ No newline at end of file
+}