diff --git a/package.json b/package.json index aed1b0a8b6..5cd7128062 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "@ngx-translate/core": "7.1.0", "@ngx-translate/http-loader": "0.1.0", "body-parser": "1.17.2", - "bootstrap": "4.0.0-alpha.6", + "bootstrap": "v4.0.0-beta", "cerialize": "0.1.15", "compression": "1.7.0", "cookie-parser": "1.4.3", diff --git a/src/app/app.component.scss b/src/app/app.component.scss index a000423c34..90bdcff1a1 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -1,7 +1,4 @@ -@import '../styles/variables.scss'; -@import '../../node_modules/bootstrap/scss/bootstrap.scss'; -@import "../../node_modules/font-awesome/scss/font-awesome.scss"; - +@import '../styles/main.scss'; html { position: relative; min-height: 100%; diff --git a/src/app/collection-page/collection-page.component.scss b/src/app/collection-page/collection-page.component.scss index da97dd7a62..fbada7f1da 100644 --- a/src/app/collection-page/collection-page.component.scss +++ b/src/app/collection-page/collection-page.component.scss @@ -1 +1 @@ -@import '../../styles/variables.scss'; +@import '../../styles/main.scss'; diff --git a/src/app/community-page/community-page.component.scss b/src/app/community-page/community-page.component.scss index da97dd7a62..fbada7f1da 100644 --- a/src/app/community-page/community-page.component.scss +++ b/src/app/community-page/community-page.component.scss @@ -1 +1 @@ -@import '../../styles/variables.scss'; +@import '../../styles/main.scss'; diff --git a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss index 50be6f5ad0..77e1dbcabd 100644 --- a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss +++ b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss @@ -1 +1 @@ -@import '../../../styles/variables.scss'; +@import '../../../styles/main.scss'; diff --git a/src/app/core/footer/footer.component.scss b/src/app/core/footer/footer.component.scss index 3cf9757d7f..a7ba21b96f 100644 --- a/src/app/core/footer/footer.component.scss +++ b/src/app/core/footer/footer.component.scss @@ -1,6 +1,5 @@ -@import '../../../styles/variables.scss'; -@import '../../../../node_modules/bootstrap/scss/_variables.scss'; -$footer-bg: $gray-lighter; +@import '../../../styles/main.scss'; +$footer-bg: $gray-100; $footer-border: 1px solid darken($footer-bg, 10%); $footer-padding: $spacer * 1.5; diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html index 0d8362698a..0cdb443b8a 100644 --- a/src/app/header/header.component.html +++ b/src/app/header/header.component.html @@ -1,11 +1,11 @@
-