diff --git a/client/src/app/style.css b/client/src/app/style.css index 6baae9ea..a7a928a1 100644 --- a/client/src/app/style.css +++ b/client/src/app/style.css @@ -2,7 +2,6 @@ padding: 0; margin: 0; box-sizing: border-box; - transition: 0.3s; } :root { @@ -25,7 +24,6 @@ html { body { font-family: var(--main-font); - overflow: hidden; } .App { @@ -42,7 +40,7 @@ li { .pagination { position: absolute; - bottom: 4%; + bottom: 1%; left: 50%; transform: translate(-50%, -5%); } diff --git a/client/src/components/AdminContainer/style.css b/client/src/components/AdminContainer/style.css index 246d4e77..45f0ce41 100644 --- a/client/src/components/AdminContainer/style.css +++ b/client/src/components/AdminContainer/style.css @@ -136,6 +136,11 @@ .admin-side { justify-content: space-between; align-items: center; + height: 55px; + } + + .admin-content .ant-list-items { + margin-top: 5px; } .admin-menu, .admin-side-btn { @@ -182,6 +187,10 @@ .admin-container-side { top: 67px; } + .admin-content .pagination { + position: initial; + transform: translate(0); + } } @media screen and (min-width: 762px) and (max-width: 1104px) { @@ -269,17 +278,3 @@ width: 156px; } } - -/* @media screen and (max-width: 900px) { - .admin-container { - display: block; - } - -.admin-side { - width: 100%; - position: absolute; - top: 2px; - right: 2px; - height: auto; -} -} */ diff --git a/client/src/components/OverviewComponent/style.css b/client/src/components/OverviewComponent/style.css index e3e09dee..3ef29d42 100644 --- a/client/src/components/OverviewComponent/style.css +++ b/client/src/components/OverviewComponent/style.css @@ -95,7 +95,10 @@ } .overview-container .right-part { - background-color: var(--main-white); + background-color: var(--main-color); + width: 65%!important; + border-radius: 0 0 259px 0; + box-shadow: 1px 1px 12px #3A5A6E; } .overview-container { @@ -127,6 +130,10 @@ .overview-container .container-content .ant-btn { margin-top: 14px; } + /* .overview-container .left-part { + width: 50%; + background-color: var(--main-color); + } */ } @media screen and (max-width: 768px) { diff --git a/client/src/components/UserContainer/style.css b/client/src/components/UserContainer/style.css index 48f20c78..4ee1fdf8 100644 --- a/client/src/components/UserContainer/style.css +++ b/client/src/components/UserContainer/style.css @@ -324,7 +324,7 @@ .right-nav-list { font-size: 0.9em; - top: 11%; + top: 50%; right: 10px; } diff --git a/client/src/containers/CohortsAlumniPage/styles.css b/client/src/containers/CohortsAlumniPage/styles.css index 2667864d..f5e23405 100644 --- a/client/src/containers/CohortsAlumniPage/styles.css +++ b/client/src/containers/CohortsAlumniPage/styles.css @@ -31,7 +31,7 @@ } .child-container { - margin-top: 135px; + padding-top: 135px; margin-right: 60px; } diff --git a/client/src/containers/ContactUsPage/index.js b/client/src/containers/ContactUsPage/index.js index 16771b15..06b86f09 100644 --- a/client/src/containers/ContactUsPage/index.js +++ b/client/src/containers/ContactUsPage/index.js @@ -24,9 +24,9 @@ const ContactUS = () => {
contact
-
+
-
+

FOLLOW US

Gaza Sky Geeks

@@ -61,7 +61,7 @@ const ContactUS = () => {
-
+

CONTACT US

Phone: +970 8282 6331

@@ -72,7 +72,7 @@ const ContactUS = () => {

-
+

Sections of the site

diff --git a/client/src/containers/ContactUsPage/style.css b/client/src/containers/ContactUsPage/style.css index a84dd8cd..5706e37c 100644 --- a/client/src/containers/ContactUsPage/style.css +++ b/client/src/containers/ContactUsPage/style.css @@ -1,7 +1,7 @@ .contact-container { - display: flex; - width: 100vw; - height: 100vh; + display: flex; + width: 100vw; + height: 100vh; } .img-container { @@ -10,81 +10,81 @@ } .img-container img { - height: 110vh; - width: 32rem; + height: 100vh; + width: 32rem; } -.contact-container .content-container { +.contact-container .contact-page-container { width: 50%; - margin-top: 120px; + padding-top: 120px; text-align: left; margin-left: 5rem; } -.contact-container .content-container h4 { +.contact-container .contact-page-container h4 { font-weight: bold; color: var(--main-color); } -.child-container .icons-container { +.contact-child-container .icons-container { display: flex; justify-content: space-between; width: 18%; } -.child-container .icons-container :hover { +.contact-child-container .icons-container :hover { color: var(--main-color); } -.child-container .icons-container svg { +.contact-child-container .icons-container svg { color: var(--content-blue-green); } -.content-container .child-container { +.contact-page-container .contact-child-container { margin-top: 3rem; } -.content-container .child-container p { +.contact-page-container .contact-child-container p { color: var(--content-blue-green); } -.child-container .section-container-1 { +.contact-child-container .section-container-1 { display: flex; justify-content: space-between; width: 130px; color: var(--content-blue-green) ; } -.child-container .section-container-1 p:hover { +.contact-child-container .section-container-1 p:hover { color: var(--main-color); } -.child-container .section-container-2 { +.contact-child-container .section-container-2 { display: flex; justify-content: space-between; width: 184px; } -.child-container .section-container-2 p:hover { +.contact-child-container .section-container-2 p:hover { color: var(--main-color); } -.child-container .text:hover { +.contact-child-container .text:hover { color: var(--main-color); } -.content-container .rights { +.contact-page-container .rights { position: absolute; bottom: 1.66rem; width: 50%; } -.content-container .end-line { +.contact-page-container .end-line { border-bottom: 1px dashed var(--main-color); width: 80%; } -.content-container .copy-right { +.contact-page-container .copy-right { font-weight: bold; color: var(--content-blue-green) ; font-size: 12px; @@ -92,7 +92,7 @@ } @media screen and (min-width: 769px) and (max-width: 1024px) { - .child-container .icons-container { + .contact-child-container .icons-container { width: 24%; } } @@ -112,6 +112,7 @@ top: 0px; z-index: -1; } + } @media screen and (max-width: 768px) { @@ -119,31 +120,34 @@ display: block; } - .contact-container .content-container { + .contact-container .contact-page-container { width: 89%; - margin-top: 20px; + padding-top: 10px; } - .contact-container .content-container .content-parent { + .contact-container .contact-page-container .content-parent { display: flex; justify-content: space-between; flex-wrap: wrap; width: 100%; } - .contact-container .content-container .content-parent .child-container { + .contact-container .contact-page-container .content-parent .contact-child-container { width: 200px; } - .child-container .icons-container { + .contact-child-container .icons-container { width: 56%; } .contact-container .img-container { - width: 100%; height: 39vh; + background-color: var(--main-color); + width: 65%!important; + border-radius: 0 0 259px 0; + box-shadow: 1px 1px 12px #3A5A6E; + text-align: left; padding-left: 5rem; - background-color: var(--main-white); } .contact-container .img-container img { @@ -152,7 +156,7 @@ margin-top: 10rem; } - .content-container .rights { + .contact-page-container.rights { position: absolute; bottom: 25px; width: 100%; @@ -160,7 +164,7 @@ } @media screen and (min-width: 488px) and (max-width: 677px) { - .contact-container .content-container .content-parent { + .contact-container .contact-page-container .content-parent { width: 92%; } } @@ -185,27 +189,27 @@ height: 86%; } - .contact-container .content-container { + .contact-container .contact-page-container { margin-top: 10px; } - .content-container .child-container { + .contact-page-container .contact-child-container { margin-top: 20px; } } @media screen and (max-width: 360px) { - .content-container .child-container { + .contact-page-container .contact-child-container { font-size: 12px; } - .content-container .rights { + .contact-page-container .rights { position: absolute; bottom: 1px; width: 100%; } - .content-container .copy-right { + .contact-page-container .copy-right { font-weight: bold; color: var(--content-blue-green); font-size: 10px; diff --git a/client/src/containers/SearchPage/index.js b/client/src/containers/SearchPage/index.js index ad900f7f..48c2461d 100644 --- a/client/src/containers/SearchPage/index.js +++ b/client/src/containers/SearchPage/index.js @@ -591,7 +591,6 @@ class SearchPage extends Component { > {project.name} -

{project.name}

{project.project_type}

diff --git a/client/src/containers/SearchPage/style.css b/client/src/containers/SearchPage/style.css index ed3ee35c..c8fb7554 100644 --- a/client/src/containers/SearchPage/style.css +++ b/client/src/containers/SearchPage/style.css @@ -1,5 +1,5 @@ .search-page { - margin: 120px 8% 0; + padding: 120px 8% 0; display: flex; flex-wrap: wrap; justify-content: space-around; @@ -214,7 +214,7 @@ @media (max-width: 1200px) { .search-page { - margin: 120px 4% 0; + padding: 120px 4% 0; } .cohort { font-size: 13px; @@ -273,7 +273,7 @@ @media (max-width: 576px) { .search-page { - margin: 120px 10% 0; + padding: 120px 10% 0; } .display-cohort { width: 100%; diff --git a/client/src/containers/statisticsPage/style.css b/client/src/containers/statisticsPage/style.css index bcd4d893..bbf7c88c 100644 --- a/client/src/containers/statisticsPage/style.css +++ b/client/src/containers/statisticsPage/style.css @@ -109,3 +109,13 @@ .state .ant-progress-bg { background-color: var(--main-color); } + +@media screen and (max-width: 762px) { + .state-container .admin-chart{ + display: none; + } + .state-container .state{ + width: 100%; + margin-top: 20px; + } + } \ No newline at end of file