diff --git a/anemui-core/assets/images/banner_logos_imp.png b/anemui-core/assets/images/banner_logos_imp.png new file mode 100644 index 0000000..3ab179c Binary files /dev/null and b/anemui-core/assets/images/banner_logos_imp.png differ diff --git a/anemui-core/css/graphcontainer.scss b/anemui-core/css/graphcontainer.scss index 02ed7e7..d99ccd5 100644 --- a/anemui-core/css/graphcontainer.scss +++ b/anemui-core/css/graphcontainer.scss @@ -33,6 +33,21 @@ div.GraphContainer { padding: 0.3em 0.5em; } + .pop-graph { + width: clamp(300px, 50vw, 900px); + height: clamp(250px, 44vh, 500px); + + @include md-desktop { + width: clamp(500px, 55vw, 1100px); + height: clamp(350px, 48vh, 600px); + } + + @include xl-desktop { + width: clamp(600px, 55vw, 1200px); + height: clamp(400px, 50vh, 650px); + } + } + a.popup-close-button { position: absolute; top: 10px; diff --git a/anemui-core/css/topbar.scss b/anemui-core/css/topbar.scss index f61e09e..3cc1ee1 100644 --- a/anemui-core/css/topbar.scss +++ b/anemui-core/css/topbar.scss @@ -680,11 +680,11 @@ } .inputDiv .title { - font-size: 0.8em; + font-size: 0.7em; } .inputDiv .sub-title { - font-size: 0.8em; + font-size: 0.7em; } @@ -722,6 +722,16 @@ } } + @include md-desktop { + .inputDiv .title { + font-size: 0.8em; + } + + .inputDiv .sub-title { + font-size: 0.8em; + } + } + @include xl-desktop { // width: 97%; padding-top: 0em; @@ -729,11 +739,19 @@ .longLogo, .shortLogo, .allScrLogo { padding-left: 0; } - + #logo img { width: 120px; margin-left: 7%; } + + .inputDiv .title { + font-size: 0.9em; + } + + .inputDiv .sub-title { + font-size: 0.9em; + } } } @@ -788,7 +806,7 @@ li { .inputDiv .title{ white-space: normal; - font-size: 0.7em; + font-size: 0.6em; font-style: italic; line-height: 1.2; text-align: left; @@ -799,7 +817,7 @@ li { .inputDiv .sub-title { display: block; - font-size: 1em; + font-size: 0.9em; font-style: normal; font-weight: 500; width: fit-content; @@ -983,9 +1001,17 @@ input.selection-param-input { .dropdown-item { box-sizing: border-box; white-space: normal; - font-size: 0.7em !important; + font-size: 0.6em !important; font-style: italic; line-height: 1.2; + + @include md-desktop { + font-size: 0.65em !important; + } + + @include xl-desktop { + font-size: 0.7em !important; + } } #marker { diff --git a/anemui-core/src/language/language.ts b/anemui-core/src/language/language.ts index 9585f45..8251c6d 100644 --- a/anemui-core/src/language/language.ts +++ b/anemui-core/src/language/language.ts @@ -96,8 +96,8 @@ export default class Language { 'index units': 'Index units', 'Terciles': 'Terciles', 'Anomalías': 'Anomalies', - 'kJ/m2': 'kJ/m²', - 'MJ/m2': 'MJ/m²' + 'kJ/m2': 'kJ/m²·day', + 'MJ/m2': 'MJ/m²·day' } }, es: { @@ -184,8 +184,8 @@ export default class Language { 'index units': 'Unidades del índice', 'Terciles': 'Terciles', 'Anomalías': 'Anomalías', - 'kJ/m2': 'kJ/m²', - 'MJ/m2': 'MJ/m²' + 'kJ/m2': 'kJ/m²·día', + 'MJ/m2': 'MJ/m²·día' } } } diff --git a/anemui-core/src/ui/Graph.tsx b/anemui-core/src/ui/Graph.tsx index 304b6b5..3358555 100644 --- a/anemui-core/src/ui/Graph.tsx +++ b/anemui-core/src/ui/Graph.tsx @@ -6,6 +6,7 @@ import { dateText } from "../data/CsPConstans"; import { CsTimeSpan } from "../data/CsDataTypes"; import { CsLatLong } from '../CsMapTypes'; + require("dygraphs/dist/dygraph.css") export type GraphType = "Serial" | "Area" | "Linear" | "Cummulative" | "MgFr" | "WindRose" | "PercentileClock" | "ECDF" | "DailyEvolution" @@ -110,21 +111,16 @@ export class CsGraph extends BaseFrame { public render(): JSX.Element { let self = this; - // Calcular tamaño responsivo del gráfico - const maxWidth = Math.min(screen.width * 0.85, 900); - const maxHeight = Math.min(screen.height * 0.65, 500); - let graphWidth = screen.width > 1200 ? Math.min(screen.width * 0.4, maxWidth) : Math.min(screen.width * 0.55, maxWidth); - let graphHeight = screen.height > 900 ? Math.min(screen.height * 0.4, maxHeight) : Math.min(screen.height * 0.50, maxHeight); let element = (