Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes: Library - Connection state's position when there are no libraries around #11442 #12948

Merged
merged 7 commits into from
Jan 14, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
added K-grid
  • Loading branch information
yashhash2 committed Jan 1, 2025
commit 2757f3c41a7c707e5077c2e17562c17bfbcf50f2
172 changes: 46 additions & 126 deletions kolibri/plugins/learn/assets/src/views/LibraryPage/OtherLibraries.vue
Original file line number Diff line number Diff line change
@@ -4,18 +4,24 @@
<KGrid
gutter="0"
class="grid"
style="margin-bottom:-25px ;"
style="margin-bottom: -25px"
>
<KGridItem
:layout12="{ span: 6 }"
:layout8="{ span: 4 }"
:layout4="{ span: 4 }"
:layout12="{ span: 10 }"
:layout8="{ span: 6 }"
:layout4="{ span: 4}"
>
<h1 :style="{ marginLeft: '-8px' }">
{{ injectedtr('otherLibraries') }}
</h1>

<div class="sync-status" >

<KGridItem
:layout12="{ span:8 }"
:layout8="{ span:5 }"
LianaHarris360 marked this conversation as resolved.
Show resolved Hide resolved
:layout4="{span:4 }"
class="connection-status">

<div class="sync-status">
<span
v-show="searchingOtherLibraries"
data-test="searching"
@@ -32,14 +38,15 @@
<span
v-show="!searchingOtherLibraries && devicesWithChannelsExist"
data-test="showing-all"
class="otherLib"
>
<span>
<KIcon
v-if="windowIsSmall"
icon="wifi"
class="wifi-svg"
/>
</span>
</span>
&nbsp;&nbsp;
<span data-test="showing-all-label">{{ injectedtr('showingAllLibraries') }}</span>
&nbsp;&nbsp;
@@ -51,24 +58,21 @@
/>
</span>
</span>
<div class="a" v-show="!searchingOtherLibraries && !devicesWithChannelsExist" >
<span

v-show="!searchingOtherLibraries && !devicesWithChannelsExist"
data-test="no-other"

> <div >
<span >
<KIcon class="disco" icon="disconnected" />
</span >
</div>
class="noOtherLib"
>
<span>
<KIcon icon="disconnected" />
</span>
&nbsp;&nbsp;
<div class="b">
<span data-test="no-other-label">{{ injectedtr('noOtherLibraries') }}</span>
</div>
<span data-test="no-other-label">{{ injectedtr('noOtherLibraries') }}</span>
</span>
</div>
</div>
</KGridItem>
</KGridItem>
LianaHarris360 marked this conversation as resolved.
Show resolved Hide resolved

</KGrid>

<h2
@@ -98,7 +102,7 @@
class="other-libraries-grid"
>
<KGridItem
:layout12="{ span: 10 }"
:layout12="{ span: 6 }"
LianaHarris360 marked this conversation as resolved.
Show resolved Hide resolved
:layout8="{ span: 6 }"
:layout4="{ span: 2 }"
>
@@ -236,37 +240,16 @@
<style lang="scss" scoped>

.sync-status {
display: flex;
justify-content: flex-end;
margin-top: -20px;
margin-left: 0px;
padding-left: 10px;
margin-bottom: 25px;
min-width: 400px;

.a {
display: flex;
align-items: center;
margin-top: -5px;
margin-left: 100px; }

.b {
margin-left: 500px;
padding-left: 00px;
min-width: 200px;
}
.disco {
margin-left: 1000px;
}
display: flex;
justify-content: flex-end;
margin: 30px 0 0px;
LianaHarris360 marked this conversation as resolved.
Show resolved Hide resolved

span {
margin-bottom: 10px;
vertical-align: bottom;
margin-top: 10px;
display: inline-flex;
margin-left: -8px;
span {
display: inline-flex;
vertical-align: bottom;

}
}
}

.wifi-svg {
top: 0;
@@ -275,90 +258,27 @@

.grid {
margin: 8px;

}

.other-libraries-grid {
margin-left: 0.75em;
}

@media screen and (max-width: 600px) {
.sync-status {

max-width: 400px;

.a {
margin-right: 13px;
}
.disco {
margin-right: -640px;
}



span {
margin-left: -191px;
word-wrap: break-word;


}
}
.wifi-svg {

margin-left: -213px;
}
}
@media screen and (min-width: 600px) and (max-width:1100px) {
.sync-status {


.a {

margin-right: 13px;
}
.disco {
margin-right: -640px;
}


span {
margin-left: -190px;

}
}
.wifi-svg {

margin-left: -160px;
}
}

@media screen and (min-width: 1100px) {
.sync-status {

span {
margin-left: -220px;
padding-left: -50px;


}
.a {

margin-right: 50px;
.connection-status{
margin-top: -15px;
LianaHarris360 marked this conversation as resolved.
Show resolved Hide resolved
margin-bottom:20px;
padding-top: 0px;
margin-left: -8px;
margin-right: 250px;
LianaHarris360 marked this conversation as resolved.
Show resolved Hide resolved

}
.disco {
margin-right: -610px;

}



}
.wifi-svg {

margin-left: -140px;
.noOtherLib{
padding-right: 194px;
margin-top: -30px;
}

}
.otherLib{
margin-top: -30px;
margin-right: 170px;
LianaHarris360 marked this conversation as resolved.
Show resolved Hide resolved
}

</style>
</style>
Loading