Skip to content

Commit 2acfefc

Browse files
[pre-commit.ci lite] apply automatic fixes
1 parent 1aa499c commit 2acfefc

4 files changed

Lines changed: 32 additions & 44 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,4 +344,4 @@
344344
height: 100%;
345345
}
346346
347-
</style>
347+
</style>

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: 23 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@
1010
>
1111
<SkipNavigationLink />
1212
<header>
13-
1413
<KToolbar
1514
ref="toolbar"
1615
type="clear"
1716
:style="{
18-
overflowX: 'hidden',
17+
overflowX: 'hidden',
1918
backgroundColor: $themeTokens.appBar,
2019
height: '56px',
2120
}"
@@ -69,9 +68,7 @@
6968
icon="person"
7069
color="black"
7170
/>
72-
<span
73-
class="mx-2 subheading"
74-
>
71+
<span class="mx-2 subheading">
7572
{{ user.first_name }}
7673
</span>
7774
<KIconButton
@@ -116,7 +113,6 @@
116113
</div>
117114
</template>
118115
</KToolbar>
119-
120116
</header>
121117
<div
122118
v-if="hasTabs"
@@ -267,14 +263,12 @@
267263
@click.native="sidePanelOpen = false"
268264
/>
269265

270-
271266
<KExternalLink
272267
href="https://community.learningequality.org/c/support/studio"
273268
openInNewTab
274269
:text="$tr('giveFeedback')"
275270
@click.native="sidePanelOpen = false"
276271
/>
277-
278272
</div>
279273
</div>
280274
</template>
@@ -296,7 +290,6 @@
296290
import SidePanelModal from './SidePanelModal';
297291
import SkipNavigationLink from './SkipNavigationLink.vue';
298292
299-
300293
export default {
301294
name: 'StudioNavigation',
302295
components: {
@@ -326,7 +319,7 @@
326319
},
327320
};
328321
},
329-
322+
330323
computed: {
331324
...mapState({
332325
user: state => state.session.currentUser,
@@ -413,7 +406,7 @@
413406
},
414407
},
415408
watch: {
416-
'$route'() {
409+
$route() {
417410
this.$nextTick(() => {
418411
this.moveIndicator();
419412
});
@@ -429,7 +422,7 @@
429422
if (el) {
430423
el.addEventListener('scroll', this.checkScrollPositions);
431424
this.checkScrollPositions();
432-
425+
433426
const resizeObserver = new ResizeObserver(this.checkScrollPositions);
434427
resizeObserver.observe(el);
435428
}
@@ -559,7 +552,6 @@
559552
}
560553
return value;
561554
},
562-
563555
},
564556
$trs: {
565557
title: 'Kolibri Studio',
@@ -612,16 +604,15 @@
612604
}
613605
614606
.studio-navigation__title-container {
615-
display: block;
607+
display: block;
608+
padding-inline-start: 20px;
616609
overflow: hidden;
617-
white-space: nowrap;
618-
text-overflow: ellipsis;
619610
font-size: 20px;
620611
font-weight: 500;
621-
padding-inline-start: 20px;
612+
text-overflow: ellipsis;
613+
white-space: nowrap;
622614
}
623615
624-
625616
.studio-navigation__actions {
626617
display: flex;
627618
align-items: center;
@@ -637,51 +628,49 @@
637628
.scroll-button {
638629
position: absolute;
639630
top: 0;
631+
z-index: 5;
640632
display: flex;
641633
align-items: center;
642634
justify-content: center;
643635
height: 100%;
644-
z-index: 5;
636+
padding: 0 4px;
645637
cursor: pointer;
646638
user-select: none;
647-
padding: 0 4px;
648639
transition: background-color 0.2s ease;
649-
650-
640+
651641
&--left {
652642
left: 0;
653643
padding-right: 8px;
654644
}
655-
645+
656646
&--right {
657647
right: 0;
658648
padding-left: 8px;
659-
660649
}
661650
}
662651
663652
.studio-navigation__tabs-container {
664653
position: relative;
665654
display: flex;
666655
flex: 1;
656+
height: 48px;
667657
padding: 0 24px;
668658
overflow-x: auto;
669-
height: 48px;
670-
list-style-type: none;
671659
white-space: nowrap;
660+
list-style-type: none;
672661
scrollbar-width: none;
673662
scroll-behavior: auto;
674663
}
664+
675665
.sliding-indicator {
676666
position: absolute;
677667
bottom: 0;
678668
left: 0;
679-
height: 2px;
680-
681-
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
682-
pointer-events: none;
683669
z-index: 1;
684-
}
670+
height: 2px;
671+
pointer-events: none;
672+
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
673+
}
685674
686675
/* Side panel styles */
687676
.side-panel-header {
@@ -702,7 +691,7 @@
702691
flex-direction: column;
703692
height: 100%;
704693
}
705-
694+
706695
::v-deep .side-panel-content {
707696
padding: 0 !important;
708697
}
@@ -713,8 +702,8 @@
713702
714703
.side-panel-nav-item {
715704
display: flex;
716-
align-items: center;
717705
gap: 12px;
706+
align-items: center;
718707
width: 100%;
719708
padding: 4px 16px;
720709
cursor: pointer;
@@ -735,4 +724,4 @@
735724
font-size: 14px;
736725
}
737726
738-
</style>
727+
</style>

contentcuration/contentcuration/frontend/shared/views/StudioNavigationTab.vue

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
ref="tabElement"
66
:to="to"
77
:class="[
8-
tabClasses,
8+
tabClasses,
99
$computedClass({
1010
':active': { backgroundColor: 'rgba(0, 0, 0, 0.2)' },
11-
':focus': { ...$coreOutline, outlineOffset: 0 }
12-
})
11+
':focus': { ...$coreOutline, outlineOffset: 0 },
12+
}),
1313
]"
1414
:style="tabStyles"
1515
:aria-current="isActive ? 'page' : null"
@@ -67,7 +67,7 @@
6767
color: this.$themeTokens.text,
6868
};
6969
},
70-
70+
7171
isActive() {
7272
if (!this.to || !this.$route) return false;
7373
@@ -91,10 +91,10 @@
9191
.studio-navigation-tab {
9292
position: relative;
9393
display: flex;
94+
flex: 0 0 auto;
9495
flex-direction: column;
9596
align-items: center;
9697
justify-content: center;
97-
flex: 0 0 auto;
9898
min-width: 160px;
9999
max-width: 264px;
100100
height: 100%;
@@ -108,17 +108,16 @@
108108
text-transform: uppercase;
109109
white-space: normal;
110110
cursor: pointer;
111+
user-select: none;
111112
background: transparent;
112113
outline: none;
113-
user-select: none;
114114
transition: 0.3s cubic-bezier(0.25, 0.8, 0.5, 1);
115115
}
116116
117117
.studio-navigation-tab:not(.studio-navigation-tab--active) {
118118
opacity: 0.7;
119119
}
120120
121-
122121
.studio-navigation-tab__content {
123122
position: relative;
124123
display: flex;
@@ -143,4 +142,4 @@
143142
transition: 0.3s;
144143
}
145144
146-
</style>
145+
</style>

0 commit comments

Comments
 (0)