Skip to content

Commit fa32079

Browse files
Prashant-thakur77Prashant-thakur77
committed
precommit
1 parent 00e258a commit fa32079

File tree

10 files changed

+89
-115
lines changed

10 files changed

+89
-115
lines changed

‎contentcuration/contentcuration/frontend/channelList/views/Channel/components/CatalogFilterPanelContent.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22

3-
<div
3+
<div
44
class="filter-panel-content"
55
:style="contentStyles"
66
>
@@ -111,7 +111,6 @@
111111
import Checkbox from 'shared/views/form/Checkbox';
112112
import HelpTooltip from 'shared/views/HelpTooltip';
113113
import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
114-
115114
116115
const excludedKinds = new Set([ContentKindsNames.TOPIC, ContentKindsNames.H5P]);
117116

‎contentcuration/contentcuration/frontend/channelList/views/ChannelListIndex.vue‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
</VToolbarTitle>
2929
</VToolbar>
3030

31-
<StudioNavigation
31+
<StudioNavigation
3232
v-else
33-
:tabs="navigationTabs"
33+
:tabs="navigationTabs"
3434
/>
3535

3636
<VContent>
@@ -148,19 +148,19 @@
148148
}),
149149
...mapGetters(['loggedIn']),
150150
...mapGetters('channelList', ['invitations']),
151-
151+
152152
navigationTabs() {
153153
if (!this.loggedIn) return [];
154154
155155
const tabs = [];
156156
157157
this.lists.forEach(listType => {
158158
tabs.push({
159-
id: listType,
159+
id: listType,
160160
label: this.translateConstant(listType),
161161
to: this.getChannelLink(listType),
162162
badgeValue: this.invitationsByListCounts[listType] || 0,
163-
analyticsLabel: ListTypeToAnalyticsLabel[listType]
163+
analyticsLabel: ListTypeToAnalyticsLabel[listType],
164164
});
165165
});
166166
@@ -169,15 +169,15 @@
169169
label: this.$tr('catalog'),
170170
to: this.catalogLink,
171171
badgeValue: 0,
172-
analyticsLabel: 'PUBLIC'
172+
analyticsLabel: 'PUBLIC',
173173
});
174174
175175
tabs.push({
176176
id: CHANNEL_SETS,
177177
label: this.$tr('channelSets'),
178178
to: this.channelSetLink,
179179
badgeValue: 0,
180-
analyticsLabel: 'CHANNEL_SETS'
180+
analyticsLabel: 'CHANNEL_SETS',
181181
});
182182
183183
return tabs;
@@ -292,7 +292,6 @@
292292
this.updateTabTitle(title);
293293
}
294294
},
295-
296295
},
297296
$trs: {
298297
channelSets: 'Collections',
@@ -350,4 +349,4 @@
350349
height: 100%;
351350
}
352351
353-
</style>
352+
</style>

‎contentcuration/contentcuration/frontend/shared/views/SidePanelModal/index.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<div
2727
class="header-content"
2828
:style="{
29-
flexDirection: headerFlexDirection,
29+
flexDirection: headerFlexDirection,
3030
}"
3131
>
3232
<div style="overflow: hidden">
@@ -110,7 +110,7 @@
110110
default: null,
111111
validator: value => ['left', 'right'].includes(value),
112112
},
113-
113+
114114
/* Optionally override the default width of the side panel with valid CSS value */
115115
sidePanelWidth: {
116116
type: String,

‎contentcuration/contentcuration/frontend/shared/views/SkipNavigationLink.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,4 @@
8686
}
8787
}
8888
89-
</style>
89+
</style>

‎contentcuration/contentcuration/frontend/shared/views/StudioNavigation.vue‎

Lines changed: 37 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,15 @@
1010
>
1111
<SkipNavigationLink />
1212
<header>
13-
14-
1513
<KToolbar
1614
type="clear"
1715
:style="[
1816
{
19-
overflowX: 'hidden',
17+
overflowX: 'hidden',
2018
backgroundColor: $themeTokens.appBar,
2119
height: '56px',
2220
},
23-
containerStyles
21+
containerStyles,
2422
]"
2523
:raised="false"
2624
>
@@ -73,24 +71,22 @@
7371
"
7472
>
7573
<KIconButton
76-
:disabled=true
74+
:disabled="true"
7775
icon="person"
7876
color="black"
7977
/>
80-
<span
81-
class="mx-2 notranslate subheading"
82-
>
78+
<span class="mx-2 notranslate subheading">
8379
{{ user.first_name }}
8480
</span>
8581
<KIconButton
86-
:disabled=true
82+
:disabled="true"
8783
icon="dropdown"
8884
color="black"
8985
/>
9086

9187
<KDropdownMenu
9288
:options="userMenuItems"
93-
:hasIcons=true
89+
:hasIcons="true"
9490
@select="handleUserMenuSelect"
9591
/>
9692
</button>
@@ -107,34 +103,33 @@
107103
"
108104
>
109105
<KIconButton
110-
:disabled=true
106+
:disabled="true"
111107
icon="person"
112108
color="black"
113109
/>
114110
<KIconButton
115-
:disabled=true
111+
:disabled="true"
116112
icon="dropdown"
117113
color="black"
118114
/>
119115

120116
<KDropdownMenu
121117
:options="guestMenuItems"
122-
:hasIcons=true
118+
:hasIcons="true"
123119
@select="handleGuestMenuSelect"
124120
/>
125121
</button>
126122
</template>
127123
</div>
128124
</template>
129125
</KToolbar>
130-
131126
</header>
132127

133128
<div
134129
v-if="tabs && tabs.length"
135130
:aria-label="$tr('mainNavigationLabel')"
136131
>
137-
<div
132+
<div
138133
class="studio-navigation-tabs-wrapper"
139134
:style="tabsWrapperStyles"
140135
>
@@ -144,7 +139,7 @@
144139
:style="containerStyles"
145140
>
146141
<StudioNavigationTab
147-
v-for="(tab) in tabs"
142+
v-for="tab in tabs"
148143
:key="tab.id"
149144
ref="tabRefs"
150145
:to="tab.to"
@@ -156,8 +151,8 @@
156151
</StudioNavigationTab>
157152
</div>
158153

159-
<div
160-
v-if="overflowMenuOptions.length > 0"
154+
<div
155+
v-if="overflowMenuOptions.length > 0"
161156
class="overflow-menu-container"
162157
>
163158
<KIconButton
@@ -174,7 +169,6 @@
174169
</template>
175170
</KIconButton>
176171
</div>
177-
178172
</div>
179173
</div>
180174

@@ -245,7 +239,7 @@
245239
<div>
246240
<KLogo
247241
altText="Kolibri logo"
248-
:showBackground=true
242+
:showBackground="true"
249243
:size="88"
250244
/>
251245
</div>
@@ -288,7 +282,6 @@
288282
import StudioNavigationOption from './StudioNavigationOption.vue';
289283
import StudioNavigationTab from './StudioNavigationTab.vue';
290284
291-
292285
export default {
293286
name: 'StudioNavigation',
294287
components: {
@@ -325,7 +318,7 @@
325318
resizeTimeout: null,
326319
};
327320
},
328-
321+
329322
computed: {
330323
...mapState({
331324
user: state => state.session.currentUser,
@@ -416,16 +409,16 @@
416409
},
417410
tabsWrapperStyles() {
418411
return {
419-
padding: this.windowBreakpoint <= 2 ? '0 8px' :0,
412+
padding: this.windowBreakpoint <= 2 ? '0 8px' : 0,
420413
};
421414
},
422415
},
423416
watch: {
424-
windowBreakpoint() {
425-
this.debouncedCalculateOverflow();
417+
windowBreakpoint() {
418+
this.debouncedCalculateOverflow();
426419
},
427420
tabs: {
428-
handler() {
421+
handler() {
429422
this.$nextTick(() => {
430423
this.calculateOverflow();
431424
});
@@ -436,10 +429,9 @@
436429
mounted() {
437430
this.updateToolbarWidth();
438431
window.addEventListener('resize', this.handleResize);
439-
432+
440433
this.$nextTick(() => {
441434
this.calculateOverflow();
442-
443435
});
444436
},
445437
updated() {
@@ -452,7 +444,7 @@
452444
},
453445
methods: {
454446
...mapActions(['logout']),
455-
447+
456448
calculateOverflow() {
457449
const container = this.$refs.tabsContainer;
458450
const tabComponents = this.$refs.tabRefs;
@@ -465,13 +457,12 @@
465457
this.tabs.forEach((tab, index) => {
466458
const tabEl = tabComponents[index].$el;
467459
if (!tabEl) return;
468-
const isWrapped = (tabEl.offsetTop - containerTop) > 10;
460+
const isWrapped = tabEl.offsetTop - containerTop > 10;
469461
470462
if (isWrapped) {
471463
hiddenLinks.push({
472464
label: tab.label,
473-
value: tab.to,
474-
465+
value: tab.to,
475466
});
476467
}
477468
});
@@ -485,7 +476,7 @@
485476
const originalTab = this.tabs.find(t => {
486477
return option.label.startsWith(t.label);
487478
});
488-
479+
489480
if (originalTab) {
490481
this.handleTrackClick(originalTab);
491482
}
@@ -580,7 +571,6 @@
580571
}
581572
return value;
582573
},
583-
584574
},
585575
$trs: {
586576
title: 'Kolibri Studio',
@@ -620,10 +610,10 @@
620610
}
621611
622612
.studio-navigation-title-container {
623-
white-space: nowrap;
613+
padding-inline-start: 20px;
624614
font-size: 20px;
625615
font-weight: 500;
626-
padding-inline-start: 20px;
616+
white-space: nowrap;
627617
}
628618
629619
.studio-navigation-actions {
@@ -643,27 +633,25 @@
643633
position: relative;
644634
display: flex;
645635
flex: 1;
646-
647-
flex-wrap: wrap;
648-
649-
height: 48px;
650-
overflow: hidden;
636+
flex-wrap: wrap;
637+
height: 48px;
638+
overflow: hidden;
651639
}
652640
653641
.studio-navigation-tab-item {
654-
655-
flex: 0 0 auto;
642+
flex: 0 0 auto;
656643
}
657644
658645
.overflow-menu-container {
659-
flex: 0 0 auto;
660-
padding-left: 8px;
646+
z-index: 2;
661647
display: flex;
648+
flex: 0 0 auto;
662649
align-items: center;
663650
height: 100%;
651+
padding-left: 8px;
664652
background-color: inherit;
665-
z-index: 2;
666653
}
654+
667655
.navigation-menu-header {
668656
display: flex;
669657
align-items: center;
@@ -701,13 +689,13 @@
701689
display: flex;
702690
align-items: center;
703691
padding: 4px 8px;
704-
border-radius: $radius;
705692
cursor: pointer;
693+
border-radius: $radius;
706694
transition: background-color 0.2s ease;
707-
695+
708696
&:hover {
709697
background-color: rgba(0, 0, 0, 0.1);
710698
}
711699
}
712700
713-
</style>
701+
</style>

0 commit comments

Comments
 (0)