From aeac5c60d8c0c0f1d5c4709eaa44eca3235305f3 Mon Sep 17 00:00:00 2001
From: Vinicius Gabriel Machado <vgm18@inf.ufpr.br>
Date: Tue, 5 Oct 2021 01:58:23 -0300
Subject: [PATCH] Contrast
---
src/Admin/Pages/Pages/SubPages/BlockedUsers.js | 11 +++++++----
src/Components/AreasSubPagesFunction.js | 4 ++--
src/Components/carousel.css | 13 +++++++++----
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/Admin/Pages/Pages/SubPages/BlockedUsers.js b/src/Admin/Pages/Pages/SubPages/BlockedUsers.js
index 90f929ac..8ca50cff 100644
--- a/src/Admin/Pages/Pages/SubPages/BlockedUsers.js
+++ b/src/Admin/Pages/Pages/SubPages/BlockedUsers.js
@@ -111,7 +111,8 @@ const BlockedUsers = () => {
style={{
textAlign: "center",
padding: "0.5em",
- backgroundColor: "#FF8C00",
+ backgroundColor: state.contrast === "" ? "#FF8C00" : "black",
+ border: state.contrast === "" ? "" : "1px solid white",
fontWeight: "500",
color: "#FFFAFA",
}}
@@ -125,7 +126,8 @@ const BlockedUsers = () => {
style={{
textAlign: "center",
padding: "0.5em",
- backgroundColor: "red",
+ backgroundColor: state.contrast === "" ? "red" : "black",
+ border: state.contrast === "" ? "" : "1px solid white",
fontWeight: "500",
color: "#FFFAFA",
}}
@@ -139,7 +141,8 @@ const BlockedUsers = () => {
style={{
textAlign: "center",
padding: "0.5em",
- backgroundColor: "#797D7F",
+ backgroundColor: state.contrast === "" ? "#797D7F" : "black",
+ border: state.contrast === "" ? "" : "1px solid white",
fontWeight: "500",
color: "#FFFAFA",
}}
@@ -431,7 +434,7 @@ const BlockedUsers = () => {
index === items.length - 1 ?
<TableRow className={classesRow.root} key={new Date().toISOString() + row.created_at}>
{/* Button to load more data */}
- <TableCell className={classesCell.root} colpsan={6}>
+ <TableCell className={classesCell.root} colspan={6}>
<Button
color='primary'
variant='text'
diff --git a/src/Components/AreasSubPagesFunction.js b/src/Components/AreasSubPagesFunction.js
index 7078cb08..f3f3a60a 100644
--- a/src/Components/AreasSubPagesFunction.js
+++ b/src/Components/AreasSubPagesFunction.js
@@ -95,7 +95,7 @@ function ReqResources(props) {
</Grid>
</Grid>
:
- <Carousel showThumbs={false} infiniteLoop={true} showStatus={false}>
+ <Carousel className={`${props.contrast}Carousel`} showThumbs={false} infiniteLoop={true} showStatus={false}>
{
rows.length >= 1 ?
rows.map((row, index) => (
@@ -164,7 +164,7 @@ function ReqCollections(props) {
</Grid>
:
rows.length >= 1 ?
- <Carousel showThumbs={false} infiniteLoop={true} showStatus={false}>
+ <Carousel className={`${props.contrast}Carousel`} showThumbs={false} infiniteLoop={true} showStatus={false}>
{
rows.map((row, index) => (
<Row style={{ paddingBottom: "5px", margin: '0 auto', width: "80%", justifyContent: "center", minHeight: "50px" }} key={(index + 1)}>
diff --git a/src/Components/carousel.css b/src/Components/carousel.css
index 3a4c6336..929ac9e3 100644
--- a/src/Components/carousel.css
+++ b/src/Components/carousel.css
@@ -26,12 +26,16 @@ along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>
position: inherit !important;
}
-.carousel .control-arrow {
+.Carousel .control-arrow {
background: orange !important;
- /* position: relative !important; */
- -webkit-box-shadow: 0 8px 17px 2px rgba(0,0,0,0.14), 0 3px 14px 2px rgba(0,0,0,0.12), 0 5px 5px -3px rgba(0,0,0,0.2);
- box-shadow: 0 8px 17px 2px rgba(0,0,0,0.14), 0 3px 14px 2px rgba(0,0,0,0.12), 0 5px 5px -3px rgba(0,0,0,0.2);
+ -webkit-box-shadow: 0px 0px 30px -10px #000000;
+ box-shadow: 0px 0px 15px -5px #000000;
+}
+
+.ContrastCarousel .control-arrow {
+ background: black !important;
+ border: 1px solid white !important;
}
.MuiPaper-elevation1-209{
@@ -48,4 +52,5 @@ along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>
vertical-align: middle;
height: 50px;
width: 50px;
+ margin: 10px;
}
--
GitLab