Update appbar & sidenav to use appbar themeConfig values

learningequality · Dec 12, 2024 · ec00222 · ec00222
1 parent 1851e10
commit ec00222
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/kolibri/core/assets/src/views/AppBar.vue b/kolibri/core/assets/src/views/AppBar.vue
@@ -2,19 +2,19 @@
 
   <div
     v-show="!$isPrint"
-    :style="{ backgroundColor: $themeTokens.appBar }"
+    :style="{ backgroundColor: $themeConfig.appBar.background }"
   >
     <header>
       <SkipNavigationLink />
 
       <UiToolbar
         :removeNavIcon="showAppNavView"
         type="clear"
-        :textColor="$themeTokens.appBarText || $themeTokens.text"
+        :textColor="$themeConfig.appBar.textColor"
         class="app-bar"
         :style="{
           height: topBarHeight + 'px',
-          color: $themeTokens.appBarText || $themeTokens.text,
+          color: $themeConfig.appBar.textColor,
         }"
         :raised="false"
         :removeBrandDivider="true"
@@ -29,7 +29,7 @@
         >
           <KIconButton
             icon="menu"
-            :color="$themeTokens.appBarText || $themeTokens.text"
+            :color="$themeConfig.appBar.textColor"
             :ariaLabel="$tr('openNav')"
             @click="$emit('toggleSideNav')"
           />
@@ -52,7 +52,7 @@
           <slot name="sub-nav">
             <Navbar
               v-if="links.length > 0"
-              :textColor="$themeTokens.appBarText || $themeTokens.text"
+              :textColor="$themeConfig.appBar.textColor"
               :navigationLinks="links"
             />
           </slot>
@@ -98,7 +98,7 @@
               <KIcon
                 icon="person"
                 :style="{
-                  fill: $themeTokens.appBarText || $themeTokens.text,
+                  fill: $themeConfig.appBar.textColor,
                   height: '24px',
                   width: '24px',
                   margin: '4px',

diff --git a/kolibri/core/assets/src/views/SideNav.vue b/kolibri/core/assets/src/views/SideNav.vue
@@ -196,7 +196,7 @@
               height: topBarHeight + 'px',
               width: `${width}`,
               paddingTop: windowIsSmall ? '4px' : '8px',
-              backgroundColor: $themeTokens.appBar,
+              backgroundColor: $themeConfig.appBar.background,
             }"
           >
             <KIconButton