diff options
author | rstular <rok@stular.eu> | 2020-05-17 20:25:10 +0200 |
---|---|---|
committer | rstular <rok@stular.eu> | 2020-05-17 21:02:04 +0200 |
commit | 730722259f6f079c930f6fcce1c2f1e715d3df63 (patch) | |
tree | 909908e9f3ca8b1ab472f1d4cbf01801e43ce9ad /assets | |
parent | Language changing bug fix (diff) | |
download | beziapp-730722259f6f079c930f6fcce1c2f1e715d3df63.tar beziapp-730722259f6f079c930f6fcce1c2f1e715d3df63.tar.gz beziapp-730722259f6f079c930f6fcce1c2f1e715d3df63.tar.bz2 beziapp-730722259f6f079c930f6fcce1c2f1e715d3df63.tar.lz beziapp-730722259f6f079c930f6fcce1c2f1e715d3df63.tar.xz beziapp-730722259f6f079c930f6fcce1c2f1e715d3df63.tar.zst beziapp-730722259f6f079c930f6fcce1c2f1e715d3df63.zip |
Diffstat (limited to 'assets')
-rw-r--r-- | assets/css/styles.css | 104 | ||||
-rw-r--r-- | assets/js/lib/themes.js | 35 | ||||
-rw-r--r-- | assets/js/teachers.js | 8 | ||||
-rw-r--r-- | assets/pages-src/about.bvr | 2 | ||||
-rw-r--r-- | assets/pages-src/absences.bvr | 2 | ||||
-rw-r--r-- | assets/pages-src/changelog.bvr | 2 | ||||
-rw-r--r-- | assets/pages-src/chats.bvr | 2 | ||||
-rw-r--r-- | assets/pages-src/grades.bvr | 2 | ||||
-rw-r--r-- | assets/pages-src/gradings.bvr | 2 | ||||
-rw-r--r-- | assets/pages-src/jitsi.bvr | 2 | ||||
-rw-r--r-- | assets/pages-src/meals.bvr | 2 | ||||
-rw-r--r-- | assets/pages-src/messaging.bvr | 2 | ||||
-rw-r--r-- | assets/pages-src/misc/navigation.bvr | 3 | ||||
-rw-r--r-- | assets/pages-src/privacypolicy.bvr | 2 | ||||
-rw-r--r-- | assets/pages-src/settings.bvr | 2 | ||||
-rw-r--r-- | assets/pages-src/teachers.bvr | 2 | ||||
-rw-r--r-- | assets/pages-src/timetable.bvr | 2 | ||||
-rw-r--r-- | assets/pages-src/tos.bvr | 2 |
18 files changed, 156 insertions, 22 deletions
diff --git a/assets/css/styles.css b/assets/css/styles.css index 5144bda..a1509f4 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -6,6 +6,20 @@ --color-invalid: rgba(192, 0, 0, 1); --background-color: rgba(255, 255, 255, 1); --background-accent: rgba(0, 156, 101, 0.2); + + --color-header-bold: rgba(255, 255, 255, 1); + --color-header-span: rgba(255, 255, 255, 1); + + --color-text: rgba(0, 0, 0, 1); + --color-table-hover: rgba(242, 242, 242, 0.5); + + --color-sidenav-background: rgba(255, 255, 255, 1); + --color-sidenav-text: rgba(0, 0, 0, 0.87); + --color-sidenav-header: rgba(0, 0, 0, 0.54); + --color-divider: rgba(224, 224, 224, 1); + + --color-btn-flat: rgba(52, 52, 52, 1); + --color-btn-flat-disabled: rgba(178, 178, 178, 1); } body { @@ -203,4 +217,94 @@ a.collection-item { .flag-icon { height: 1vw; +} + +.app-header-bold { + color: var(--color-header-bold) !important; +} + +.app-header-span { + color: var(--color-header-span) !important; +} + +table > thead > tr > th { + color: var(--color-text) !important; +} + +table > tbody > tr > td { + color: var(--color-text) !important; +} + +table.highlight > tbody > tr:hover { + background-color: var(--color-table-hover) !important; +} + +.sidenav { + background-color: var(--background-color) !important; +} + +.sidenav li > a { + color: var(--color-sidenav-text) !important; +} + +.sidenav-beziapp-subheader { + color: var(---color-sidenav-header) !important; +} + +.divider { + background-color: var(--color-divider) !important; +} + +.sidenav li>a>i.material-icons { + color: var(--color-sidenav-text); +} + +.collapsible-header { + background-color: var(--background-color); +} + +.collapsible-body { + border-bottom-color: var(--color-divider); +} + +span { + color: var(--color-text); +} + +div { + color: var(--color-text); +} + +h5.subheader { + color: var(--color-text); +} + +.collection-item, .collection-header { + background-color: var(--background-color) !important; + color: var(--color-text) !important; + border-bottom-color: var(--color-divider) !important; +} + +.collection { + border-top-color: var(--color-divider) !important; + border-bottom-color: var(--color-divider) !important; + border-left-color: var(--color-divider) !important; + border-right-color: var(--color-divider) !important; +} + +.modal-content { + background-color: var(--background-color); +} + +.modal-footer { + background-color: var(--background-color) !important; + border-top-color: var(--color-divider) !important; +} + +.modal-close.btn-flat { + color: var(--color-btn-flat) !important; +} + +.modal-close.btn-flat:disabled { + color: var(--color-btn-flat-disabled) !important; }
\ No newline at end of file diff --git a/assets/js/lib/themes.js b/assets/js/lib/themes.js index d8a7ca1..5eaec7d 100644 --- a/assets/js/lib/themes.js +++ b/assets/js/lib/themes.js @@ -5,8 +5,24 @@ const THEME_COLOR_SCHEMES = { "color-accent": "rgba(0, 156, 101, 1)", "color-primary-light": "rgba(230, 250, 231, 1)", "color-invalid": "rgba(192, 0, 0, 1)", + "background-color": "rgba(255, 255, 255, 1)", - "background-accent": "rgba(0, 156, 101, 0.2)" + "background-accent": "rgba(0, 156, 101, 0.2)", + + "color-header-bold": "rgba(255, 255, 255, 1)", + "color-header-span": "rgba(255, 255, 255, 1)", + + "color-text": "rgba(0, 0, 0, 1)", + "color-table-hover": "rgba(242, 242, 242, 0.5)", + + "color-sidenav-background": "rgba(255, 255, 255, 1)", + "color-sidenav-text": "rgba(0, 0, 0, 0.87)", + "color-sidenav-header": "rgba(0, 0, 0, 0.54)", + "color-divider": "rgba(224, 224, 224, 1)", + + "color-btn-flat": "rgba(52, 52, 52, 1)", + "color-btn-flat-disabled": "rgba(178, 178, 178, 1)", + }, dark: { "color-primary": "rgba(0, 128, 83, 1)", @@ -14,8 +30,23 @@ const THEME_COLOR_SCHEMES = { "color-accent": "rgba(20, 117, 83, 1)", "color-primary-light": "rgba(230, 250, 231, 1)", "color-invalid": "rgba(192, 0, 0, 1)", + "background-color": "rgba(31, 31, 31, 1)", - "background-accent": "rgba(0, 92, 44, 0.2)" + "background-accent": "rgba(0, 92, 44, 0.2)", + + "color-header-bold": "rgba(255, 255, 255, 1)", + "color-header-span": "rgba(255, 255, 255, 1)", + + "color-text": "rgba(255, 255, 255, 1)", + "color-table-hover": "rgba(70, 70, 70, 0.5)", + + "color-sidenav-background": "rgba(31, 31, 31, 1)", + "color-sidenav-text": "rgba(255, 255, 255, 1)", + "color-sidenav-header": "rgba(255, 255, 255, 0.54)", + "color-divider": "rgba(80, 80, 80, 1)", + + "color-btn-flat": "rgba(178, 178, 178, 1)", + "color-btn-flat-disabled": "rgba(52, 52, 52, 1)", } } diff --git a/assets/js/teachers.js b/assets/js/teachers.js index da69e96..da0a62d 100644 --- a/assets/js/teachers.js +++ b/assets/js/teachers.js @@ -35,8 +35,8 @@ async function loadTeachers(force_refresh = false) { await gsecInstance.login(username, password); gsecInstance.fetchTeachers().then( (value) => { teachers = value; - localforage.setItem("teachers", value).then(() => { - displayData(); + localforage.setItem("teachers", value).then((saved_teachers) => { + displayData(saved_teachers); setLoading(false); }); setLoading(false); @@ -49,13 +49,13 @@ async function loadTeachers(force_refresh = false) { setLoading(false); } } else { - displayData(); + displayData(teachers); setLoading(false); } } // Function for displaying data -function displayData() { +function displayData(teachers) { for(const teacher of Object.keys(teachers)) { // Create row let row = document.createElement("tr"); diff --git a/assets/pages-src/about.bvr b/assets/pages-src/about.bvr index 56fa810..dd42b82 100644 --- a/assets/pages-src/about.bvr +++ b/assets/pages-src/about.bvr @@ -35,7 +35,7 @@ <body> <nav class="z-depth-0" id="navigation-main"> <div class="nav-wrapper container"> - <b>Beži</b><span>App</span> » <x-su>about</x-su> + <b class="app-header-bold">Beži</b><span class="app-header-span">App</span> » <x-su>about</x-su> <span class="right white-text"> <i class="material-icons sidenav-trigger" data-target="side-menu">menu</i> </span> diff --git a/assets/pages-src/absences.bvr b/assets/pages-src/absences.bvr index 0561a3b..c09cca4 100644 --- a/assets/pages-src/absences.bvr +++ b/assets/pages-src/absences.bvr @@ -35,7 +35,7 @@ <body> <nav class="z-depth-0" id="navigation-main"> <div class="nav-wrapper container"> - <b>Beži</b><span>App</span> » <x-su>absences</x-su> + <b class="app-header-bold">Beži</b><span class="app-header-span">App</span> » <x-su>absences</x-su> <span class="right white-text"> <i class="material-icons sidenav-trigger" data-target="side-menu">menu</i> </span> diff --git a/assets/pages-src/changelog.bvr b/assets/pages-src/changelog.bvr index 63504cc..fa44d8d 100644 --- a/assets/pages-src/changelog.bvr +++ b/assets/pages-src/changelog.bvr @@ -35,7 +35,7 @@ <body> <nav class="z-depth-0" id="navigation-main"> <div class="nav-wrapper container"> - <b>Beži</b><span>App</span> » <x-su>changelog</x-su> + <b class="app-header-bold">Beži</b><span class="app-header-span">App</span> » <x-su>changelog</x-su> <span class="right white-text" id="nav-back-button"> <i class="material-icons">arrow_back</i> </span> diff --git a/assets/pages-src/chats.bvr b/assets/pages-src/chats.bvr index d454c14..ccaf5cd 100644 --- a/assets/pages-src/chats.bvr +++ b/assets/pages-src/chats.bvr @@ -44,7 +44,7 @@ <i class="material-icons sidenav-trigger" data-target="directory-side-menu">contacts</i> </span> <!-- | <x-su>chattingWith</x-su> --> <!-- too much for smaller devices --> - <span class="msg-chattingWith"><b>Beži</b><span>App</span> » <x-su>chat</x-su></span> + <span class="msg-chattingWith"><b class="app-header-bold">Beži</b><span class="app-header-span">App</span> » <x-su>chat</x-su></span> <span class="right white-text"> <i class="material-icons sidenav-trigger" data-target="side-menu">menu</i> </span> diff --git a/assets/pages-src/grades.bvr b/assets/pages-src/grades.bvr index 0c28f15..f47d462 100644 --- a/assets/pages-src/grades.bvr +++ b/assets/pages-src/grades.bvr @@ -35,7 +35,7 @@ <body> <nav class="z-depth-0" id="navigation-main"> <div class="nav-wrapper container"> - <b>Beži</b><span>App</span> » <x-su>grades</x-su> + <b class="app-header-bold">Beži</b><span class="app-header-span">App</span> » <x-su>grades</x-su> <span class="right white-text"> <i class="material-icons sidenav-trigger" data-target="side-menu">menu</i> </span> diff --git a/assets/pages-src/gradings.bvr b/assets/pages-src/gradings.bvr index 0f693e2..672b8a2 100644 --- a/assets/pages-src/gradings.bvr +++ b/assets/pages-src/gradings.bvr @@ -42,7 +42,7 @@ <body> <nav class="z-depth-0" id="navigation-main"> <div class="nav-wrapper container"> - <b>Beži</b><span>App</span> » <x-su>gradings</x-su> + <b class="app-header-bold">Beži</b><span class="app-header-span">App</span> » <x-su>gradings</x-su> <span class="right white-text"> <i class="material-icons sidenav-trigger" data-target="side-menu">menu</i> </span> diff --git a/assets/pages-src/jitsi.bvr b/assets/pages-src/jitsi.bvr index bf0a656..005ae60 100644 --- a/assets/pages-src/jitsi.bvr +++ b/assets/pages-src/jitsi.bvr @@ -35,7 +35,7 @@ <body> <nav class="z-depth-0" id="navigation-main"> <div class="nav-wrapper container"> - <b>Beži</b><span>App</span> » <x-su>videoconferences</x-su> + <b class="app-header-bold">Beži</b><span class="app-header-span">App</span> » <x-su>videoconferences</x-su> <span class="right white-text"> <i class="material-icons sidenav-trigger" data-target="side-menu">menu</i> </span> diff --git a/assets/pages-src/meals.bvr b/assets/pages-src/meals.bvr index 47ef8a5..a089fbf 100644 --- a/assets/pages-src/meals.bvr +++ b/assets/pages-src/meals.bvr @@ -35,7 +35,7 @@ <body> <nav class="z-depth-0" id="navigation-main"> <div class="nav-wrapper container"> - <b>Beži</b><span>App</span> » <x-su>meals</x-su> + <b class="app-header-bold">Beži</b><span class="app-header-span">App</span> » <x-su>meals</x-su> <span class="right white-text"> <i class="material-icons sidenav-trigger" data-target="side-menu">menu</i> </span> diff --git a/assets/pages-src/messaging.bvr b/assets/pages-src/messaging.bvr index d302ae6..3bc2fd7 100644 --- a/assets/pages-src/messaging.bvr +++ b/assets/pages-src/messaging.bvr @@ -36,7 +36,7 @@ <body> <nav class="z-depth-0" id="navigation-main"> <div class="nav-wrapper container"> - <b>Beži</b><span>App</span> » <x-su>messaging</x-su> + <b class="app-header-bold">Beži</b><span class="app-header-span">App</span> » <x-su>messaging</x-su> <span class="right white-text"> <i class="material-icons sidenav-trigger" data-target="side-menu">menu</i> </span> diff --git a/assets/pages-src/misc/navigation.bvr b/assets/pages-src/misc/navigation.bvr index 53b7553..2f0da71 100644 --- a/assets/pages-src/misc/navigation.bvr +++ b/assets/pages-src/misc/navigation.bvr @@ -1,5 +1,5 @@ <ul id="side-menu" class="sidenav side-menu"> - <li><a class="subheader"><h4><b>Beži</b>App</h4></a></li> + <li><a class="subheader"><h4 class="sidenav-beziapp-subheader"><b>Beži</b>App</h4></a></li> <li><a href="/pages/timetable.html" class="waves-effect"><i class="material-icons">view_module</i><x-su>timetable</x-su></a></li> <li><a href="/pages/gradings.html" class="waves-effect"><i class="material-icons">event</i><x-su>gradings</x-su></a></li> <li><a href="/pages/grades.html" class="waves-effect"><i class="material-icons">receipt</i><x-su>grades</x-su></a></li> @@ -15,4 +15,3 @@ <li><a href="/logout.html" class="waves-effect"><i class="material-icons">exit_to_app</i><x-su>logout</x-su></a></li> <li><a href="/pages/settings.html" class="waves-effect"><i class="material-icons">settings</i><x-su>settings</x-su></a></li> </ul> - diff --git a/assets/pages-src/privacypolicy.bvr b/assets/pages-src/privacypolicy.bvr index 4e13e67..c6730ca 100644 --- a/assets/pages-src/privacypolicy.bvr +++ b/assets/pages-src/privacypolicy.bvr @@ -34,7 +34,7 @@ <body> <nav class="z-depth-0" id="navigation-main"> <div class="nav-wrapper container"> - <b>Beži</b><span>App</span> » <x-su>thePrivacyPolicy</x-su> + <b class="app-header-bold">Beži</b><span class="app-header-span">App</span> » <x-su>thePrivacyPolicy</x-su> <span class="right white-text"> <i class="material-icons" id="nav-home-button">home</i> </span> diff --git a/assets/pages-src/settings.bvr b/assets/pages-src/settings.bvr index 358a0ce..6145311 100644 --- a/assets/pages-src/settings.bvr +++ b/assets/pages-src/settings.bvr @@ -35,7 +35,7 @@ <body> <nav class="z-depth-0" id="navigation-main"> <div class="nav-wrapper container"> - <b>Beži</b><span>App</span> » <x-su>settings</x-su> + <b class="app-header-bold">Beži</b><span class="app-header-span">App</span> » <x-su>settings</x-su> <span class="right white-text"> <i class="material-icons sidenav-trigger" data-target="side-menu">menu</i> </span> diff --git a/assets/pages-src/teachers.bvr b/assets/pages-src/teachers.bvr index e3993b3..abfcee4 100644 --- a/assets/pages-src/teachers.bvr +++ b/assets/pages-src/teachers.bvr @@ -35,7 +35,7 @@ <body> <nav class="z-depth-0" id="navigation-main"> <div class="nav-wrapper container"> - <b>Beži</b><span>App</span> » <x-su>teachers</x-su> + <b class="app-header-bold">Beži</b><span class="app-header-span">App</span> » <x-su>teachers</x-su> <span class="right white-text"> <i class="material-icons sidenav-trigger" data-target="side-menu">menu</i> </span> diff --git a/assets/pages-src/timetable.bvr b/assets/pages-src/timetable.bvr index b8c6b06..171a595 100644 --- a/assets/pages-src/timetable.bvr +++ b/assets/pages-src/timetable.bvr @@ -44,7 +44,7 @@ <body> <nav class="z-depth-0" id="navigation-main"> <div class="nav-wrapper container"> - <b>Beži</b><span>App</span> » <x-su>timetable</x-su> + <b class="app-header-bold">Beži</b><span class="app-header-span">App</span> » <x-su>timetable</x-su> <span class="right white-text"> <i class="material-icons sidenav-trigger" data-target="side-menu">menu</i> </span> diff --git a/assets/pages-src/tos.bvr b/assets/pages-src/tos.bvr index 5deea14..e5e64a4 100644 --- a/assets/pages-src/tos.bvr +++ b/assets/pages-src/tos.bvr @@ -35,7 +35,7 @@ <body> <nav class="z-depth-0" id="navigation-main"> <div class="nav-wrapper container"> - <b>Beži</b><span>App</span> » <x-su>theTos</x-su> + <b class="app-header-bold">Beži</b><span class="app-header-span">App</span> » <x-su>theTos</x-su> <span class="right white-text"> <i class="material-icons" id="nav-home-button">home</i> </span> |