seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'PR' into develop

pull/137/head
13621160019@163.com 2022-03-25 08:36:30 +08:00
parent c964306999 972a3265dd
commit ad6827d79d
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
myems-web/src/assets/scss/dark/_override.scss
View File

@ -271,6 +271,10 @@ $theme-falcon-btn-colors: (
color: #fff !important;
}
.text-lightSlateGray {
color: #789 !important;
}
a.text-white {
color: #fff !important;

15
myems-web/src/components/MyEMS/common/LineChart.js
View File

@ -30,7 +30,7 @@ const LineChart = ({
{
borderWidth: 2,
data: data[option],
borderColor: rgbaColor(isDark ? themeColors.primary : '#fff', 0.8),
borderColor: rgbaColor(isDark ? themeColors.primary : '#000', 0.8),
backgroundColor: gradientFill
}
]
@ -53,12 +53,12 @@ const LineChart = ({
xAxes: [
{
ticks: {
fontColor: rgbaColor('#fff', 0.7),
fontColor: rgbaColor('#789', 0.8),
fontStyle: 600
},
gridLines: {
color: rgbaColor('#fff', 0.1),
zeroLineColor: rgbaColor('#fff', 0.1),
color: rgbaColor('#000', 0.1),
zeroLineColor: rgbaColor('#000', 0.1),
lineWidth: 1
}
}
@ -67,7 +67,7 @@ const LineChart = ({
{
display: true,
gridLines: {
color: rgbaColor('#fff', 0.1)
color: rgbaColor('#000', 0.1)
}
}
]
@ -77,10 +77,10 @@ const LineChart = ({
return (
<Card className="mb-3">
<CardBody className="rounded-soft bg-gradient">
<CardBody className="rounded-soft">
<Row className="text-white align-items-center no-gutters">
<Col>
<h4 className="text-white mb-0">{reportingTitle}</h4>
<h4 className="text-lightSlateGray mb-0">{reportingTitle}</h4>
<p className="fs--1 font-weight-semi-bold">
{baseTitle}
</p>
@ -109,3 +109,4 @@ const LineChart = ({
};
export default LineChart;