From 9f7463f0d0b80dfb087d784a6a05980968fabc02 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 6 May 2026 14:18:42 +0000
Subject: [PATCH 1/3] 2.14.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8458f4c67..1959646a6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cylc-ui",
-  "version": "2.14.0-0",
+  "version": "2.14.0",
   "private": true,
   "license": "GPL-3.0-only",
   "type": "module",

From c5f93f4661fddecd91cb827de4bc6a13b9220327 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 6 May 2026 14:18:46 +0000
Subject: [PATCH 2/3] Prepare release 2.14.0

Workflow: Release stage 1 - create release PR, run: 41
---
 CHANGES.md            | 10 ++++++++++
 changes.d/2386.fix.md |  1 -
 changes.d/2507.fix.md |  1 -
 changes.d/2519.fix.md |  1 -
 4 files changed, 10 insertions(+), 3 deletions(-)
 delete mode 100644 changes.d/2386.fix.md
 delete mode 100644 changes.d/2507.fix.md
 delete mode 100644 changes.d/2519.fix.md

diff --git a/CHANGES.md b/CHANGES.md
index e901809f0..7bdb296ee 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,16 @@ $ towncrier create <PR-number>.<feat|fix>.md --content "Short description"
 
 <!-- towncrier release notes start -->
 
+## cylc-ui-2.14.0 (Released 2026-05-06)
+
+### 🔧 Fixes
+
+[#2386](https://github.com/cylc/cylc-ui/pull/2386) - Fixed occasional empty cycle point bug in the tree view.
+
+[#2507](https://github.com/cylc/cylc-ui/pull/2507) - Tree view: ensured task icon modifiers (e.g. held, retrying) also show on their parent families and cycle icons.
+
+[#2519](https://github.com/cylc/cylc-ui/pull/2519) - Fix an issue in the "info" view where task outputs which contain hyphens were missing from completion expressions.
+
 ## cylc-ui-2.13.0 (Released 2026-02-24)
 
 ### 🚀 Enhancements
diff --git a/changes.d/2386.fix.md b/changes.d/2386.fix.md
deleted file mode 100644
index 8e82df27e..000000000
--- a/changes.d/2386.fix.md
+++ /dev/null
@@ -1 +0,0 @@
-Fixed occasional empty cycle point bug in the tree view.
diff --git a/changes.d/2507.fix.md b/changes.d/2507.fix.md
deleted file mode 100644
index a39a26e9d..000000000
--- a/changes.d/2507.fix.md
+++ /dev/null
@@ -1 +0,0 @@
-Tree view: ensured task icon modifiers (e.g. held, retrying) also show on their parent families and cycle icons.
diff --git a/changes.d/2519.fix.md b/changes.d/2519.fix.md
deleted file mode 100644
index 766b4da58..000000000
--- a/changes.d/2519.fix.md
+++ /dev/null
@@ -1 +0,0 @@
-Fix an issue in the "info" view where task outputs which contain hyphens were missing from completion expressions.

From 27044946d26813239a9dc7e9555e7df3b0273685 Mon Sep 17 00:00:00 2001
From: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
Date: Wed, 6 May 2026 16:06:16 +0100
Subject: [PATCH 3/3] Revert "Merge pull request #2540 from
 ChrisPaulBennett/expand-button"

This reverts commit c8dd712ae09ba0682707c31f4464c3df5fe74937, reversing
changes made to dcf8aaa3747b406f6e0b0a1ec07115bb2076c65b.
---
 src/components/cylc/Toolbar.vue                       | 11 +++++------
 src/components/cylc/workspace/Toolbar.vue             | 11 +++++------
 src/layouts/Default.vue                               |  7 ++++---
 .../components/cylc/workspace/toolbar.vue.spec.js     |  9 ++++-----
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/components/cylc/Toolbar.vue b/src/components/cylc/Toolbar.vue
index 5a13ffad7..92e79d127 100644
--- a/src/components/cylc/Toolbar.vue
+++ b/src/components/cylc/Toolbar.vue
@@ -23,6 +23,7 @@ component. Note: this is not used for the workflow view, see
 <template>
   <v-toolbar
     id="core-app-bar"
+    absolute
     :height="toolbarHeight"
     flat
     class="c-toolbar"
@@ -34,7 +35,7 @@ component. Note: this is not used for the workflow view, see
       @click.stop="toggleDrawer"
       id="toggle-drawer"
     >
-      <v-icon>{{ drawer ? $options.icons.mdiArrowLeft : $options.icons.mdiViewList }}</v-icon>
+      <v-icon>{{ $options.icons.mdiViewList }}</v-icon>
     </v-btn>
     <v-toolbar-title>
       {{ title }}
@@ -46,14 +47,13 @@ component. Note: this is not used for the workflow view, see
 import { mapState } from 'vuex'
 import { useDrawer, toolbarHeight } from '@/utils/toolbar'
 import {
-  mdiViewList,
-  mdiArrowLeft,
+  mdiViewList
 } from '@mdi/js'
 
 export default {
   setup () {
-    const { drawer, toggleDrawer } = useDrawer()
-    return { drawer, toggleDrawer, toolbarHeight }
+    const { toggleDrawer } = useDrawer()
+    return { toggleDrawer, toolbarHeight }
   },
 
   computed: {
@@ -62,7 +62,6 @@ export default {
 
   icons: {
     mdiViewList,
-    mdiArrowLeft,
   },
 }
 </script>
diff --git a/src/components/cylc/workspace/Toolbar.vue b/src/components/cylc/workspace/Toolbar.vue
index 91ce36700..d40437314 100644
--- a/src/components/cylc/workspace/Toolbar.vue
+++ b/src/components/cylc/workspace/Toolbar.vue
@@ -28,15 +28,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <!-- TODO: duplicated in workflow/Toolbar.vue and cylc/Toolbar.vue -->
     <!-- burger button for mobile -->
     <v-btn
+      v-if="showNavBtn"
       icon
       @click.stop="toggleDrawer"
       id="toggle-drawer"
     >
-      <v-icon>{{ drawer ? icons.arrowLeft : icons.list }}</v-icon>
+      <v-icon>{{ icons.list }}</v-icon>
     </v-btn>
     <!-- title -->
     <v-toolbar-title
-      class="c-toolbar-title text-md-h6 text-subtitle-1 font-weight-medium text-primary ml-0"
+      class="c-toolbar-title text-md-h6 text-subtitle-1 font-weight-medium text-primary"
+      :class="showNavBtn ? 'ml-0' : null"
     >
       {{ title }}
     </v-toolbar-title>
@@ -263,7 +265,6 @@ import {
   mdiAccount,
   mdiChevronDown,
   mdiArrowULeftTop,
-  mdiArrowLeft,
   mdiInformationOutline,
 } from '@mdi/js'
 import { startCase } from 'lodash'
@@ -329,14 +330,13 @@ export default {
 
   setup () {
     const { showNavBtn } = useNavBtn()
-    const { drawer, toggleDrawer } = useDrawer()
+    const { toggleDrawer } = useDrawer()
 
     const uisVersionInfo = inject('versionInfo')
     const uisFlowVersion = uisVersionInfo?.value?.['cylc-flow'] ?? ''
 
     return {
       eventBus,
-      drawer,
       showNavBtn,
       toggleDrawer,
       toolbarHeight,
@@ -346,7 +346,6 @@ export default {
         hold: mdiPause,
         info: mdiInformationOutline,
         list: mdiViewList,
-        arrowLeft: mdiArrowLeft,
         menu: mdiMicrosoftXboxControllerMenu,
         run: mdiPlay,
         stop: mdiStop,
diff --git a/src/layouts/Default.vue b/src/layouts/Default.vue
index 80c68d661..533be965e 100644
--- a/src/layouts/Default.vue
+++ b/src/layouts/Default.vue
@@ -18,11 +18,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <template>
   <div>
     <ConnectionStatus :is-offline="offline" />
+    <Toolbar v-if="showToolbar" />
     <Drawer v-if="showSidebar" />
     <CommandMenu/>
 
     <v-main>
-      <Toolbar v-if="showToolbar" />
       <alert />
       <div
         id="core-view"
@@ -45,7 +45,7 @@ import { Alert as AlertModel } from '@/model/Alert.model'
 import Alert from '@/components/core/Alert.vue'
 import Drawer from '@/components/cylc/Drawer.vue'
 import Toolbar from '@/components/cylc/Toolbar.vue'
-import { toolbarHeight } from '@/utils/toolbar'
+import { useNavBtn, toolbarHeight } from '@/utils/toolbar'
 import ConnectionStatus from '@/components/cylc/ConnectionStatus.vue'
 import CommandMenu from '@/components/cylc/commandMenu/Menu.vue'
 
@@ -66,10 +66,11 @@ export default {
       ...allViews.keys(),
       'Workspace',
     ]
+    const { showNavBtn } = useNavBtn()
 
     /** Whether to show app toolbar (not the workspace view toolbar). */
     const showToolbar = computed(
-      () => !workflowViews.includes(route.name)
+      () => showNavBtn.value && !workflowViews.includes(route.name)
     )
     const coreViewStyle = computed(() => ({
       marginTop: showToolbar.value ? `${toolbarHeight}px` : 0,
diff --git a/tests/unit/components/cylc/workspace/toolbar.vue.spec.js b/tests/unit/components/cylc/workspace/toolbar.vue.spec.js
index e2ee4cb2b..d5f4ed590 100644
--- a/tests/unit/components/cylc/workspace/toolbar.vue.spec.js
+++ b/tests/unit/components/cylc/workspace/toolbar.vue.spec.js
@@ -39,9 +39,8 @@ describe('Workspace toolbar component', () => {
     drawerState.value = false
   })
 
-  it('shows nav button', async () => {
-    // TODO Add test for when workflow toolbar is shown
-    // and when navbar should be hidden
+  it('hides/shows nav button according to viewport size & whether drawer is collapsed', async () => {
+    // TODO: actually just show nav btn at all times?
     const wrapper = mount(Toolbar, {
       global: {
         plugins: [store, vuetify, CommandMenuPlugin],
@@ -57,10 +56,10 @@ describe('Workspace toolbar component', () => {
     wrapper.vm.$vuetify.display.mobile = false
     await wrapper.vm.$nextTick()
     expect(wrapper.find('#toggle-drawer').exists()).to.equal(true)
-    // Btn should show when drawer is visible on large viewport
+    // Btn should not show when drawer is visible on large viewport
     drawerState.value = true
     await wrapper.vm.$nextTick()
-    expect(wrapper.find('#toggle-drawer').exists()).to.equal(true)
+    expect(wrapper.find('#toggle-drawer').exists()).to.equal(false)
     // Btn should show when drawer is visible on small viewport
     wrapper.vm.$vuetify.display.mobile = true
     await wrapper.vm.$nextTick()