From ed3d7d72018ae5397028646761675bf5a624e539 Mon Sep 17 00:00:00 2001
From: reeshi-18 <reeshipaul35@gmail.com>
Date: Wed, 7 Dec 2022 01:41:20 +0530
Subject: [PATCH 1/4] added dark theme variable
---
src/App.vue | 2 +-
src/styles/modules/_navbar.scss | 2 +-
src/styles/partials/_variables.scss | 49 ++++++++++++++++++++++++++++-
3 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index e6aad19..ffd1080 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -38,7 +38,7 @@ export default {
z-index: 1;
min-height: 100%;
display: flex;
- background-color: #fcfcfc;
+ background-color: $theme-color-white;
}
@media only screen and (max-width: 1280) {
diff --git a/src/styles/modules/_navbar.scss b/src/styles/modules/_navbar.scss
index b083cf8..04ea3c2 100644
--- a/src/styles/modules/_navbar.scss
+++ b/src/styles/modules/_navbar.scss
@@ -1,5 +1,5 @@
.navbar {
- background-color: #fcfcfc;
+ background-color: $theme-color-white;
width: 100%;
height: 2rem;
display: flex;
diff --git a/src/styles/partials/_variables.scss b/src/styles/partials/_variables.scss
index 5ed1fb6..5926883 100644
--- a/src/styles/partials/_variables.scss
+++ b/src/styles/partials/_variables.scss
@@ -1,3 +1,5 @@
+$dark-theme: true;
+
$root-font-size: 0.8982vw;
// $root-font-size-small: ;
// $root-font-size-large: ;
@@ -7,8 +9,9 @@ $root-base-size: 16;
$primary-font-family: "Nunito Sans", sans-serif;
$secondary-font-family: "Open Sans", sans-serif;
+
// colors variables
-$theme-color-white: #ffffff;
+$theme-color-white: #fcfcfc;
$theme-color-offwhite: #f2f2f2;
$theme-color-dark-white: #e7e7e7;
$theme-color-black: #000000;
@@ -47,6 +50,50 @@ $theme-color-violet-med-transp: rgba(89, 60, 143, 0.57);
$theme-color-dark-black-low-transp: rgba(0, 0, 0, 0.15);
$theme-color-dark-blue-high-transp: rgba(76, 128, 165, 0.75);
+
+@if $dark-theme {
+ $theme-color-white: #000000;
+ $theme-color-offwhite: #120f0f;
+ $theme-color-dark-white: #0c0b0e;
+ $theme-color-black: #fcfcfe;
+ $theme-color-black19: #d7d6d7;
+ $theme-color-blue: #355dc5;
+ $theme-color-orange: #ff9458;
+ $theme-color-dark-orange: #e44f26;
+ $theme-color-light-orange: #cc652b;
+ $theme-color-grey57: #575757;
+ $theme-color-grey39: #393939;
+ $theme-color-grey: #555555;
+ $theme-color-dark-grey: #444444;
+ $theme-color-light-grey: #999999;
+ $theme-color-off-white: #dddddd;
+ $theme-color-light-grey-d7: #d7d7d7;
+ $theme-color-white-grey: #b3b3b3;
+ $theme-color-dark-blue: #2e9cca;
+ $theme-color-light-blue: #808cad;
+ $theme-color-red: #aa3126;
+ $theme-color-violet: #411396;
+ $theme-color-white-low-transp: rgba(0,0,0,0.05);
+ $theme-color-black-low-transp: rgba(41, 40, 40, 0.5);
+ $theme-color-black-med-transp: rgba(57, 57, 57, 0.57);
+ $theme-color-black-high-transp: rgba(44, 43, 42, 0.8);
+ $theme-color-green-high-transp: rgba(7, 60, 23, 1);
+ $theme-color-yellow-high-transp: rgba(88, 75, 6, 1);
+ $theme-color-red-high-transp: rgba(87, 18, 17, 1);
+ $theme-color-dark-red-med-transp: rgba(255, 103, 0, 0.3);
+ $theme-color-grey-low-transp: rgba(87, 87, 87, 0.07);
+ $theme-color-grey-med-transp: rgba(87, 87, 87, 0.2);
+ $theme-color-grey-high-transp: rgba(87, 87, 87, 0.35);
+ $theme-color-blue-low-transp: rgba(37, 85, 124, 0.2);
+ $theme-color-light-black-low-transp: rgba(221, 221, 221, 0.1);
+ $theme-color-light-black-med-transp: rgba(138, 138, 138, 0.57);
+ $theme-color-violet-med-transp: rgba(89, 60, 143, 0.57);
+ $theme-color-dark-black-low-transp: rgba(255, 255, 255, 0.15);
+ $theme-color-dark-blue-high-transp: rgba(76, 128, 165, 0.35);
+}
+
+
+
$primary-font-color: $theme-color-black;
$primary-theme-color: $theme-color-blue;
$secondary-theme-color: $theme-color-orange;
From 562e4b512a5beeab6d711606946711f0aa093095 Mon Sep 17 00:00:00 2001
From: reeshi-18 <reeshipaul35@gmail.com>
Date: Wed, 7 Dec 2022 18:32:19 +0530
Subject: [PATCH 2/4] iteration2 changes
---
src/App.vue | 2 +-
src/styles/modules/_footer.scss | 2 +-
src/styles/modules/_previewModal.scss | 4 +++-
src/styles/partials/_variables.scss | 9 +++++----
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index ffd1080..98c7dd8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -32,7 +32,7 @@ export default {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-align: center;
- color: #2c3e50;
+ color: $theme-color-grey-blue;
font-size: 1vw;
overflow: hidden;
z-index: 1;
diff --git a/src/styles/modules/_footer.scss b/src/styles/modules/_footer.scss
index 0017975..3a4040b 100644
--- a/src/styles/modules/_footer.scss
+++ b/src/styles/modules/_footer.scss
@@ -17,7 +17,7 @@
}
.adminFooterTitle {
- color: #191919 !important;
+ color: $theme-color-black19 !important;
text-align: left;
vertical-align: middle;
font-family: $primary-font-family;
diff --git a/src/styles/modules/_previewModal.scss b/src/styles/modules/_previewModal.scss
index 35da568..88cde51 100644
--- a/src/styles/modules/_previewModal.scss
+++ b/src/styles/modules/_previewModal.scss
@@ -45,15 +45,17 @@
font-family: $primary-font-family;
font-size: 1.5rem;
border-bottom: 0.0625rem solid rgba(87, 87, 87, 0.7);
+ background-color: $theme-color-white;
}
.modal-close-button {
outline: none;
border: none;
- background-color: white;
+ background-color: $theme-color-white;
}
.modal-body {
padding: 4rem calc(10rem * 1440 / 1980);
+ background-color: $theme-color-white;
}
\ No newline at end of file
diff --git a/src/styles/partials/_variables.scss b/src/styles/partials/_variables.scss
index 5926883..614b99d 100644
--- a/src/styles/partials/_variables.scss
+++ b/src/styles/partials/_variables.scss
@@ -28,6 +28,7 @@ $theme-color-light-grey: #999999;
$theme-color-off-white: #dddddd;
$theme-color-light-grey-d7: #d7d7d7;
$theme-color-white-grey: #b3b3b3;
+$theme-color-grey-blue: #2c3e50;
$theme-color-dark-blue: #355dc5;
$theme-color-light-blue: #d6def3;
$theme-color-red: #b83428;
@@ -61,14 +62,14 @@ $theme-color-dark-blue-high-transp: rgba(76, 128, 165, 0.75);
$theme-color-orange: #ff9458;
$theme-color-dark-orange: #e44f26;
$theme-color-light-orange: #cc652b;
- $theme-color-grey57: #575757;
- $theme-color-grey39: #393939;
+ $theme-color-grey57: #747474;
+ $theme-color-grey39: #a5a5a5;
$theme-color-grey: #555555;
$theme-color-dark-grey: #444444;
$theme-color-light-grey: #999999;
$theme-color-off-white: #dddddd;
- $theme-color-light-grey-d7: #d7d7d7;
- $theme-color-white-grey: #b3b3b3;
+ $theme-color-light-grey-d7: #3d3d3d;
+ $theme-color-white-grey: #909090;
$theme-color-dark-blue: #2e9cca;
$theme-color-light-blue: #808cad;
$theme-color-red: #aa3126;
From 37181a4cddc4938dc8bc447c0f00324ca5c692e5 Mon Sep 17 00:00:00 2001
From: reeshi-18 <reeshipaul35@gmail.com>
Date: Thu, 8 Dec 2022 01:23:09 +0530
Subject: [PATCH 3/4] iteration3 changes made
---
src/assets/labs-logo-dark.svg | 4 ++++
src/assets/main-logo-dark.svg | 3 +++
src/assets/sdslabs-logo-dark.svg | 4 ++++
src/assets/sdslabs-logo-dark.svg:Zone.Identifier | 3 +++
src/components/Footer.vue | 10 +++++++++-
src/components/Navbar.vue | 5 ++---
src/constants/images.js | 3 +++
src/layouts/Auth.vue | 12 +++++-------
src/styles/modules/_adminNotifications.scss | 3 ++-
src/styles/modules/_statsNavbar.scss | 2 +-
src/styles/partials/_variables.scss | 16 ++++++++++------
11 files changed, 46 insertions(+), 19 deletions(-)
create mode 100644 src/assets/labs-logo-dark.svg
create mode 100644 src/assets/main-logo-dark.svg
create mode 100644 src/assets/sdslabs-logo-dark.svg
create mode 100644 src/assets/sdslabs-logo-dark.svg:Zone.Identifier
diff --git a/src/assets/labs-logo-dark.svg b/src/assets/labs-logo-dark.svg
new file mode 100644
index 0000000..d0e9cc7
--- /dev/null
+++ b/src/assets/labs-logo-dark.svg
@@ -0,0 +1,4 @@
+<svg width="232" height="73" viewBox="0 0 232 73" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.3398 56.3567C12.6218 56.3567 10.2095 55.9151 8.10307 55.0317C6.03059 54.1484 4.38279 52.9253 3.15969 51.3624C1.93658 49.7995 1.24009 48.0328 1.07022 46.0623H11.9253C12.0612 46.9117 12.4179 47.5402 12.9955 47.9479C13.607 48.3556 14.3715 48.5594 15.2888 48.5594C15.8664 48.5594 16.3251 48.4405 16.6648 48.2027C17.0046 47.9309 17.1744 47.6081 17.1744 47.2344C17.1744 46.5889 16.8177 46.1302 16.1042 45.8584C15.3907 45.5866 14.1846 45.2808 12.4859 44.9411C10.4134 44.5334 8.69763 44.0917 7.33863 43.6161C6.0136 43.1404 4.84146 42.325 3.8222 41.1699C2.83692 40.0147 2.34428 38.4179 2.34428 36.3794C2.34428 34.6127 2.80295 33.0158 3.72028 31.5889C4.67158 30.1279 6.06456 28.9898 7.89922 28.1744C9.73388 27.325 11.9592 26.9003 14.5753 26.9003C18.4485 26.9003 21.4723 27.8516 23.6467 29.7542C25.8551 31.6568 27.1801 34.137 27.6218 37.1948H17.5821C17.4123 36.4133 17.0555 35.8188 16.5119 35.4111C15.9683 34.9694 15.2378 34.7486 14.3205 34.7486C13.7429 34.7486 13.3013 34.8675 12.9955 35.1053C12.6897 35.3091 12.5368 35.6319 12.5368 36.0736C12.5368 36.6512 12.8936 37.0928 13.607 37.3986C14.3205 37.6704 15.4587 37.9592 17.0215 38.265C19.094 38.6727 20.8437 39.1313 22.2707 39.641C23.6977 40.1506 24.9377 41.034 25.991 42.291C27.0442 43.5141 27.5708 45.2129 27.5708 47.3873C27.5708 49.0861 27.0782 50.6149 26.0929 51.9739C25.1076 53.333 23.6807 54.4032 21.812 55.1846C19.9774 55.966 17.82 56.3567 15.3398 56.3567ZM28.4933 41.6285C28.4933 38.6047 29.003 35.9886 30.0222 33.7803C31.0754 31.5379 32.5024 29.8391 34.3031 28.684C36.1038 27.4949 38.1253 26.9003 40.3676 26.9003C42.2363 26.9003 43.8331 27.291 45.1581 28.0724C46.5171 28.8199 47.5534 29.8561 48.2669 31.1812V18.2876H59.5806V56H48.2669V52.0759C47.5534 53.4009 46.5171 54.4541 45.1581 55.2356C43.8331 55.983 42.2363 56.3567 40.3676 56.3567C38.1253 56.3567 36.1038 55.7792 34.3031 54.624C32.5024 53.4349 31.0754 51.7361 30.0222 49.5277C29.003 47.2854 28.4933 44.6523 28.4933 41.6285ZM48.3178 41.6285C48.3178 40.0996 47.9271 38.9105 47.1457 38.0611C46.3642 37.2118 45.362 36.7871 44.1389 36.7871C42.9158 36.7871 41.9135 37.2118 41.1321 38.0611C40.3506 38.9105 39.9599 40.0996 39.9599 41.6285C39.9599 43.1574 40.3506 44.3465 41.1321 45.1959C41.9135 46.0453 42.9158 46.47 44.1389 46.47C45.362 46.47 46.3642 46.0453 47.1457 45.1959C47.9271 44.3465 48.3178 43.1574 48.3178 41.6285ZM75.414 56.3567C72.696 56.3567 70.2838 55.9151 68.1773 55.0317C66.1049 54.1484 64.4571 52.9253 63.234 51.3624C62.0109 49.7995 61.3144 48.0328 61.1445 46.0623H71.9995C72.1354 46.9117 72.4922 47.5402 73.0698 47.9479C73.6813 48.3556 74.4458 48.5594 75.3631 48.5594C75.9407 48.5594 76.3993 48.4405 76.7391 48.2027C77.0788 47.9309 77.2487 47.6081 77.2487 47.2344C77.2487 46.5889 76.892 46.1302 76.1785 45.8584C75.465 45.5866 74.2589 45.2808 72.5601 44.9411C70.4877 44.5334 68.7719 44.0917 67.4129 43.6161C66.0879 43.1404 64.9157 42.325 63.8965 41.1699C62.9112 40.0147 62.4186 38.4179 62.4186 36.3794C62.4186 34.6127 62.8772 33.0158 63.7945 31.5889C64.7459 30.1279 66.1388 28.9898 67.9735 28.1744C69.8081 27.325 72.0335 26.9003 74.6496 26.9003C78.5228 26.9003 81.5466 27.8516 83.721 29.7542C85.9294 31.6568 87.2544 34.137 87.6961 37.1948H77.6564C77.4865 36.4133 77.1298 35.8188 76.5862 35.4111C76.0426 34.9694 75.3121 34.7486 74.3948 34.7486C73.8172 34.7486 73.3755 34.8675 73.0698 35.1053C72.764 35.3091 72.6111 35.6319 72.6111 36.0736C72.6111 36.6512 72.9678 37.0928 73.6813 37.3986C74.3948 37.6704 75.533 37.9592 77.0958 38.265C79.1683 38.6727 80.918 39.1313 82.345 39.641C83.7719 40.1506 85.012 41.034 86.0653 42.291C87.1185 43.5141 87.6451 45.2129 87.6451 47.3873C87.6451 49.0861 87.1525 50.6149 86.1672 51.9739C85.1819 53.333 83.7549 54.4032 81.8863 55.1846C80.0517 55.966 77.8942 56.3567 75.414 56.3567ZM101.41 18.2876V56H90.0965V18.2876H101.41ZM102.953 41.6285C102.953 38.6047 103.462 35.9886 104.481 33.7803C105.535 31.5379 106.962 29.8391 108.762 28.684C110.563 27.4949 112.585 26.9003 114.827 26.9003C116.696 26.9003 118.309 27.291 119.668 28.0724C121.027 28.8199 122.064 29.8561 122.777 31.1812V27.257H134.04V56H122.777V52.0759C122.064 53.4009 121.027 54.4541 119.668 55.2356C118.309 55.983 116.696 56.3567 114.827 56.3567C112.585 56.3567 110.563 55.7792 108.762 54.624C106.962 53.4349 105.535 51.7361 104.481 49.5277C103.462 47.2854 102.953 44.6523 102.953 41.6285ZM122.777 41.6285C122.777 40.0996 122.386 38.9105 121.605 38.0611C120.824 37.2118 119.821 36.7871 118.598 36.7871C117.375 36.7871 116.373 37.2118 115.591 38.0611C114.81 38.9105 114.419 40.0996 114.419 41.6285C114.419 43.1574 114.81 44.3465 115.591 45.1959C116.373 46.0453 117.375 46.47 118.598 46.47C119.821 46.47 120.824 46.0453 121.605 45.1959C122.386 44.3465 122.777 43.1574 122.777 41.6285ZM148.395 31.1812C149.109 29.8561 150.128 28.8199 151.453 28.0724C152.812 27.291 154.426 26.9003 156.295 26.9003C158.537 26.9003 160.559 27.4949 162.359 28.684C164.16 29.8391 165.57 31.5379 166.589 33.7803C167.642 35.9886 168.169 38.6047 168.169 41.6285C168.169 44.6523 167.642 47.2854 166.589 49.5277C165.57 51.7361 164.16 53.4349 162.359 54.624C160.559 55.7792 158.537 56.3567 156.295 56.3567C154.426 56.3567 152.812 55.983 151.453 55.2356C150.128 54.4541 149.109 53.4009 148.395 52.0759V56H137.082V18.2876H148.395V31.1812ZM156.702 41.6285C156.702 40.0996 156.312 38.9105 155.53 38.0611C154.749 37.2118 153.747 36.7871 152.523 36.7871C151.3 36.7871 150.298 37.2118 149.517 38.0611C148.735 38.9105 148.344 40.0996 148.344 41.6285C148.344 43.1574 148.735 44.3465 149.517 45.1959C150.298 46.0453 151.3 46.47 152.523 46.47C153.747 46.47 154.749 46.0453 155.53 45.1959C156.312 44.3465 156.702 43.1574 156.702 41.6285ZM182.474 56.3567C179.756 56.3567 177.343 55.9151 175.237 55.0317C173.164 54.1484 171.517 52.9253 170.293 51.3624C169.07 49.7995 168.374 48.0328 168.204 46.0623H179.059C179.195 46.9117 179.552 47.5402 180.129 47.9479C180.741 48.3556 181.505 48.5594 182.423 48.5594C183 48.5594 183.459 48.4405 183.799 48.2027C184.138 47.9309 184.308 47.6081 184.308 47.2344C184.308 46.5889 183.951 46.1302 183.238 45.8584C182.525 45.5866 181.318 45.2808 179.62 44.9411C177.547 44.5334 175.831 44.0917 174.472 43.6161C173.147 43.1404 171.975 42.325 170.956 41.1699C169.971 40.0147 169.478 38.4179 169.478 36.3794C169.478 34.6127 169.937 33.0158 170.854 31.5889C171.805 30.1279 173.198 28.9898 175.033 28.1744C176.868 27.325 179.093 26.9003 181.709 26.9003C185.582 26.9003 188.606 27.8516 190.78 29.7542C192.989 31.6568 194.314 34.137 194.756 37.1948H184.716C184.546 36.4133 184.189 35.8188 183.646 35.4111C183.102 34.9694 182.372 34.7486 181.454 34.7486C180.877 34.7486 180.435 34.8675 180.129 35.1053C179.823 35.3091 179.671 35.6319 179.671 36.0736C179.671 36.6512 180.027 37.0928 180.741 37.3986C181.454 37.6704 182.592 37.9592 184.155 38.265C186.228 38.6727 187.978 39.1313 189.404 39.641C190.831 40.1506 192.072 41.034 193.125 42.291C194.178 43.5141 194.705 45.2129 194.705 47.3873C194.705 49.0861 194.212 50.6149 193.227 51.9739C192.241 53.333 190.814 54.4032 188.946 55.1846C187.111 55.966 184.954 56.3567 182.474 56.3567Z" fill="#D7D6D7"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M231.153 13.6509V60.9734H209.312V13.6509H231.153Z" fill="#FF5851"/>
+</svg>
diff --git a/src/assets/main-logo-dark.svg b/src/assets/main-logo-dark.svg
new file mode 100644
index 0000000..461b3d7
--- /dev/null
+++ b/src/assets/main-logo-dark.svg
@@ -0,0 +1,3 @@
+<svg width="126" height="29" viewBox="0 0 126 29" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.664 28.76V7.256H6.2V9.4C6.62667 8.632 7.27733 8.024 8.152 7.576C9.02667 7.128 9.98667 6.904 11.032 6.904C12.376 6.904 13.56 7.23467 14.584 7.896C15.6293 8.55733 16.44 9.50667 17.016 10.744C17.6133 11.96 17.912 13.4213 17.912 15.128C17.912 16.8133 17.624 18.2747 17.048 19.512C16.472 20.7493 15.6613 21.6987 14.616 22.36C13.592 23.0213 12.3973 23.352 11.032 23.352C10.0507 23.352 9.13333 23.1493 8.28 22.744C7.448 22.3387 6.808 21.7947 6.36 21.112V28.76H0.664ZM9.24 19.16C10.0933 19.16 10.7973 18.84 11.352 18.2C11.9067 17.56 12.184 16.536 12.184 15.128C12.184 13.6987 11.9067 12.6747 11.352 12.056C10.7973 11.416 10.0933 11.096 9.24 11.096C8.36533 11.096 7.65067 11.416 7.096 12.056C6.54133 12.6747 6.264 13.6987 6.264 15.128C6.264 16.536 6.54133 17.56 7.096 18.2C7.65067 18.84 8.36533 19.16 9.24 19.16ZM26.7158 23.352C24.5398 23.352 22.9611 22.808 21.9798 21.72C20.9984 20.6107 20.5078 18.9467 20.5078 16.728V0.439999H26.2038V16.536C26.2038 18.0293 26.8864 18.776 28.2517 18.776C28.4651 18.776 28.6784 18.7653 28.8918 18.744C29.1264 18.7227 29.3504 18.6907 29.5638 18.648L29.4998 23C28.6464 23.2347 27.7184 23.352 26.7158 23.352ZM37.1048 23.352C35.8888 23.352 34.8114 23.128 33.8728 22.68C32.9554 22.232 32.2301 21.624 31.6968 20.856C31.1848 20.0667 30.9288 19.1707 30.9288 18.168C30.9288 17.0373 31.2274 16.1413 31.8248 15.48C32.4221 14.7973 33.3821 14.3173 34.7048 14.04C36.0274 13.7413 37.7874 13.592 39.9848 13.592H41.2008V13.144C41.2008 12.376 40.9981 11.832 40.5928 11.512C40.2088 11.192 39.5368 11.032 38.5768 11.032C37.7661 11.032 36.8701 11.16 35.8888 11.416C34.9074 11.672 33.9474 12.0667 33.0088 12.6L31.5688 8.856C32.1021 8.472 32.7848 8.13067 33.6168 7.832C34.4488 7.53333 35.3234 7.30933 36.2408 7.16C37.1581 6.98933 38.0221 6.904 38.8328 6.904C41.4568 6.904 43.3981 7.46933 44.6568 8.6C45.9368 9.73067 46.5768 11.512 46.5768 13.944V23H41.2648V20.76C40.9874 21.5707 40.4861 22.2107 39.7608 22.68C39.0354 23.128 38.1501 23.352 37.1048 23.352ZM38.3848 19.64C39.1741 19.64 39.8354 19.384 40.3688 18.872C40.9234 18.36 41.2008 17.688 41.2008 16.856V16.28H39.9848C38.7261 16.28 37.7981 16.4187 37.2008 16.696C36.6248 16.952 36.3368 17.368 36.3368 17.944C36.3368 18.4347 36.5074 18.84 36.8488 19.16C37.2114 19.48 37.7234 19.64 38.3848 19.64ZM50.624 28.76L53.792 21.912L47.36 7.256H53.344L56.8 16.184L60.384 7.256H66.016L56.384 28.76H50.624ZM78.7525 23.352C76.2565 23.352 74.1125 22.872 72.3205 21.912C70.5285 20.952 69.1525 19.5973 68.1925 17.848C67.2538 16.0987 66.7845 14.0507 66.7845 11.704C66.7845 9.35733 67.2538 7.32 68.1925 5.592C69.1525 3.84267 70.5285 2.488 72.3205 1.528C74.1125 0.568 76.2565 0.0879993 78.7525 0.0879993C80.2458 0.0879993 81.6858 0.322666 83.0725 0.792C84.4592 1.24 85.5792 1.83733 86.4325 2.584L84.6725 7.224C83.7338 6.54133 82.7952 6.04 81.8565 5.72C80.9178 5.37867 79.9578 5.208 78.9765 5.208C76.9925 5.208 75.4992 5.77333 74.4965 6.904C73.4938 8.01333 72.9925 9.61333 72.9925 11.704C72.9925 13.816 73.4938 15.4373 74.4965 16.568C75.4992 17.6773 76.9925 18.232 78.9765 18.232C79.9578 18.232 80.9178 18.072 81.8565 17.752C82.7952 17.4107 83.7338 16.8987 84.6725 16.216L86.4325 20.856C85.5792 21.6027 84.4592 22.2107 83.0725 22.68C81.6858 23.128 80.2458 23.352 78.7525 23.352ZM94.3288 23V5.24H87.1608V0.439999H107.385V5.24H100.217V23H94.3288ZM109.611 23V0.439999H125.355V4.984H115.499V9.528H124.651V14.04H115.499V23H109.611Z" fill="#D7D6D7"/>
+</svg>
diff --git a/src/assets/sdslabs-logo-dark.svg b/src/assets/sdslabs-logo-dark.svg
new file mode 100644
index 0000000..bc98fb6
--- /dev/null
+++ b/src/assets/sdslabs-logo-dark.svg
@@ -0,0 +1,4 @@
+<svg width="95" height="31" viewBox="0 0 95 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.76527 11.6341C7.39023 11.6341 8.68314 12.0392 9.644 12.8493C10.619 13.645 11.2336 14.701 11.488 16.0175H7.10057C6.91689 15.3231 6.43644 14.9759 5.6593 14.9759C5.22128 14.9759 5.00225 15.1495 5.00225 15.4967C5.00225 15.7426 5.15769 15.9307 5.46854 16.0609C5.79355 16.1911 6.30223 16.3285 6.9946 16.4732C7.89891 16.6468 8.66902 16.8566 9.30488 17.1025C9.95485 17.334 10.513 17.7173 10.9793 18.2526C11.4456 18.7879 11.6787 19.5184 11.6787 20.4443C11.6787 21.1676 11.4809 21.8114 11.0853 22.3756C10.6896 22.9398 10.1103 23.381 9.34727 23.6993C8.58424 24.0175 7.68696 24.1767 6.65547 24.1767C4.93158 24.1767 3.56097 23.8005 2.5436 23.0483C1.52623 22.296 0.89744 21.211 0.657227 19.7933H5.17181C5.25659 20.5022 5.74408 20.8566 6.63428 20.8566C7.11469 20.8566 7.35492 20.683 7.35492 20.3358C7.35492 20.0609 7.19243 19.8584 6.86743 19.7282C6.54242 19.598 6.01962 19.4678 5.29898 19.3376C4.38051 19.1495 3.61749 18.947 3.0099 18.73C2.41643 18.513 1.89362 18.1441 1.44145 17.6233C0.989284 17.1025 0.763203 16.3864 0.763203 15.475C0.763203 14.7372 0.95396 14.079 1.33547 13.5003C1.71699 12.9216 2.28219 12.4659 3.03109 12.1332C3.77999 11.8005 4.6914 11.6341 5.76527 11.6341ZM16.7889 11.6341C17.5661 11.6341 18.2302 11.8005 18.7813 12.1332C19.3465 12.4515 19.7775 12.8927 20.0742 13.4569V7.9668H24.7795V24.0248H20.0742V22.3539C19.7775 22.9181 19.3465 23.3665 18.7813 23.6993C18.2302 24.0175 17.5661 24.1767 16.7889 24.1767C15.8564 24.1767 15.0156 23.9308 14.2667 23.4389C13.5178 22.9326 12.9243 22.2092 12.4863 21.2689C12.0624 20.3141 11.8505 19.1929 11.8505 17.9054C11.8505 16.6179 12.0624 15.5039 12.4863 14.5636C12.9243 13.6088 13.5178 12.8855 14.2667 12.3936C15.0156 11.8873 15.8564 11.6341 16.7889 11.6341ZM18.3574 15.8439C17.8487 15.8439 17.4319 16.0247 17.1069 16.3864C16.7819 16.748 16.6194 17.2544 16.6194 17.9054C16.6194 18.5564 16.7819 19.0627 17.1069 19.4244C17.4319 19.786 17.8487 19.9669 18.3574 19.9669C18.8661 19.9669 19.2829 19.786 19.6079 19.4244C19.9329 19.0627 20.0954 18.5564 20.0954 17.9054C20.0954 17.2544 19.9329 16.748 19.6079 16.3864C19.2829 16.0247 18.8661 15.8439 18.3574 15.8439ZM30.75 11.6341C32.3749 11.6341 33.6678 12.0392 34.6287 12.8493C35.6037 13.645 36.2183 14.701 36.4727 16.0175H32.0853C31.9016 15.3231 31.4211 14.9759 30.644 14.9759C30.206 14.9759 29.9869 15.1495 29.9869 15.4967C29.9869 15.7426 30.1424 15.9307 30.4532 16.0609C30.7782 16.1911 31.2869 16.3285 31.9793 16.4732C32.8836 16.6468 33.6537 16.8566 34.2896 17.1025C34.9395 17.334 35.4977 17.7173 35.964 18.2526C36.4303 18.7879 36.6634 19.5184 36.6634 20.4443C36.6634 21.1676 36.4656 21.8114 36.07 22.3756C35.6743 22.9398 35.095 23.381 34.332 23.6993C33.5689 24.0175 32.6717 24.1767 31.6402 24.1767C29.9163 24.1767 28.5457 23.8005 27.5283 23.0483C26.5109 22.296 25.8821 21.211 25.6419 19.7933H30.1565C30.2413 20.5022 30.7288 20.8566 31.619 20.8566C32.0994 20.8566 32.3396 20.683 32.3396 20.3358C32.3396 20.0609 32.1771 19.8584 31.8521 19.7282C31.5271 19.598 31.0043 19.4678 30.2837 19.3376C29.3652 19.1495 28.6022 18.947 27.9946 18.73C27.4011 18.513 26.8783 18.1441 26.4261 17.6233C25.974 17.1025 25.7479 16.3864 25.7479 15.475C25.7479 14.7372 25.9387 14.079 26.3202 13.5003C26.7017 12.9216 27.2669 12.4659 28.0158 12.1332C28.7647 11.8005 29.6761 11.6341 30.75 11.6341ZM42.1764 7.9668V24.0248H37.471V7.9668H42.1764ZM47.7564 11.6341C48.5334 11.6341 49.2045 11.8005 49.77 12.1332C50.335 12.4515 50.7661 12.8927 51.0629 13.4569V11.786H55.747V24.0248H51.0629V22.3539C50.7661 22.9181 50.335 23.3665 49.77 23.6993C49.2045 24.0175 48.5334 24.1767 47.7564 24.1767C46.8238 24.1767 45.9828 23.9308 45.2342 23.4389C44.4852 22.9326 43.8917 22.2092 43.4538 21.2689C43.0299 20.3141 42.8179 19.1929 42.8179 17.9054C42.8179 16.6179 43.0299 15.5039 43.4538 14.5636C43.8917 13.6088 44.4852 12.8855 45.2342 12.3936C45.9828 11.8873 46.8238 11.6341 47.7564 11.6341ZM49.3249 15.8439C48.8162 15.8439 48.3991 16.0247 48.0743 16.3864C47.7492 16.748 47.5868 17.2544 47.5868 17.9054C47.5868 18.5564 47.7492 19.0627 48.0743 19.4244C48.3991 19.786 48.8162 19.9669 49.3249 19.9669C49.8335 19.9669 50.2503 19.786 50.5754 19.4244C50.9001 19.0627 51.0629 18.5564 51.0629 17.9054C51.0629 17.2544 50.9001 16.748 50.5754 16.3864C50.2503 16.0247 49.8335 15.8439 49.3249 15.8439ZM65.0025 11.6341C65.9351 11.6341 66.7761 11.8873 67.5247 12.3936C68.2738 12.8855 68.86 13.6088 69.2839 14.5636C69.7222 15.5039 69.941 16.6179 69.941 17.9054C69.941 19.1929 69.7222 20.3141 69.2839 21.2689C68.86 22.2092 68.2738 22.9326 67.5247 23.4389C66.7761 23.9308 65.9351 24.1767 65.0025 24.1767C64.2255 24.1767 63.5544 24.0175 62.989 23.6993C62.4379 23.3665 62.014 22.9181 61.7172 22.3539V24.0248H57.0119V7.9668H61.7172V13.4569C62.014 12.8927 62.4379 12.4515 62.989 12.1332C63.5544 11.8005 64.2255 11.6341 65.0025 11.6341ZM63.4341 15.8439C62.9254 15.8439 62.5087 16.0247 62.1835 16.3864C61.8588 16.748 61.6961 17.2544 61.6961 17.9054C61.6961 18.5564 61.8588 19.0627 62.1835 19.4244C62.5087 19.786 62.9254 19.9669 63.4341 19.9669C63.9427 19.9669 64.3598 19.786 64.6846 19.4244C65.0097 19.0627 65.1721 18.5564 65.1721 17.9054C65.1721 17.2544 65.0097 16.748 64.6846 16.3864C64.3598 16.0247 63.9427 15.8439 63.4341 15.8439ZM75.2758 11.6341C76.9006 11.6341 78.1935 12.0392 79.1545 12.8493C80.1295 13.645 80.7441 14.701 80.9985 16.0175H76.6111C76.4271 15.3231 75.9468 14.9759 75.1698 14.9759C74.7315 14.9759 74.5127 15.1495 74.5127 15.4967C74.5127 15.7426 74.6679 15.9307 74.979 16.0609C75.3038 16.1911 75.8124 16.3285 76.5051 16.4732C77.4093 16.6468 78.1795 16.8566 78.8154 17.1025C79.4652 17.334 80.0235 17.7173 80.4898 18.2526C80.9561 18.7879 81.1892 19.5184 81.1892 20.4443C81.1892 21.1676 80.9913 21.8114 80.5958 22.3756C80.1999 22.9398 79.6208 23.381 78.8577 23.6993C78.0947 24.0175 77.1973 24.1767 76.166 24.1767C74.4419 24.1767 73.0714 23.8005 72.0541 23.0483C71.0367 22.296 70.4077 21.211 70.1677 19.7933H74.6823C74.7671 20.5022 75.2546 20.8566 76.1448 20.8566C76.6251 20.8566 76.8654 20.683 76.8654 20.3358C76.8654 20.0609 76.7026 19.8584 76.3779 19.7282C76.0528 19.598 75.5301 19.4678 74.8095 19.3376C73.8909 19.1495 73.1278 18.947 72.5204 18.73C71.9269 18.513 71.4038 18.1441 70.9519 17.6233C70.4996 17.1025 70.2737 16.3864 70.2737 15.475C70.2737 14.7372 70.4644 14.079 70.846 13.5003C71.2275 12.9216 71.7925 12.4659 72.5416 12.1332C73.2902 11.8005 74.2016 11.6341 75.2758 11.6341Z" fill="#D7D6D7"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M95 5.8125V25.9625H87.0518V5.8125H95Z" fill="#FF5851"/>
+</svg>
diff --git a/src/assets/sdslabs-logo-dark.svg:Zone.Identifier b/src/assets/sdslabs-logo-dark.svg:Zone.Identifier
new file mode 100644
index 0000000..a857cc9
--- /dev/null
+++ b/src/assets/sdslabs-logo-dark.svg:Zone.Identifier
@@ -0,0 +1,3 @@
+[ZoneTransfer]
+ZoneId=3
+HostUrl=https://files.slack.com/files-pri/T025QJXB7-F04E1278NNA/download/labs.svg?origin_team=T025QJXB7
diff --git a/src/components/Footer.vue b/src/components/Footer.vue
index 9856d18..11bf695 100644
--- a/src/components/Footer.vue
+++ b/src/components/Footer.vue
@@ -10,7 +10,10 @@
</div>
</div>
<div class="adminFooterLogos">
- <a href="https://sdslabs.co"><img :src="sdslabsLogo"/></a>
+ <a href="https://sdslabs.co">
+ <img v-if="this.isDarkTheme == 'true'" :src="sdslabsLogoDark" />
+ <img v-else :src="sdslabsLogo" />
+ </a>
<div class="adminFooterContactInfo">
<a href="https://www.facebook.com/SDSLabs"><img :src="fbLogo"/></a>
<a href="https://twitter.com/sdslabs"><img :src="twitterLogo"/></a>
@@ -23,15 +26,20 @@
<script>
import {
sdslabsLogo,
+ sdslabsLogoDark,
twitterLogo,
githubLogo,
fbLogo
} from "../constants/images";
+import variables from "../styles/main.scss";
+console.log(variables.isDarkTheme);
export default {
name: "Footer",
data() {
return {
+ isDarkTheme: variables.isDarkTheme,
sdslabsLogo,
+ sdslabsLogoDark,
twitterLogo,
githubLogo,
fbLogo
diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index d3262c1..4ba6eb9 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -2,9 +2,8 @@
<div class="navbar">
<div class="user-navbar-container" v-if="loggedIn()">
<router-link to="/about" class="navbar-link ctfLogo"
- ><div class="logo">
- <img v-if="this.getLogoUrl()" :src="this.getLogoUrl()" /></div
- ></router-link>
+ ><div class="logo adminFooterTitle">playCTF</div>
+ </router-link>
<nav class="navbar-container">
<div class="link-container">
<router-link
diff --git a/src/constants/images.js b/src/constants/images.js
index d8872e6..b55b697 100644
--- a/src/constants/images.js
+++ b/src/constants/images.js
@@ -1,8 +1,11 @@
+import variables from "../styles/main.scss";
+
function getImage(imagename) {
return require(`../assets/${imagename}.svg`);
}
export const sdslabsLogo = getImage("sdslabs-logo");
+export const sdslabsLogoDark = getImage("sdslabs-logo-dark");
export const fbLogo = getImage("fb-logo");
export const twitterLogo = getImage("twitter-logo");
export const githubLogo = getImage("github-logo");
diff --git a/src/layouts/Auth.vue b/src/layouts/Auth.vue
index 008fbeb..c7a21d8 100644
--- a/src/layouts/Auth.vue
+++ b/src/layouts/Auth.vue
@@ -2,10 +2,9 @@
<div id="auth-layout">
<div class="navbar">
<nav v-if="pathLogin()" class="navbar-container">
- <router-link to="/" class="navbar-link"
- ><div class="logo">
- <img v-if="this.getLogoUrl()" :src="this.getLogoUrl()" /></div
- ></router-link>
+ <router-link to="/" class="navbar-link">
+ <div class="logo adminFooterTitle">playCTF</div>
+ </router-link>
<div class="navbar-registration">
<p class="navbar-already-registered">New here?</p>
<router-link to="/register" class="login-link">REGISTER</router-link>
@@ -13,9 +12,8 @@
</nav>
<nav v-else class="navbar-container">
<router-link to="/" class="navbar-link">
- <div class="logo">
- <img v-if="this.getLogoUrl()" :src="this.getLogoUrl()" /></div
- ></router-link>
+ <div class="logo adminFooterTitle">playCTF</div>
+ </router-link>
<div class="navbar-registration">
<p class="navbar-already-registered">Already Registered?</p>
<router-link to="/login" class="login-link">LOG IN</router-link>
diff --git a/src/styles/modules/_adminNotifications.scss b/src/styles/modules/_adminNotifications.scss
index 494c75d..98f1f94 100644
--- a/src/styles/modules/_adminNotifications.scss
+++ b/src/styles/modules/_adminNotifications.scss
@@ -54,7 +54,7 @@
@extend %font-style-basic;
margin-bottom: 1rem;
width: 100%;
- color: $theme-color-black19;
+ color: $theme-color-black57;
}
.adminFormTitle::placeholder,
@@ -68,6 +68,7 @@
height: 6rem;
border-radius: 0.3125rem;
border: 1px solid $theme-color-grey-high-transp;
+ color: $theme-color-black57;
@extend %font-style-basic;
padding-left: 1rem;
padding-top: 1rem;
diff --git a/src/styles/modules/_statsNavbar.scss b/src/styles/modules/_statsNavbar.scss
index 91b0219..658a0dc 100644
--- a/src/styles/modules/_statsNavbar.scss
+++ b/src/styles/modules/_statsNavbar.scss
@@ -15,7 +15,7 @@
min-height: 100%;
background: $theme-color-light-orange;
border-radius: 0.3125rem 0rem 0rem 0.3125rem;
- color: $theme-color-white !important;
+ color: #FFFFFF !important;
text-align: center;
display: flex;
flex-flow: column wrap;
diff --git a/src/styles/partials/_variables.scss b/src/styles/partials/_variables.scss
index 614b99d..453331e 100644
--- a/src/styles/partials/_variables.scss
+++ b/src/styles/partials/_variables.scss
@@ -16,6 +16,7 @@ $theme-color-offwhite: #f2f2f2;
$theme-color-dark-white: #e7e7e7;
$theme-color-black: #000000;
$theme-color-black19: #191919;
+$theme-color-black57: #575757;
$theme-color-blue: #2f53b1;
$theme-color-orange: #ffc568;
$theme-color-dark-orange: #ff6700;
@@ -53,11 +54,12 @@ $theme-color-dark-blue-high-transp: rgba(76, 128, 165, 0.75);
@if $dark-theme {
- $theme-color-white: #000000;
+ $theme-color-white: #121212;
$theme-color-offwhite: #120f0f;
$theme-color-dark-white: #0c0b0e;
$theme-color-black: #fcfcfe;
$theme-color-black19: #d7d6d7;
+ $theme-color-black57: #747474;
$theme-color-blue: #355dc5;
$theme-color-orange: #ff9458;
$theme-color-dark-orange: #e44f26;
@@ -70,21 +72,22 @@ $theme-color-dark-blue-high-transp: rgba(76, 128, 165, 0.75);
$theme-color-off-white: #dddddd;
$theme-color-light-grey-d7: #3d3d3d;
$theme-color-white-grey: #909090;
+ $theme-color-grey-blue: #5d8397;
$theme-color-dark-blue: #2e9cca;
$theme-color-light-blue: #808cad;
$theme-color-red: #aa3126;
- $theme-color-violet: #411396;
+ $theme-color-violet: #9744be;
$theme-color-white-low-transp: rgba(0,0,0,0.05);
$theme-color-black-low-transp: rgba(41, 40, 40, 0.5);
- $theme-color-black-med-transp: rgba(57, 57, 57, 0.57);
- $theme-color-black-high-transp: rgba(44, 43, 42, 0.8);
+ $theme-color-black-med-transp: rgba(153, 153, 153, 1);
+ $theme-color-black-high-transp: rgba(255, 255, 255, 0.38);
$theme-color-green-high-transp: rgba(7, 60, 23, 1);
$theme-color-yellow-high-transp: rgba(88, 75, 6, 1);
$theme-color-red-high-transp: rgba(87, 18, 17, 1);
$theme-color-dark-red-med-transp: rgba(255, 103, 0, 0.3);
$theme-color-grey-low-transp: rgba(87, 87, 87, 0.07);
$theme-color-grey-med-transp: rgba(87, 87, 87, 0.2);
- $theme-color-grey-high-transp: rgba(87, 87, 87, 0.35);
+ $theme-color-grey-high-transp: rgba(118, 118, 118, 0.799);
$theme-color-blue-low-transp: rgba(37, 85, 124, 0.2);
$theme-color-light-black-low-transp: rgba(221, 221, 221, 0.1);
$theme-color-light-black-med-transp: rgba(138, 138, 138, 0.57);
@@ -94,7 +97,6 @@ $theme-color-dark-blue-high-transp: rgba(76, 128, 165, 0.75);
}
-
$primary-font-color: $theme-color-black;
$primary-theme-color: $theme-color-blue;
$secondary-theme-color: $theme-color-orange;
@@ -116,6 +118,7 @@ $assets-dashboard-copy-text-eye: $assets-prefix + "dashboard-card-copy-text-eye.
$assets-header-back-button: $assets-prefix + "header-back-button.svg";
$assets-home-project-database-icon: $assets-prefix + "home-project-database-icon.svg";
$assets-new-instance-multiple-add-icon: $assets-prefix + "new-instance-multiple-add.svg";
+$assets-sdslabs-logo: "main-logo";
%font-style-basic {
font-family: $primary-font-family;
@@ -141,4 +144,5 @@ $assets-new-instance-multiple-add-icon: $assets-prefix + "new-instance-multiple-
themeColorViolet: $theme-color-violet;
themeColorGreyLowTransp: $theme-color-grey-low-transp;
themeColorGreyHighTransp: $theme-color-grey-high-transp;
+ isDarkTheme: $dark-theme;
}
From ab868b28b66a81751abc4e25edaa2b69702064d8 Mon Sep 17 00:00:00 2001
From: reeshi-18 <reeshipaul35@gmail.com>
Date: Wed, 14 Dec 2022 20:45:58 +0530
Subject: [PATCH 4/4] minor changes
---
src/components/adminConfigs/configContent.vue | 5 +++--
src/styles/modules/_adminConfigure.scss | 1 +
src/styles/modules/_adminLanding.scss | 2 +-
src/styles/modules/_landing.scss | 1 +
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/components/adminConfigs/configContent.vue b/src/components/adminConfigs/configContent.vue
index 4c64f25..00e8d8d 100644
--- a/src/components/adminConfigs/configContent.vue
+++ b/src/components/adminConfigs/configContent.vue
@@ -53,8 +53,8 @@ export default {
data() {
return {
content: this.compContent,
- maxAbout: 200,
- maxPrizes: 200,
+ maxAbout: 500,
+ maxPrizes: 500,
showPrizeCounter: false,
showAboutCounter: false
};
@@ -74,6 +74,7 @@ export default {
);
newCompInfoContent.about = this.content.about;
}
+ this.content.prizes = this.content.prizes.replace("\\n", "\n");
if (this.content.prizes.length > this.maxPrizes) {
this.content.prizes = this.content.prizes.substring(
0,
diff --git a/src/styles/modules/_adminConfigure.scss b/src/styles/modules/_adminConfigure.scss
index 45b240a..520203e 100644
--- a/src/styles/modules/_adminConfigure.scss
+++ b/src/styles/modules/_adminConfigure.scss
@@ -154,6 +154,7 @@
border: 1px solid rgba(87, 87, 87, 0.7);
border-radius: 2px;
background-color: $theme-color-white;
+ color: $theme-color-black19;
padding-left: 1rem;
height: 2rem;
outline: none;
diff --git a/src/styles/modules/_adminLanding.scss b/src/styles/modules/_adminLanding.scss
index 66be370..c47d707 100644
--- a/src/styles/modules/_adminLanding.scss
+++ b/src/styles/modules/_adminLanding.scss
@@ -29,7 +29,7 @@
.configSubheading {
@extend %font-style-basic;
line-height: 1.5rem;
- color: $theme-color-grey;
+ color: #a5a5a5;
}
}
diff --git a/src/styles/modules/_landing.scss b/src/styles/modules/_landing.scss
index 7883175..8c709a2 100644
--- a/src/styles/modules/_landing.scss
+++ b/src/styles/modules/_landing.scss
@@ -49,6 +49,7 @@
display: flex;
flex-direction: row-reverse;
justify-content: space-between;
+ white-space: pre-wrap;
.prize-info-text {
width: 60%;