diff --git a/package.json b/package.json index 8bb4aac1d..9be1db8e8 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "build": "nx build", "build-lint-all": "ng lint --project=red-ui --fix && ng lint --project=common-ui --fix && ng build --project=red-ui --configuration production --base-href /ui/", - "build-paligo-styles": "mkdir -p dist/paligo-styles && sass --load-path=. paligo-styles/style.scss > dist/paligo-styles/redacto-theme.css && cp -r libs/common-ui/src/assets/font dist/paligo-styles/fonts", + "build-paligo-styles": "mkdir -p dist/paligo-styles && sass --load-path=. paligo-styles/style.scss > dist/paligo-styles/redacto-theme.css", "i18n:extract": "ngx-translate-extract --input ./apps/red-ui/src ./libs/common-ui/src --output apps/red-ui/src/assets/i18n/en.json --clean --sort --format namespaced-json && prettier apps/red-ui/src/assets/i18n/*.json --write", "postinstall": "ngcc --properties es2015 browser module main", "lint": "ng lint --project=red-domain --fix && ng lint --project=red-ui --fix && ng lint --project=common-ui --fix", diff --git a/paligo-styles/fonts.scss b/paligo-styles/fonts.scss deleted file mode 100644 index d21f85bbf..000000000 --- a/paligo-styles/fonts.scss +++ /dev/null @@ -1,29 +0,0 @@ -@font-face { - font-family: 'OpenSans'; - font-weight: 300; - src: url('../fonts/OpenSans-VariableFont.ttf') format('truetype'); -} - -@font-face { - font-family: 'OpenSans'; - font-weight: 400; - src: url('../fonts/OpenSans-VariableFont.ttf') format('truetype'); -} - -@font-face { - font-family: 'OpenSans'; - font-weight: 500; - src: url('../fonts/OpenSans-VariableFont.ttf') format('truetype'); -} - -@font-face { - font-family: 'OpenSans'; - font-weight: 600; - src: url('../fonts/OpenSans-VariableFont.ttf') format('truetype'); -} - -@font-face { - font-family: 'OpenSans'; - font-weight: 700; - src: url('../font/OpenSans-VariableFont.ttf') format('truetype'); -} diff --git a/paligo-styles/homepage.scss b/paligo-styles/homepage.scss index ac628badd..745c66503 100644 --- a/paligo-styles/homepage.scss +++ b/paligo-styles/homepage.scss @@ -10,6 +10,12 @@ } .portal-single-publication { + background-color: transparent; + + > a { + border-radius: 4px; + } + .publication-icon { background-color: variables.$red-1; } diff --git a/paligo-styles/manual.scss b/paligo-styles/manual.scss index 8b7d02fb3..4e4360b74 100644 --- a/paligo-styles/manual.scss +++ b/paligo-styles/manual.scss @@ -45,7 +45,6 @@ section > .titlepage .title { #topic-content > section > .titlepage h2.title { margin: 0 0 24px; - @include mixin.heading-3; } .image-viewport { @@ -53,7 +52,6 @@ section > .titlepage .title { img { margin: 16px auto; - box-shadow: 0 3px 12px 5px rgb(40 50 65 / 14%); } } @@ -78,6 +76,7 @@ section > .titlepage .title { padding: 16px 24px 16px 68px; background-color: variables.$white; border-left: 4px solid variables.$primary; + border-radius: 4px; &:before { color: variables.$primary; @@ -105,6 +104,8 @@ section > .titlepage .title { .panel { padding: 12px 0; + border-radius: 4px; + border: none; .panel-body { > p { @@ -123,6 +124,7 @@ section > .titlepage .title { img { border-radius: 4px; margin: 0; + box-shadow: 0 3px 12px 5px rgb(40 50 65 / 14%); } .caption > p { diff --git a/paligo-styles/mixin.scss b/paligo-styles/mixin.scss index 66f17891b..93c4af988 100644 --- a/paligo-styles/mixin.scss +++ b/paligo-styles/mixin.scss @@ -39,7 +39,7 @@ } @mixin heading-4 { - font-size: 26px; + font-size: 28px; font-weight: 300; line-height: 36px; } diff --git a/paligo-styles/search.scss b/paligo-styles/search.scss index c5ddefadb..a6789b7f3 100644 --- a/paligo-styles/search.scss +++ b/paligo-styles/search.scss @@ -7,10 +7,6 @@ .search-container { padding-bottom: 100px; - - h2 { - @include mixin.heading-2; - } } .portal-search-result { diff --git a/paligo-styles/style.scss b/paligo-styles/style.scss index 4bee27d4e..60bf3b494 100644 --- a/paligo-styles/style.scss +++ b/paligo-styles/style.scss @@ -1,6 +1,5 @@ @use 'apps/red-ui/src/assets/styles/variables'; @use '../libs/common-ui/src/assets/styles/common-mixins'; -@use 'fonts'; @use 'header'; @use 'homepage'; @use 'search'; @@ -8,29 +7,47 @@ @use 'manual'; @use 'mixin'; +@import url('https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;1,300;1,400;1,500;1,600;1,700;1,800&display=swap'); + body { color: variables.$accent; background-color: variables.$grey-9; - font-family: 'OpenSans', sans-serif; + font-family: 'Open Sans', sans-serif; - h1, - h2, - h3, - h4, - h5, - h6, + h1, .h1, + h2, .h2, + h3, .h3, + h4, .h4, + h5, .h5, + h6, .h6, p, pre { margin: 0; - font-family: 'OpenSans', sans-serif; + font-family: 'Open Sans', sans-serif; } @include common-mixins.scroll-bar; - h3 { + h1, .h1 { + @include mixin.heading-1; + } + + h2, .h2 { + @include mixin.heading-2; + } + + h3, .h3 { @include mixin.heading-3; } + h4, .h4 { + @include mixin.heading-4; + } + + h5, .h5 { + @include mixin.heading-5; + } + p { @include mixin.paragraph; } @@ -42,5 +59,9 @@ body { text-decoration: underline; color: variables.$primary; } + + &:focus { + color: variables.$primary; + } } }