Skip to content
Snippets Groups Projects
Commit fe7cbb03 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'f-no-googlefonts' into 'dev'

MAINT: Prevent Sass deprecation warnings

See merge request !10
parents bd05b536 c05a298c
No related branches found
No related tags found
1 merge request!10MAINT: Prevent Sass deprecation warnings
Pipeline #54096 passed
...@@ -39,5 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -39,5 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Styling of the query filters (even columns where all filters are aligned horizontally). * Styling of the query filters (even columns where all filters are aligned horizontally).
* UTF8 operator symbols for the query filters instead of ascii based ones (e.g. * UTF8 operator symbols for the query filters instead of ascii based ones (e.g.
`≥` instead of `>=`). `≥` instead of `>=`).
* [IndiScale#8](https://gitlab.indiscale.com/caosdb/src/caosdb-webui-core-components/-/issues/8)
files-ui-react dependency would load fonts from google.com.
### Security ### Security
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
"i18n": "i18next --config .i18next-parser.config.js \"src/**/*.{js,jsx}\"" "i18n": "i18next --config .i18next-parser.config.js \"src/**/*.{js,jsx}\""
}, },
"dependencies": { "dependencies": {
"@files-ui/react": "^1.0.8",
"@indiscale/caosdb-webui-info-service": "^0.0.2", "@indiscale/caosdb-webui-info-service": "^0.0.2",
"@indiscale/files-ui-react": "^1.2.4",
"i18next": "^23.4.9", "i18next": "^23.4.9",
"i18next-resources-to-backend": "^1.1.4", "i18next-resources-to-backend": "^1.1.4",
"prop-types": "^15.8.1", "prop-types": "^15.8.1",
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
"react": "^18.2.0", "react": "^18.2.0",
"react-bootstrap": "^2.7.2", "react-bootstrap": "^2.7.2",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"sass": "^1.58.3", "sass": "^1.58.3 <1.77.7",
"sass-loader": "^13.2.0", "sass-loader": "^13.2.0",
"style-loader": "^3.3.1", "style-loader": "^3.3.1",
"webpack": "^5.75.0", "webpack": "^5.75.0",
......
...@@ -6,7 +6,7 @@ import React, { ...@@ -6,7 +6,7 @@ import React, {
useState, useState,
useCallback, useCallback,
} from "react"; } from "react";
import { Dropzone, FileMosaic } from "@files-ui/react"; import { Dropzone, FileMosaic } from "@indiscale/files-ui-react";
import { Message } from "./Message"; import { Message } from "./Message";
import { Await } from "./Await"; import { Await } from "./Await";
import { LoadingInfo } from "./LoadingInfo"; import { LoadingInfo } from "./LoadingInfo";
......
...@@ -20,17 +20,21 @@ footer { ...@@ -20,17 +20,21 @@ footer {
.nav { .nav {
border-bottom: 1px solid darken($footer-body-color, 20%); border-bottom: 1px solid darken($footer-body-color, 20%);
} }
.nav-link { .nav-link {
color: darken($footer-body-color, 30%) !important; color: darken($footer-body-color, 30%) !important;
} }
.nav-link:hover { .nav-link:hover {
color: darken($footer-body-color, 40%) !important; color: darken($footer-body-color, 40%) !important;
} }
.footer-body { .footer-body {
border-top: 1px solid darken($footer-body-color, 10%); border-top: 1px solid darken($footer-body-color, 10%);
background-color: $footer-body-color; background-color: $footer-body-color;
min-height: 20rem; min-height: 20rem;
} }
.footer-border { .footer-border {
height: 3rem; height: 3rem;
box-shadow: 0px -5px 7px -5px rgba(0, 0, 0, 0.4) inset; box-shadow: 0px -5px 7px -5px rgba(0, 0, 0, 0.4) inset;
...@@ -48,7 +52,9 @@ footer { ...@@ -48,7 +52,9 @@ footer {
display: none; display: none;
} }
& {
cursor: pointer; cursor: pointer;
}
&.read-only { &.read-only {
cursor: auto; cursor: auto;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment