{first.title}
-- {first.text} -
-{first.title}
++ {first.text} +
+diff --git a/package.json b/package.json index 362b996..7190e58 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ "jest-resolve": "26.6.0", "jest-watch-typeahead": "0.6.1", "jol-player": "^2.5.0", + "lodash": "^4.17.21", "mapir-react-component": "^2.0.1", "mini-css-extract-plugin": "0.11.3", "optimize-css-assets-webpack-plugin": "5.0.4", diff --git a/src/assets/IRANSans/Farsi_numerals/webFonts/css/style.css b/src/assets/IRANSans/Farsi_numerals/webFonts/css/style.css index b5457ff..63be599 100644 --- a/src/assets/IRANSans/Farsi_numerals/webFonts/css/style.css +++ b/src/assets/IRANSans/Farsi_numerals/webFonts/css/style.css @@ -71,7 +71,7 @@ h1 { blockquote { font-weight: 500; padding: 10px; - border: 1px dashed #666666; + border: 1px dashed $gray4; } .mainbox { diff --git a/src/assets/IRANSans/Non_English/WebFonts/css/style.css b/src/assets/IRANSans/Non_English/WebFonts/css/style.css index c163904..89f0b80 100644 --- a/src/assets/IRANSans/Non_English/WebFonts/css/style.css +++ b/src/assets/IRANSans/Non_English/WebFonts/css/style.css @@ -71,7 +71,7 @@ h1 { blockquote { font-weight: 500; padding: 10px; - border: 1px dashed #666666; + border: 1px dashed $gray4; } .mainbox { diff --git a/src/assets/IRANSans/WebFonts/css/style.css b/src/assets/IRANSans/WebFonts/css/style.css index b5457ff..63be599 100644 --- a/src/assets/IRANSans/WebFonts/css/style.css +++ b/src/assets/IRANSans/WebFonts/css/style.css @@ -71,7 +71,7 @@ h1 { blockquote { font-weight: 500; padding: 10px; - border: 1px dashed #666666; + border: 1px dashed $gray4; } .mainbox { diff --git a/src/components/BreadCrumbs/index.scss b/src/components/BreadCrumbs/index.scss index 79337c9..c44a144 100644 --- a/src/components/BreadCrumbs/index.scss +++ b/src/components/BreadCrumbs/index.scss @@ -2,13 +2,13 @@ a { text-decoration: none; font-family: numeralLight; - color: #aaa; + color: $gray; letter-spacing: -1px; } } .MuiBreadcrumbs-separator{ - color: #aaa; + color: $gray; } @media screen and (min-width: 1441px) { .MuiBreadcrumbs-li{ diff --git a/src/components/BreadCrumbs/index.tsx b/src/components/BreadCrumbs/index.tsx index 6b86eb9..92643f6 100644 --- a/src/components/BreadCrumbs/index.tsx +++ b/src/components/BreadCrumbs/index.tsx @@ -2,8 +2,6 @@ import React from "react"; import Breadcrumbs from "@mui/material/Breadcrumbs"; import { Link } from "react-router-dom"; -import "./index.scss"; - export default function BreadCrumbs(props: any) { const { links } = props; return ( diff --git a/src/components/GradeFilter/index.scss b/src/components/GradeFilter/index.scss index e9ffdc5..22b16e3 100644 --- a/src/components/GradeFilter/index.scss +++ b/src/components/GradeFilter/index.scss @@ -3,7 +3,7 @@ margin: 40px auto; color: white; font-family: numeralLight; - background-color: #383838; + background-color: $gray1; border-radius: 6px; &__box{ display: none !important; @@ -11,11 +11,11 @@ h1{ margin: 0px; padding: 0px 15px; - color: #6C6C6C; + color: $gray2; span{ width: 2px; height: 20px; - background-color: rgb(143, 142, 142); + background-color: $gray3; margin-right: 15px; } } @@ -28,8 +28,8 @@ height: 100%; width : calc(100% / 12); transition: right 0.5s; - background-color: #9CDF52; - box-shadow: 0px 0px 20px #9CDF52; + background-color: $green; + box-shadow: 0px 0px 20px $green; z-index: 50; } li{ @@ -37,8 +37,8 @@ text-align: center; cursor: pointer; padding: 6px 0px; - // box-shadow: 0px 0px 20px #9CDF52; - // background-color: #9CDF52; + // box-shadow: 0px 0px 20px $green; + // background-color: $green; } } &__active{ @@ -94,7 +94,7 @@ position: absolute; left: 0px; top: 45px; - background : #383838; + background : $gray1; padding: 10px 20px; border-radius: 10px; li{ @@ -102,13 +102,13 @@ margin: 8px 5px; font-size: calc(100vw / 28); padding: 5px 0px; - border: 1px solid #666666; + border: 1px solid $gray4; border-radius: 5px; } &--active{ - border-color: #9CDF52 !important; - color: #9CDF52; + border-color: $green !important; + color: $green; } } &__box{ @@ -124,18 +124,18 @@ top: 9px; } span{ - color: #6C6C6C; + color: $gray2; font-size: calc(100vw / 60); } h2{ font-size: calc(100vw / 50); - color: #9CDF52; + color: $green; } } h1{ font-size: calc(100vw / 50); - background-color: #9CDF52; - box-shadow: 0px 0px 20px #9CDF52; + background-color: $green; + box-shadow: 0px 0px 20px $green; border-top-right-radius: 8px; border-bottom-right-radius: 8px; padding: 12px 15px; @@ -155,8 +155,8 @@ position: relative; h1{ font-size: calc(100vw / 30); - background-color: #9CDF52; - box-shadow: 0px 0px 2px #9CDF52; + background-color: $green; + box-shadow: 0px 0px 2px $green; border-top-right-radius: 8px; border-bottom-right-radius: 8px; padding: 12px 15px; @@ -175,12 +175,12 @@ top: 9px; } span{ - color: #6C6C6C; + color: $gray2; font-size: calc(100vw / 34); } h2{ font-size: calc(100vw / 27); - color: #9CDF52; + color: $green; } } &__list{ @@ -189,7 +189,7 @@ position: absolute; left: 0px; top: 45px; - background : #383838; + background : $gray1; padding: 10px 20px; border-radius: 10px; justify-content:center; @@ -198,12 +198,12 @@ margin: 8px 5px; font-size: calc(100vw / 28); padding: 5px 0px; - border: 1px solid #666666; + border: 1px solid $gray4; border-radius: 5px; } &--active{ - border-color: #9CDF52 !important; - color: #9CDF52; + border-color: $green !important; + color: $green; } } diff --git a/src/components/GradeFilter/index.tsx b/src/components/GradeFilter/index.tsx index 9d0adeb..a7af492 100644 --- a/src/components/GradeFilter/index.tsx +++ b/src/components/GradeFilter/index.tsx @@ -1,7 +1,6 @@ import React, { useState, useEffect, useRef } from "react"; import { connect } from "react-redux"; import { book } from "../../redux/actions"; -import "./index.scss"; import dropdown from "../../assets/icons/dropdown.png"; diff --git a/src/components/HomeSearchBox/index.scss b/src/components/HomeSearchBox/index.scss index e8aaa46..591eaf4 100644 --- a/src/components/HomeSearchBox/index.scss +++ b/src/components/HomeSearchBox/index.scss @@ -7,7 +7,7 @@ } form { button { - background-color: #39383d; + background-color: $gray1; margin-right: 3px; border-top-left-radius: 9px; border-bottom-left-radius: 9px; @@ -15,18 +15,18 @@ } input { width: 100%; - background-color: #46454a; + background-color: $gray5; border: 0px; border-top-right-radius: 9px; border-bottom-right-radius: 9px; - color: #ddd; + color: $gray6; &::placeholder { padding-right: 0px; - color: #ddd; + color: $gray6; opacity: 0.4; } &:focus { - outline: 2px solid #9cdf52 !important; + outline: 2px solid $green !important; } } } @@ -37,7 +37,7 @@ } } strong{ - color: #9cdf52; + color: $green; font-weight: 300; margin-left: 20px; } @@ -78,7 +78,7 @@ } ul{ li { - color: #a2b4cb; + color: $blue; margin-left: 25px; font-size: 14px; } @@ -115,7 +115,7 @@ width: 850px; padding: 10px 0px !important; li { - color: #a2b4cb; + color: $blue; margin-left: 25px; font-size: calc(100vw / 110); } @@ -151,7 +151,7 @@ width: 85%; padding: 10px 0px !important; li { - color: #a2b4cb; + color: $blue; margin-left: 25px; font-size: calc(100vw / 75); } @@ -192,7 +192,7 @@ font-size: calc(100vw / 30); padding-right: 20px; border-radius: 8px; - background: #383838; + background: $gray1; &::placeholder { font-size: calc(100vw / 34); color: white !important; diff --git a/src/components/HomeSearchBox/index.tsx b/src/components/HomeSearchBox/index.tsx index 1e0a861..ad38f73 100644 --- a/src/components/HomeSearchBox/index.tsx +++ b/src/components/HomeSearchBox/index.tsx @@ -1,5 +1,4 @@ import React, { useState } from "react"; -import "./index.scss"; import { connect } from "react-redux"; import { book } from "../../redux/actions"; import search from "../../assets/icons/search.png"; diff --git a/src/components/Location/index.tsx b/src/components/Location/index.tsx index d089c51..6087b74 100644 --- a/src/components/Location/index.tsx +++ b/src/components/Location/index.tsx @@ -2,7 +2,6 @@ import Mapir from "mapir-react-component"; import blueMark from '../../assets/icons/location-marker.png'; -import './index.scss'; const Map = Mapir.setToken({ transformRequest: (url : string) => { diff --git a/src/components/Navbar/index.scss b/src/components/Navbar/index.scss index 3ada980..4029df2 100644 --- a/src/components/Navbar/index.scss +++ b/src/components/Navbar/index.scss @@ -29,10 +29,10 @@ } } &___share{ - border: 2px solid #46454A; + border: 2px solid $gray5; } &___login{ - background-color: #81C342; + background-color: $green1; } &___logo{ img{ @@ -65,7 +65,7 @@ span{ width: 2px; height: 15px; - background-color: rgb(197, 197, 197); + background-color: $gray6; margin-right: 15px; transform: translateY(-1px); } @@ -102,7 +102,7 @@ span{ width: 2px; height: 15px; - background-color: #3F3F3F; + background-color: $gray1; margin-right: 15px; // transform: translateY(-1px); } diff --git a/src/components/Navbar/index.tsx b/src/components/Navbar/index.tsx index 9b0fed9..3b630db 100644 --- a/src/components/Navbar/index.tsx +++ b/src/components/Navbar/index.tsx @@ -1,5 +1,4 @@ import React, { useState } from "react"; -import "./index.scss"; import MenuRoundedIcon from "@mui/icons-material/MenuRounded"; import { Link } from "react-router-dom"; import { SwipeableDrawer } from "@mui/material"; diff --git a/src/components/NavbarDrawer/NavbarDrawer.scss b/src/components/NavbarDrawer/NavbarDrawer.scss index fc3278f..bbbfa11 100644 --- a/src/components/NavbarDrawer/NavbarDrawer.scss +++ b/src/components/NavbarDrawer/NavbarDrawer.scss @@ -39,7 +39,7 @@ left: 0px; top: 10px; span { - background-color: #6cbe44; + background-color: $green2; color: white; padding: 2px 4px; @@ -91,7 +91,7 @@ margin-left: 20px; } & .badge { - background-color: red; + background-color: $red; margin: 5px; position: absolute; left: 5px; @@ -120,7 +120,7 @@ justify-content: center; align-items: center; & span { - color: #cfcfcf; + color: #ddd; font-size: 14px; } } diff --git a/src/components/NavbarDrawer/NavbarDrawer.tsx b/src/components/NavbarDrawer/NavbarDrawer.tsx index e076178..8dd5376 100644 --- a/src/components/NavbarDrawer/NavbarDrawer.tsx +++ b/src/components/NavbarDrawer/NavbarDrawer.tsx @@ -22,7 +22,6 @@ import mobileDanger from "../../assets/icons/mobileDanger.svg"; import mobileLogout from "../../assets/icons/mobileLogout.svg"; import proxy from "../../redux/proxy"; -import "./NavbarDrawer.scss"; const NavbarDrawer = ({ status, logout }: any) => { const [dropdown, setDropdown] = useState(false); const links = [ @@ -283,14 +282,14 @@ const User = (props: any) => {
- {first.text} -
-+ {first.text} +
+