mirror of
https://github.com/BetterSEQTA/BetterSEQTA-Plus.git
synced 2026-06-16 08:27:07 +00:00
Merge origin/main into fixcloudsync
Resolve grade analytics conflicts by keeping grade forecast UI from main and combining layout fixes from both branches.
This commit is contained in:
SethBurkart123
@@ -74,8 +74,8 @@
|
||||
}
|
||||
|
||||
.bsplus-analytics-animate {
|
||||
animation: bsplus-analytics-fade-in-up 0.55s var(--bsplus-analytics-ease)
|
||||
forwards;
|
||||
opacity: 0;
|
||||
animation: bsplus-analytics-fade-in-up 0.55s var(--bsplus-analytics-ease) both;
|
||||
will-change: opacity, transform;
|
||||
}
|
||||
|
||||
@@ -99,6 +99,9 @@
|
||||
.bsplus-analytics-delay-4 {
|
||||
animation-delay: 320ms;
|
||||
}
|
||||
.bsplus-analytics-delay-5 {
|
||||
animation-delay: 400ms;
|
||||
}
|
||||
|
||||
/* ─── Header ─── */
|
||||
.bsplus-analytics-header {
|
||||
@@ -166,10 +169,9 @@
|
||||
font-size: 0.7rem;
|
||||
font-weight: 600;
|
||||
vertical-align: middle;
|
||||
background: color-mix(
|
||||
in srgb,
|
||||
var(--bsplus-analytics-accent) 18%,
|
||||
transparent
|
||||
background: var(
|
||||
--bsplus-analytics-accent-subtle,
|
||||
color-mix(in srgb, var(--bsplus-analytics-accent) 18%, transparent)
|
||||
);
|
||||
color: var(--bsplus-analytics-accent);
|
||||
}
|
||||
@@ -325,10 +327,6 @@
|
||||
|
||||
/* ─── Filter toolbar ─── */
|
||||
.bsplus-analytics-toolbar {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 1rem;
|
||||
padding: 1rem 1.15rem;
|
||||
border-radius: var(
|
||||
--bsplus-theme-card-radius,
|
||||
@@ -346,6 +344,73 @@
|
||||
z-index: 3;
|
||||
}
|
||||
|
||||
.bsplus-analytics-toolbar-grid {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(9rem, 1fr) minmax(9rem, 1fr) minmax(12rem, 1.4fr) auto;
|
||||
grid-template-rows: auto auto;
|
||||
gap: 0.9rem 1rem;
|
||||
align-items: end;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.bsplus-analytics-toolbar-clear {
|
||||
grid-column: 4;
|
||||
grid-row: 1;
|
||||
justify-self: end;
|
||||
align-self: end;
|
||||
padding: 0.65rem 0.9rem;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.bsplus-analytics-toolbar-trends {
|
||||
grid-column: 4;
|
||||
grid-row: 2;
|
||||
justify-self: end;
|
||||
align-self: center;
|
||||
margin-left: 0;
|
||||
max-width: 14rem;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.bsplus-analytics-toolbar-trends-top {
|
||||
grid-row: 1;
|
||||
align-self: end;
|
||||
}
|
||||
|
||||
@media (max-width: 900px) {
|
||||
.bsplus-analytics-toolbar-grid {
|
||||
grid-template-columns: 1fr 1fr;
|
||||
}
|
||||
|
||||
.bsplus-analytics-toolbar-search {
|
||||
grid-column: 1 / -1;
|
||||
}
|
||||
|
||||
.bsplus-analytics-toolbar-clear {
|
||||
grid-column: 1 / -1;
|
||||
grid-row: auto;
|
||||
justify-self: stretch;
|
||||
}
|
||||
|
||||
.bsplus-analytics-grade-range {
|
||||
grid-column: 1 / -1;
|
||||
}
|
||||
|
||||
.bsplus-analytics-toolbar-trends {
|
||||
grid-column: 1 / -1;
|
||||
grid-row: auto;
|
||||
justify-self: start;
|
||||
max-width: none;
|
||||
text-align: left;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 520px) {
|
||||
.bsplus-analytics-toolbar-grid {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
}
|
||||
|
||||
.bsplus-analytics-toolbar-dropdown-field {
|
||||
position: relative;
|
||||
z-index: 4;
|
||||
@@ -370,7 +435,6 @@
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.55rem;
|
||||
margin-left: auto;
|
||||
padding: 0.35rem 0;
|
||||
font-size: 0.8125rem;
|
||||
font-weight: 500;
|
||||
@@ -389,13 +453,6 @@
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
@media (max-width: 900px) {
|
||||
.bsplus-analytics-checkbox {
|
||||
margin-left: 0;
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.bsplus-analytics-select,
|
||||
.bsplus-analytics-input {
|
||||
appearance: none;
|
||||
@@ -456,9 +513,10 @@
|
||||
}
|
||||
|
||||
.bsplus-analytics-grade-range {
|
||||
flex: 1;
|
||||
min-width: 12rem;
|
||||
max-width: 20rem;
|
||||
grid-column: 1 / 4;
|
||||
grid-row: 2;
|
||||
min-width: 0;
|
||||
max-width: none;
|
||||
}
|
||||
|
||||
.bsplus-analytics-range-value {
|
||||
@@ -471,17 +529,7 @@
|
||||
}
|
||||
|
||||
.bsplus-analytics-toolbar-search {
|
||||
margin-left: auto;
|
||||
flex: 1 1 14rem;
|
||||
max-width: 18rem;
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
.bsplus-analytics-toolbar-search {
|
||||
margin-left: 0;
|
||||
max-width: none;
|
||||
width: 100%;
|
||||
}
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
/* Toolbar custom dropdowns (time period, subjects) */
|
||||
@@ -604,6 +652,28 @@
|
||||
align-items: stretch;
|
||||
}
|
||||
|
||||
.bsplus-analytics-chart-cell {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: 100%;
|
||||
min-height: 0;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.bsplus-analytics-chart-cell > :global(.bsplus-analytics-animate) {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
flex: 1;
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.bsplus-analytics-chart-cell :global(.bsplus-analytics-card) {
|
||||
flex: 1;
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
/* Fade-in animation must not paint above the filter toolbar / dropdown */
|
||||
.bsplus-analytics-charts > .bsplus-analytics-animate {
|
||||
z-index: 1;
|
||||
@@ -618,7 +688,7 @@
|
||||
|
||||
@media (min-width: 960px) {
|
||||
.bsplus-analytics-charts {
|
||||
grid-template-columns: 1fr 1fr;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
gap: 1.5rem;
|
||||
}
|
||||
|
||||
@@ -660,8 +730,9 @@
|
||||
.bsplus-analytics-card-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: flex-start;
|
||||
align-items: flex-end;
|
||||
gap: 1rem;
|
||||
min-height: 4.75rem;
|
||||
padding: 1.15rem 1.25rem;
|
||||
border-bottom: 1px solid var(--bsplus-analytics-border);
|
||||
}
|
||||
@@ -674,7 +745,34 @@
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: flex-end;
|
||||
gap: 0.75rem;
|
||||
gap: 0.75rem 1rem;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.bsplus-analytics-forecast-controls {
|
||||
min-width: min(100%, 18rem);
|
||||
max-width: 22rem;
|
||||
}
|
||||
|
||||
.bsplus-analytics-forecast-toggle {
|
||||
width: 100%;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
|
||||
.bsplus-analytics-forecast-horizon {
|
||||
flex: 1;
|
||||
min-width: 11rem;
|
||||
}
|
||||
|
||||
.bsplus-analytics-forecast-line {
|
||||
opacity: 0.9;
|
||||
}
|
||||
|
||||
.bsplus-analytics-root [data-slot="chart"] .bsplus-analytics-forecast-line {
|
||||
stroke: var(--bsplus-analytics-forecast, var(--bsplus-analytics-accent)) !important;
|
||||
stroke-dasharray: 7 5 !important;
|
||||
stroke-width: 2.5px;
|
||||
fill: none !important;
|
||||
}
|
||||
|
||||
.bsplus-analytics-card-control {
|
||||
@@ -728,6 +826,8 @@
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
background: var(--bsplus-analytics-surface);
|
||||
}
|
||||
|
||||
@@ -777,18 +877,28 @@
|
||||
|
||||
/* ─── Layerchart / SVG (fix default black rects in dark UI) ─── */
|
||||
.bsplus-chart-host {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
display: block;
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
overflow: visible;
|
||||
color: var(--bsplus-analytics-muted);
|
||||
}
|
||||
|
||||
.bsplus-analytics-root .bsplus-chart-surface,
|
||||
.bsplus-analytics-root .bsplus-chart-surface {
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
height: var(--bsplus-analytics-chart-height, 280px);
|
||||
min-height: var(--bsplus-analytics-chart-height, 280px);
|
||||
max-height: var(--bsplus-analytics-chart-height, 280px);
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.bsplus-analytics-root .bsplus-chart-surface-bar {
|
||||
height: var(--bsplus-analytics-chart-height);
|
||||
min-height: var(--bsplus-analytics-chart-height);
|
||||
max-height: var(--bsplus-analytics-chart-height);
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
height: 320px;
|
||||
min-height: 320px;
|
||||
max-height: 320px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
@@ -826,6 +936,9 @@
|
||||
}
|
||||
|
||||
.bsplus-analytics-root [data-slot="chart"] svg {
|
||||
display: block;
|
||||
width: 100% !important;
|
||||
max-width: 100%;
|
||||
background: transparent !important;
|
||||
overflow: visible;
|
||||
}
|
||||
@@ -1003,10 +1116,9 @@
|
||||
border-radius: 999px;
|
||||
font-weight: 700;
|
||||
font-size: 0.75rem;
|
||||
background: color-mix(
|
||||
in srgb,
|
||||
var(--bsplus-analytics-accent) 14%,
|
||||
transparent
|
||||
background: var(
|
||||
--bsplus-analytics-accent-subtle,
|
||||
color-mix(in srgb, var(--bsplus-analytics-accent) 14%, transparent)
|
||||
);
|
||||
color: var(--bsplus-analytics-accent);
|
||||
}
|
||||
@@ -1037,9 +1149,11 @@
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
justify-content: flex-end;
|
||||
justify-content: flex-start;
|
||||
gap: 0.75rem;
|
||||
padding-bottom: 0.5rem;
|
||||
color: var(--bsplus-analytics-muted);
|
||||
font-size: 0.8125rem;
|
||||
}
|
||||
|
||||
/* ─── States ─── */
|
||||
|
||||
Reference in New Issue
Block a user