Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#364 Dark Mode #366

Merged
merged 32 commits into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
9ed8eeb
implemented a Dark Mode for Diveni
SponsoredByPuma Jul 24, 2023
114eb22
styled the navBar and also the session page a bit
Jul 24, 2023
989c00c
update the link color
SponsoredByPuma Jul 25, 2023
ca2584a
styled everything now, works as intended + added Pictures in Landing …
SponsoredByPuma Jul 26, 2023
b244688
redesign of the prepare page
Aug 1, 2023
9e488f9
prepare Page now changes pictures depending on theme
SponsoredByPuma Aug 2, 2023
d8f7f5e
changed colour of button hover
SponsoredByPuma Aug 2, 2023
a27dcfc
added the blurred background
SponsoredByPuma Aug 2, 2023
21a3547
Merge branch 'main' into 364-dark-mode
SponsoredByPuma Aug 2, 2023
e2cee4a
styled the join page according to wireframe
SponsoredByPuma Aug 3, 2023
04d4247
updated session page, Member Vote page, add some css variables
SponsoredByPuma Aug 3, 2023
941a789
fixed not responsive Background
SponsoredByPuma Aug 4, 2023
d106c4b
add shadow + rounded the pictures
SponsoredByPuma Aug 4, 2023
ec3caa3
styled Session Page
SponsoredByPuma Aug 4, 2023
6fe7bac
styled MemberVotePage, improved the Timer + Option Buttons on Session…
SponsoredByPuma Aug 4, 2023
73b20ee
Update App.vue
SponsoredByPuma Aug 7, 2023
90d90d8
website now looks fine on smaller devices
Aug 7, 2023
c4a661f
Merge branch '364-dark-mode' of https://github.com/Sybit-Education/Di…
Aug 7, 2023
795dbbd
add some button styling
Aug 7, 2023
449a83a
improved Code Quality
Aug 8, 2023
0653868
reverted animation
SponsoredByPuma Aug 9, 2023
67bd4a6
add focus to search bar
SponsoredByPuma Aug 9, 2023
e5d0156
removed some icons and replaced them with bootstrap icons. improved m…
SponsoredByPuma Aug 17, 2023
c87ed04
Merge branch 'main' into 364-dark-mode
SponsoredByPuma Aug 17, 2023
a90e79a
fixed overflow of buttontext
SponsoredByPuma Aug 17, 2023
ee081d5
Merge branch 'main' into 364-dark-mode
SponsoredByPuma Aug 23, 2023
07d4193
Merge branch 'main' into 364-dark-mode
SponsoredByPuma Aug 24, 2023
c14b0ce
made the font color inside the markdown editor also a var
SponsoredByPuma Sep 20, 2023
4c9628c
replaced all style attribute with classes and id's
SponsoredByPuma Sep 28, 2023
69e9f30
created ThemeToggleComponent.vue
SponsoredByPuma Sep 28, 2023
7e5f31b
add function for adding css class to card sets
SponsoredByPuma Oct 6, 2023
d1582f8
moved scrollbar changes to app and add styling to firefox
SponsoredByPuma Oct 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
192 changes: 192 additions & 0 deletions frontend/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,199 @@
});
</script>
<style>
@import "./assets/variables.css";
main {
min-height: calc(100vh - 10rem);
background:
/* Top */

Check warning on line 35 in frontend/src/App.vue

View workflow job for this annotation

GitHub Actions / Build

Replace `⏎··radial-gradient(farthest-corner·at·500px·500px,·var(--blurredColour1)·0.1%,·rgba(255,·255,·255,·0)·26%` with `·radial-gradient(⏎······farthest-corner·at·500px·500px,⏎······var(--blurredColour1)·0.1%,⏎······rgba(255,·255,·255,·0)·26%⏎····`
radial-gradient(farthest-corner at 500px 500px, var(--blurredColour1) 0.1%, rgba(255, 255, 255, 0) 26%),
radial-gradient(farthest-corner at 500px 500px, var(--blurredColour1) 0.1%, rgba(255, 255, 255, 0) 26%),

Check warning on line 37 in frontend/src/App.vue

View workflow job for this annotation

GitHub Actions / Build

Replace `··radial-gradient(farthest-corner·at·500px·500px,·var(--blurredColour1)·0.1%,·rgba(255,·255,·255,·0)·26%` with `····radial-gradient(⏎······farthest-corner·at·500px·500px,⏎······var(--blurredColour1)·0.1%,⏎······rgba(255,·255,·255,·0)·26%⏎····`
radial-gradient(farthest-corner at 7% 7%, var(--blurredColour2) 0.1%, rgba(255, 255, 255, 0) 8%),

Check warning on line 38 in frontend/src/App.vue

View workflow job for this annotation

GitHub Actions / Build

Insert `··`
radial-gradient(farthest-corner at 17% 40px, var(--blurredColour3) 1%, rgba(255, 255, 255, 0) 16%),

Check warning on line 39 in frontend/src/App.vue

View workflow job for this annotation

GitHub Actions / Build

Replace `radial-gradient(farthest-corner·at·17%·40px,··var(--blurredColour3)·1%,·rgba(255,·255,·255,·0)·16%` with `··radial-gradient(⏎······farthest-corner·at·17%·40px,⏎······var(--blurredColour3)·1%,⏎······rgba(255,·255,·255,·0)·16%⏎····`
radial-gradient(farthest-corner at 17% 40px, var(--blurredColour3) 1%, rgba(255, 255, 255, 0) 16%),

Check warning on line 40 in frontend/src/App.vue

View workflow job for this annotation

GitHub Actions / Build

Replace `··radial-gradient(farthest-corner·at·17%·40px,··var(--blurredColour3)·1%,·rgba(255,·255,·255,·0)·16%` with `····radial-gradient(⏎······farthest-corner·at·17%·40px,⏎······var(--blurredColour3)·1%,⏎······rgba(255,·255,·255,·0)·16%⏎····`
radial-gradient(farthest-corner at 36% 7%, var(--blurredColour4) 0.1%, rgba(255, 255, 255, 0) 18%),

Check warning on line 41 in frontend/src/App.vue

View workflow job for this annotation

GitHub Actions / Build

Replace `··radial-gradient(farthest-corner·at·36%·7%,·var(--blurredColour4)·0.1%,·rgba(255,·255,·255,·0)·18%` with `····radial-gradient(⏎······farthest-corner·at·36%·7%,⏎······var(--blurredColour4)·0.1%,⏎······rgba(255,·255,·255,·0)·18%⏎····`
radial-gradient(farthest-corner at 36% 7%, var(--blurredColour4) 0.1%, rgba(255, 255, 255, 0) 18%),

Check warning on line 42 in frontend/src/App.vue

View workflow job for this annotation

GitHub Actions / Build

Replace `··radial-gradient(farthest-corner·at·36%·7%,·var(--blurredColour4)·0.1%,·rgba(255,·255,·255,·0)·18%` with `····radial-gradient(⏎······farthest-corner·at·36%·7%,⏎······var(--blurredColour4)·0.1%,⏎······rgba(255,·255,·255,·0)·18%⏎····`

Check warning on line 43 in frontend/src/App.vue

View workflow job for this annotation

GitHub Actions / Build

Delete `⏎`
/* Bottom */
radial-gradient(farthest-corner at 95% 42%, var(--blurredColour5) 0.1%, rgba(255, 255, 255, 0) 26%),

Check warning on line 45 in frontend/src/App.vue

View workflow job for this annotation

GitHub Actions / Build

Replace `radial-gradient(farthest-corner·at·95%·42%,·var(--blurredColour5)·0.1%,·rgba(255,·255,·255,·0)·26%` with `····radial-gradient(⏎········farthest-corner·at·95%·42%,⏎········var(--blurredColour5)·0.1%,⏎········rgba(255,·255,·255,·0)·26%⏎······`
radial-gradient(farthest-corner at 0% 58%, var(--blurredColour5) 0.1%, rgba(255, 255, 255, 0) 22%),

Check warning on line 46 in frontend/src/App.vue

View workflow job for this annotation

GitHub Actions / Build

Replace `··radial-gradient(farthest-corner·at·0%·58%,·var(--blurredColour5)·0.1%,·rgba(255,·255,·255,·0)·22%` with `····radial-gradient(⏎······farthest-corner·at·0%·58%,⏎······var(--blurredColour5)·0.1%,⏎······rgba(255,·255,·255,·0)·22%⏎····`
radial-gradient(circle farthest-corner at 65% 95%, var(--blurredColour3) 0.1%, rgba(255, 255, 255, 0) 13%),
radial-gradient( farthest-corner at 100% 87%, var(--blurredColour3) 0.1%, rgba(255, 255, 255, 0) 13%),
radial-gradient( farthest-corner at 84% 82%, var(--blurredColour4) 0.1%, rgba(255, 255, 255, 0) 13%),
radial-gradient(circle farthest-corner at 84% 82%, var(--blurredColour6) 0.1%, rgba(255, 255, 255, 0) 13%);
background-color: var(--background-color-primary);
backdrop-filter: blur(5px);
color: var(--text-primary-color) !important;
}

p {
color: var(--text-primary-color);
}

h1 {
color: var(--text-primary-color);
}

h4 {
color: var(--text-primary-color);
}
/* Landing Page */
.newSessionCard .landingPageCardButton{
background-color: var(--startButton);
border-radius: var(--buttonShape);
color: var(--text-primary-color);
}

.newSessionCard .landingPageCardButton:hover{
background-color: var(--startButtonHovered);
color: var(--text-primary-color);
}

.newSessionCard .landingPageCardButton:focus{
background-color: var(--startButtonHovered) !important;
}

.newSessionCard .card-footer {
background-color: #52173100; /* So the Footer does not overflow */
}

.joinSessionCard .landingPageCardButton{
background-color: var(--joinButton);
border-radius: var(--buttonShape);
color: var(--text-primary-color);
}

.joinSessionCard .landingPageCardButton:hover{
background-color: var(--joinButtonHovered);
color: var(--text-primary-color);
}

.joinSessionCard .card-footer {
background-color: #52173100; /* So the Footer does not overflow */
}

.reconnectSessionCard .landingPageCardButton {
background-color: var(--reconnectButton);
border-radius: var(--buttonShape);
color: var(--text-primary-color);
}

.reconnectSessionCard .landingPageCardButton:hover {
background-color: var(--reconnectButtonHovered);
color: var(--text-primary-color);
}

.reconnectSessionCard .landingPageCardButton:focus {
background-color: var(--reconnectButtonHovered) !important;
}

.reconnectSessionCard .card-footer {
background-color: #52173100; /* So the Footer does not overflow */
}
/* Prepare Page */
.selectedTab {
background-color: var(--preparePageMainColor) !important;
}

.selectedTextColor {
color: var(--text-primary-color) !important;
}

.notSelectedTab {
background-color: var(--preparePageInActiveTab) !important;
border-color: var(--preparePageBorderTab) !important;
}

.notSelectedTab:hover {
background-color: var(--preparePageInActiveTabHover) !important;
}

.notSelectedTextColor {
color: var(--text-primary-color) !important;
}

/*End of prepare Page */

.dropDownLink {
color: var(--text-primary-color) !important;
}
.containerClass {
background-color: var(--landingPageCardsBackground) !important;
color: var(--text-primary-color) !important;
}

.dropdown-item {
color: var(--text-primary-color) !important;
}

.dropdown-item:hover {
color: black !important;
}

.dropdown-item.active {
background-color: var(--startButton) !important;
}

a.btn.joinButton {
background-color: var(--joinButton);
border-radius: var(--buttonShape);
color: var(--text-primary-color);
}

a.btn.joinButton:hover {
background-color: var(--joinButtonHovered);
}

a.btn.startButton {
background-color: var(--startButton);
border-radius: var(--buttonShape);
color: var(--text-primary-color);
}

a.btn.startButton:hover {
background-color: var(--startButtonHovered);
}

a.btn.startButton:focus {
background-color: var(--startButtonHovered) !important;
}

.btn.dropdown-toggle { /* User Estimation Button */
color: var(--text-primary-color);
background-color: var(--joinButton);
}

.btn.dropdown-toggle:active { /* User Estimation Button hold */
background-color: var(--joinButtonHovered) !important;
color: var(--text-primary-color) !important;
}

.btn.dropdown-toggle:hover { /* User Estimation Button Hover */
background-color: var(--joinButtonHovered);
color: var(--text-primary-color);
}

.btn-secondary:not(:disabled):not(.disabled).active, .show > .btn-secondary.dropdown-toggle { /* User Estimation Button clicked */
background-color: var(--joinButton) !important;
color: var(--text-primary-color) !important;
}

.btn-secondary:focus{ /* User Estimation Button after click & add User Story Button on click hold*/
background-color: var(--joinButtonHovered) !important;
color: var(--text-primary-color) !important;
}

.a.dropdown-item {
color: var(--text-primary-color) !important;
}

.a.dropdown-item:hover {
color: black !important;
}

.dropdown-menu {
background-color: var(--topNavigationBarColor) !important;
border-color: var(--text-primary-color) !important;
}

</style>
Binary file added frontend/src/assets/ActiveUserStory.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/EstimateUserStories.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/InviteYourTeam.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/LeaveButton.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/LoadingCat.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/SetUpSession.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/Timer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed frontend/src/assets/magnifying glass.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/preparePage/Hour-DarkMode.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/preparePage/P1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/preparePage/P1D.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/preparePage/P2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/preparePage/P2D.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/preparePage/P3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/preparePage/P3D.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/preparePage/P4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/preparePage/P4D.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
95 changes: 95 additions & 0 deletions frontend/src/assets/variables.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
:root {
--background-color-primary: #e2e2e2;
--blurredColour1: #94623400;
--blurredColour2: rgba(0, 0, 0, 0.219);
--blurredColour3: rgba(216, 125, 6, 0);
--blurredColour4: rgba(17, 9, 0, 0);

/* Bottom */
--blurredColour5: rgba(6, 1, 8, 0.24);
--blurredColour6: rgba(80, 80, 80, 0.219);

/*other basic stuff*/
--accent-color: #cacaca;
--text-primary-color: #222;
--element-size: 6rem;
--buttonShape: 1rem;
--linkColor: #254bb3;

/*Landing Page*/
--startButton: #946234e0;
--startButtonHovered: #9c5b1d;
--joinButton: #658462;
--joinButtonHovered: #4d8a47;
--reconnectButton: #822E1C;
--reconnectButtonHovered: #9e2e15;
--pictureGradientEnd: rgba(19, 44, 20, 0.5);
--landingPageCardsBackground: #e4e4e4;
--blurBackGroundColor: rgba(80, 80, 80, 0.219);
/*Prepare page*/
--preparePageMainColor:#946234;
--preparePageInActiveTab: #ffffff;
--preparePageInActiveTabHover: #718A6F91;
--preparePageBorderTab: grey;
--preparePageImportUserStoriesButton: #30a858;
--preparePageActiveCardSet: black;
--preparePageInActiveCardSet: #e27712;
--preparePageTimerBackground: #974F0D3D;

/*Session Page*/
--textAreaColour: #c3c7bd;
--textAreaColourHovered: #c3c7bdb6;


/*other Stuff*/
--topNavigationBarColor: rgba(200, 200, 200, 0.75);
--popUpMenu: rgb(143, 143, 143);
}

/* Define styles for the root window with dark - mode preference */
:root.dark-theme {
/*Background Colors*/
--background-color-primary: #010617;
--blurredColour1: rgba(76, 134, 185, 0.219);
--blurredColour2: rgba(167, 236, 219, 0.534);
--blurredColour3: rgba(151, 199, 241, 0.37);
--blurredColour4: rgba(255, 255, 255, 0.329);

/* Bottom */
--blurredColour5: rgba(211, 167, 236, 0.322);
--blurredColour6: rgba(170, 128, 180, 0.301);

/*other basic stuff*/
--accent-color: rgba(34, 34, 34, 0.863);
--text-primary-color: #ffffff;
--linkColor: #00ffdd;

/*Landing Page*/
--startButton: #13276D;
--startButtonHovered: #13266dc9;
--joinButton: #42104B;
--joinButtonHovered: #42104bb4;
--reconnectButton: #033347;
--reconnectButtonHovered: #033347bd;
--landingPageCardsBackground: #525252;
--blurBackGroundColor: #50505069;
--pictureGradientEnd: rgba(44, 19, 32, 0.5);

/*Prepare Page*/

--preparePageMainColor:#13276D;
--preparePageInActiveTab: #666565;
--preparePageInActiveTabHover: #42104B;
--preparePageBorderTab: white;
--preparePageImportUserStoriesButton: #7e5a0c;
--preparePageActiveCardSet: white;
--preparePageInActiveCardSet: #e27712;
--preparePageTimerBackground: #7EBCC98A;
/*Session Page*/
--textAreaColour: #A8E8F65C;
--textAreaColourHovered: #a8e8f6b9;

/*other Stuff*/
--topNavigationBarColor: rgba(34, 34, 34, 0.863);
--popUpMenu: rgb(201, 201, 201);
}
Loading
Loading