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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

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

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa56a27
Your commit message
yashhash2 Dec 14, 2024
a62b93d
Your commit message
yashhash2 Dec 17, 2024
48eaf03
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Dec 19, 2024
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
189 changes: 167 additions & 22 deletions kolibri/plugins/learn/assets/src/views/LibraryPage/OtherLibraries.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<KGrid
gutter="0"
class="grid"
style="margin-bottom:-25px ;"
>
<KGridItem
:layout12="{ span: 6 }"
Expand All @@ -13,13 +14,8 @@
<h1 :style="{ marginLeft: '-8px' }">
{{ injectedtr('otherLibraries') }}
</h1>
</KGridItem>
<KGridItem
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing the usage of KGridItem here or the margin-left: -190px; on line 322 might have had unwanted effects on the icon and string shown when searching for other libraries:

searchingLibraries

I also noticed that when the window is large, the No other libraries around you right now and Showing all available libraries around you descriptions are no longer positioned underneath the Other Libraries section header:

noOtherLibraries
availableLibraries

I think any changes you make to the connection state when there are no libraries should also be compared with the other two connection state descriptions to make sure there are no regressions.

:layout12="{ span: 6 }"
:layout8="{ span: 4 }"
:layout4="{ span: 4 }"
>
<div class="sync-status">

<div class="sync-status" >
<span
v-show="searchingOtherLibraries"
data-test="searching"
Expand All @@ -43,7 +39,7 @@
icon="wifi"
class="wifi-svg"
/>
</span>
</span>
&nbsp;&nbsp;
<span data-test="showing-all-label">{{ injectedtr('showingAllLibraries') }}</span>
&nbsp;&nbsp;
Expand All @@ -55,17 +51,23 @@
/>
</span>
</span>
<div class="a" v-show="!searchingOtherLibraries && !devicesWithChannelsExist" >
<span
v-show="!searchingOtherLibraries && !devicesWithChannelsExist"

data-test="no-other"
>
<span>
<KIcon icon="disconnected" />
</span>

> <div >
<span >
<KIcon class="disco" icon="disconnected" />
</span >
</div>
&nbsp;&nbsp;
<span data-test="no-other-label">{{ injectedtr('noOtherLibraries') }}</span>
<div class="b">
<span data-test="no-other-label">{{ injectedtr('noOtherLibraries') }}</span>
</div>
</span>
</div>
</div>
</KGridItem>
</KGrid>

Expand Down Expand Up @@ -233,16 +235,20 @@

<style lang="scss" scoped>

.sync-status {
display: flex;
justify-content: flex-end;
margin: 30px 0 10px;
.sync-status {
display: flex;
justify-content: flex-end;
margin-top: 30px;
margin-left: -300px;

span {

span {
display: inline-flex;
vertical-align: bottom;
}

display: inline-block;
vertical-align: bottom;
margin-left: -8px;
}
}

.wifi-svg {
top: 0;
Expand All @@ -251,10 +257,149 @@

.grid {
margin: 8px;

}

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

@media screen and (max-width: 600px) {
.sync-status {
display: flex;
justify-content: flex-end;
margin-top:-20px ;
margin-left: 0px;
padding-left: 10px;
margin-bottom: 25px;
min-width: 400px;
max-width: 400px;

.a {
display: flex; // Use flex to align items if needed
align-items: center; // Center items vertically
margin-top: -5px; // Add some margin for spacing
margin-left: 100px;
margin-right: 13px;
}
.disco {
margin-left: 1000px;
margin-right: -640px; // Space between icon and text
}

.b {
margin-left: 500px;
padding-left: 00px;
min-width: 200px;
}

span {
margin-left: -191px;
margin-bottom:10px ;
display: inline-flex;
word-wrap: break-word;


vertical-align: bottom;
margin-top: 10px;
}
}
.wifi-svg {
top: 0;
transform: scale(1.5);
margin-left: -213px;
}
}
@media screen and (min-width: 600px) and (max-width:1100px) {
.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; // Use flex to align items if needed
align-items: center; // Center items vertically
margin-top: -5px; // Add some margin for spacing
margin-left: 100px;
margin-right: 13px;
}
.disco {
margin-left: 1000px;
margin-right: -640px; // Space between icon and text
}

.b {
margin-left: 500px;
padding-left: 00px;
min-width: 200px;
}

span {
margin-left: -190px;
margin-bottom:10px ;
display: inline-flex;


vertical-align: bottom;
margin-top: 10px;
}
}
.wifi-svg {
top: 0;
transform: scale(1.5);
margin-left: -160px;
}
}

@media screen and (min-width: 1100px) {
.sync-status {
display: flex;
justify-content: flex-end;
margin-top:-20px ;
margin-left: 0px;
padding-left: 10px;
margin-bottom: 25px;
min-width: 400px;
span {
margin-left: -220px;
margin-bottom:10px ;
display: inline-flex;
padding-left: -50px;

vertical-align: bottom;
margin-top: 10px;
}
.a {
display: flex; // Use flex to align items if needed
align-items: center; // Center items vertically
margin-top: -5px; // Add some margin for spacing
margin-left: 100px;
margin-right: 50px;

}
.disco {
margin-left: 1000px;
margin-right: -610px; // Space between icon and text

}


.b {
margin-left: 500px;
padding-left: 00px;
min-width: 200px;
}
}
.wifi-svg {
top: 0;
transform: scale(1.5);
margin-left: -140px;
}

}

</style>
Loading