bump(version): 3.4.3 + changelog

package.json

@@ -1,6 +1,6 @@
 {
   "name": "betterseqtaplus",
-  "version": "3.4.2",
+  "version": "3.4.3",
   "type": "module",
   "description": "Enhance SEQTA Learn's usability and aesthetics! A fork of BetterSEQTA to continue development, while incorporating a plethora of new and improved features!",
   "browserslist": "> 0.5%, last 2 versions, not dead",
@@ -69,7 +69,7 @@
     "@uiw/codemirror-theme-github": "^4.23.3",
     "@vitejs/plugin-react": "^4.3.1",
     "autoprefixer": "^10.4.20",
-    "caniuse-lite": "^1.0.30001684",
+    "caniuse-lite": "^1.0.30001696",
     "classnames": "^2.5.1",
     "codemirror": "^6.0.1",
     "color": "^4.2.3",

src/SEQTA.ts

@@ -165,6 +165,10 @@ export function OpenWhatsNewPopup() {
     /* html */ `
   <div class="whatsnewTextContainer" style="height: 50%;overflow-y: scroll;">  
   
+    <h1>3.4.3 - Minor Bug Fixes</h1>
+    <li>Fixed a bug where timetable colours couldn't be changed</li>
+    <li>Other minor bug fixes</li>
+
     <h1>3.4.2 - Minor Bug Fixes</h1>
     <li>Fixed a bug where Assessment Average wasn't enabled by default</li>
     <li>Fixed floating menus would sometimes be placed behind other elements</li>
@@ -2197,10 +2201,10 @@ export async function loadHomePage() {
 
   const skeletonStructure = stringToHTML(/* html */`
     <div class="home-container" id="home-container">
-      <div class="shortcut-container border">
+      <div class="border shortcut-container">
-        <div class="shortcuts border" id="shortcuts"></div>
+        <div class="border shortcuts" id="shortcuts"></div>
       </div>
-      <div class="timetable-container border">
+      <div class="border timetable-container">
         <div class="home-subtitle">
           <h2 id="home-lesson-subtitle">Today's Lessons</h2>
           <div class="timetable-arrows">
@@ -2215,7 +2219,7 @@ export async function loadHomePage() {
         <div class="day-container loading" id="day-container">
         </div>
       </div>
-      <div class="upcoming-container border">
+      <div class="border upcoming-container">
         <div class="upcoming-title">
           <h2 class="home-subtitle">Upcoming Assessments</h2>
           <div class="upcoming-filters" id="upcoming-filters"></div>
@@ -2223,7 +2227,7 @@ export async function loadHomePage() {
         <div class="upcoming-items loading" id="upcoming-items">
         </div>
       </div>
-      <div class="notices-container border">
+      <div class="border notices-container">
         <div style="display: flex; justify-content: space-between">
           <h2 class="home-subtitle">Notices</h2>
           <input type="date" />

src/css/injected.scss

@@ -1,5 +1,4 @@
 @use "sass:meta";
-@charset "UTF-8";
 @import url("https://fonts.googleapis.com/css?family=Rubik:300,400,500,600");
 
 @include meta.load-css("injected/sidebar-animation.scss");
@@ -1879,6 +1878,9 @@ blurred {
 .uiSlidePane > .pane > .header {
   background: var(--better-main);
 }
+.modaliser-container {
+  pointer-events: none;
+}
 .content [placeholder="Subject…"] {
   padding-left: 12px !important;
   border-radius: 16px;

src/manifests/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "BetterSEQTA+",
-  "version": "3.4.2",
+  "version": "3.4.3",
   "description": "Enhance SEQTA Learn's usability and aesthetics! A fork of BetterSEQTA to continue development add add heaps more features!",
   "icons": {
     "32": "resources/icons/icon-32.png",

text

@@ -1,402 +0,0 @@
-https://sethburkart123.github.io/sf-pro-https://sethburkart123.github.io/sf-pro-fonts/fonts/
-
-/* -------------------------------------------------------------------------
- * SF Pro Display
- * ------------------------------------------------------------------------- */
-
-@font-face {
-    font-family: 'SF Pro Display';
-    font-style: normal;
-    font-weight: 100;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-ultralight.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-ultralight.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-ultralight.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Display';
-    font-style: normal;
-    font-weight: 200;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-thin.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-thin.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-thin.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Display';
-    font-style: normal;
-    font-weight: 300;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-light.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-light.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-light.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Display';
-    font-style: normal;
-    font-weight: 400;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-regular.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-regular.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-regular.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Display';
-    font-style: normal;
-    font-weight: 500;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-medium.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-medium.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-medium.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Display';
-    font-style: normal;
-    font-weight: 600;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-semibold.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-semibold.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-semibold.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Display';
-    font-style: normal;
-    font-weight: 700;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-bold.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-bold.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-bold.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Display';
-    font-style: normal;
-    font-weight: 800;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-heavy.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-heavy.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-heavy.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Display';
-    font-style: normal;
-    font-weight: 900;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-black.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-black.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-black.ttf') format('truetype');
-}
-
-
-
-/* -------------------------------------------------------------------------
- * SF Pro Display Italic
- * ------------------------------------------------------------------------- */
-
-@font-face {
-    font-family: 'SF Pro Display';
-    font-style: italic;
-    font-weight: 100;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-ultralightitalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-ultralightitalic.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-ultralightitalic.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Display';
-    font-style: italic;
-    font-weight: 200;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-thinitalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-thinitalic.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-thinitalic.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Display';
-    font-style: italic;
-    font-weight: 300;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-lightitalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-lightitalic.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-lightitalic.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Display';
-    font-style: italic;
-    font-weight: 400;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-regularitalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-regularitalic.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-regularitalic.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Display';
-    font-style: italic;
-    font-weight: 500;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-mediumitalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-mediumitalic.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-mediumitalic.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Display';
-    font-style: italic;
-    font-weight: 600;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-semibolditalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-semibolditalic.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-semibolditalic.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Display';
-    font-style: italic;
-    font-weight: 700;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-bolditalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-bolditalic.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-bolditalic.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Display';
-    font-style: italic;
-    font-weight: 800;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-heavyitalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-heavyitalic.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-heavyitalic.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Display';
-    font-style: italic;
-    font-weight: 900;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-blackitalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-blackitalic.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-display-blackitalic.ttf') format('truetype');
-}
-
-
-
-/* -------------------------------------------------------------------------
- * SF Pro Text
- * ------------------------------------------------------------------------- */
-
-@font-face {
-    font-family: 'SF Pro Text';
-    font-style: regular;
-    font-weight: 300;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-light.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-light.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-light.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Text';
-    font-style: regular;
-    font-weight: 400;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-regular.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-regular.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-regular.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Text';
-    font-style: regular;
-    font-weight: 500;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-medium.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-medium.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-medium.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Text';
-    font-style: regular;
-    font-weight: 600;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-semibold.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-semibold.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-semibold.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Text';
-    font-style: regular;
-    font-weight: 700;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-bold.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-bold.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-bold.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Text';
-    font-style: regular;
-    font-weight: 800;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-heavy.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-heavy.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-heavy.ttf') format('truetype');
-}
-
-
-
-/* -------------------------------------------------------------------------
- * SF Pro Text Italic
- * ------------------------------------------------------------------------- */
-
-@font-face {
-    font-family: 'SF Pro Text';
-    font-style: italic;
-    font-weight: 300;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-lightitalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-lightitalic.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-lightitalic.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Text';
-    font-style: italic;
-    font-weight: 400;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-regularitalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-regularitalic.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-regularitalic.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Text';
-    font-style: italic;
-    font-weight: 500;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-mediumitalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-mediumitalic.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-mediumitalic.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Text';
-    font-style: italic;
-    font-weight: 600;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-semibolditalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-semibolditalic.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-semibolditalic.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Text';
-    font-style: italic;
-    font-weight: 700;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-bolditalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-bolditalic.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-bolditalic.ttf') format('truetype');
-}
-
-@font-face {
-    font-family: 'SF Pro Text';
-    font-style: italic;
-    font-weight: 800;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-heavyitalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-heavyitalic.woff') format('woff'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sf-pro-text-heavyitalic.ttf') format('truetype');
-}
-
-
-
-
-/* -------------------------------------------------------------------------
- * SF Mono
- * ------------------------------------------------------------------------- */
-
-@font-face {
-    font-family: 'SF Mono';
-    font-style: regular;
-    font-weight: 300;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-light.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-light.woff') format('woff');
-}
-
-@font-face {
-    font-family: 'SF Mono';
-    font-style: regular;
-    font-weight: 400;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-regular.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-regular.woff') format('woff');
-}
-
-@font-face {
-    font-family: 'SF Mono';
-    font-style: regular;
-    font-weight: 500;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-medium.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-medium.woff') format('woff');
-}
-
-@font-face {
-    font-family: 'SF Mono';
-    font-style: regular;
-    font-weight: 600;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-semibold.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-semibold.woff') format('woff');
-}
-
-@font-face {
-    font-family: 'SF Mono';
-    font-style: regular;
-    font-weight: 700;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-bold.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-bold.woff') format('woff');
-}
-
-@font-face {
-    font-family: 'SF Mono';
-    font-style: regular;
-    font-weight: 800;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-heavy.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-heavy.woff') format('woff');
-}
-
-
-
-/* -------------------------------------------------------------------------
- * SF Pro Text Italic
- * ------------------------------------------------------------------------- */
-
-@font-face {
-    font-family: 'SF Mono';
-    font-style: italic;
-    font-weight: 300;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-lightitalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-lightitalic.woff') format('woff');
-}
-
-@font-face {
-    font-family: 'SF Mono';
-    font-style: italic;
-    font-weight: 400;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-regularitalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-regularitalic.woff') format('woff');
-}
-
-@font-face {
-    font-family: 'SF Mono';
-    font-style: italic;
-    font-weight: 500;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-mediumitalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-mediumitalic.woff') format('woff');
-}
-
-@font-face {
-    font-family: 'SF Mono';
-    font-style: italic;
-    font-weight: 600;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-semibolditalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-semibolditalic.woff') format('woff');
-}
-
-@font-face {
-    font-family: 'SF Mono';
-    font-style: italic;
-    font-weight: 700;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-bolditalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-bolditalic.woff') format('woff');
-}
-
-@font-face {
-    font-family: 'SF Mono';
-    font-style: italic;
-    font-weight: 800;
-    src: url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-heavyitalic.woff2') format('woff2'),
-         url('https://sethburkart123.github.io/sf-pro-fonts/fonts/sfmono-heavyitalic.woff') format('woff');
-}