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

Update dropshadows to the latest Kolibri Design System guidelines #12630

Merged
merged 21 commits into from
Oct 22, 2024
Merged

Update dropshadows to the latest Kolibri Design System guidelines #12630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
08d5421
style: update drop shadow depths.
Suraj-kumar00 Sep 3, 2024
efdd4ac
Merge branch 'learningequality:develop' into develop
Suraj-kumar00 Sep 3, 2024
caf7e09
Merge branch 'learningequality:develop' into develop
Suraj-kumar00 Sep 5, 2024
1636aee
fix: updated the dropshadow.
Suraj-kumar00 Sep 11, 2024
43eff95
Merge branch 'learningequality:develop' into develop
Suraj-kumar00 Sep 12, 2024
ad848fe
Merge branch 'develop' of github.com:learningequality/kolibri into de…
Suraj-kumar00 Sep 12, 2024
969544d
Merge branch 'develop' of https://github.com/Suraj-kumar00/kolibri in…
Suraj-kumar00 Sep 12, 2024
397ed96
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Sep 13, 2024
1982ee7
Update index.vue
Suraj-kumar00 Oct 5, 2024
9e6615b
Update TopicsPanelModal.vue
Suraj-kumar00 Oct 5, 2024
867323e
Update index.vue
Suraj-kumar00 Oct 5, 2024
a727a66
Update HybridLearningLessonCard.vue
Suraj-kumar00 Oct 5, 2024
c10696c
Merge remote-tracking branch 'upstream/develop' into develop
Suraj-kumar00 Oct 10, 2024
4e28876
Update TopicsPanelModal.vue
Suraj-kumar00 Oct 19, 2024
e4da1fb
Update index.vue
Suraj-kumar00 Oct 19, 2024
2dbced3
Update index.vue
Suraj-kumar00 Oct 19, 2024
db1c398
Merge branch 'learningequality:develop' into develop
Suraj-kumar00 Oct 21, 2024
6154db0
Update TopicsPanelModal.vue
Suraj-kumar00 Oct 21, 2024
07a2871
Update index.vue
Suraj-kumar00 Oct 21, 2024
d5bcf45
Update index.vue
Suraj-kumar00 Oct 21, 2024
ecabfde
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Oct 21, 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
2 changes: 1 addition & 1 deletion kolibri/core/assets/src/views/AppBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@
}

.points-popover {
@extend %dropshadow-4dp;
@extend %dropshadow-6dp;
Suraj-kumar00 marked this conversation as resolved.
Show resolved Hide resolved

position: absolute;
right: 50px;
Expand Down
2 changes: 1 addition & 1 deletion kolibri/core/assets/src/views/BottomAppBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
@import '~kolibri-design-system/lib/styles/definitions';

.bottom {
@extend %dropshadow-8dp;
@extend %dropshadow-6dp;

position: fixed;
right: 0;
Expand Down
2 changes: 1 addition & 1 deletion kolibri/core/assets/src/views/BottomNavigationBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
@import '~kolibri-design-system/lib/styles/definitions';

.bottom-bar {
@extend %dropshadow-4dp;
@extend %dropshadow-2dp;

position: fixed;
right: 0;
Expand Down
2 changes: 1 addition & 1 deletion kolibri/core/assets/src/views/CoreBanner.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
@import '~kolibri-design-system/lib/styles/definitions';

.banner {
@extend %dropshadow-16dp;
@extend %dropshadow-6dp;

position: relative;
width: 100%;
Expand Down
4 changes: 2 additions & 2 deletions kolibri/core/assets/src/views/CorePage/AppBarPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,13 +204,13 @@
@import '~kolibri-design-system/lib/styles/definitions';

.app-bar {
@extend %dropshadow-8dp;
@extend %dropshadow-2dp;

width: 100%;
}

.android-nav-bottom-bar {
@extend %dropshadow-4dp;
@extend %dropshadow-1dp;

position: fixed;
right: 0;
Expand Down
2 changes: 1 addition & 1 deletion kolibri/core/assets/src/views/SideNav.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@
}

.side-nav {
@extend %dropshadow-16dp;
@extend %dropshadow-6dp;

position: fixed;
top: 0;
Expand Down
2 changes: 1 addition & 1 deletion kolibri/core/assets/src/views/SkipNavigationLink.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
}

.skip-nav-link a {
@extend %dropshadow-4dp;
@extend %dropshadow-2dp;

position: absolute;
left: -1000px;
Expand Down
2 changes: 1 addition & 1 deletion kolibri/core/assets/src/views/sortable/DragContainer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
@import '~kolibri-design-system/lib/styles/definitions';

/deep/ .draggable-mirror {
@extend %dropshadow-8dp;
@extend %dropshadow-6dp;

z-index: 8;
cursor: grabbing;
Expand Down
2 changes: 1 addition & 1 deletion kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,7 @@
border-radius: 2px;

.ease:hover {
@extend %dropshadow-8dp;
@extend %dropshadow-6dp;
@extend %md-decelerate-func;

transition: all $core-time;
Expand Down
2 changes: 1 addition & 1 deletion ...ugins/coach/assets/src/views/plan/LessonResourceSelectionPage/LessonContentCard/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@

&:hover,
&:focus {
@extend %dropshadow-8dp;
@extend %dropshadow-6dp;
}
}

Expand Down
2 changes: 1 addition & 1 deletion kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@
border-radius: 2px;

.ease:hover {
@extend %dropshadow-8dp;
@extend %dropshadow-6dp;
@extend %md-decelerate-func;

transition: all $core-time;
Expand Down
2 changes: 1 addition & 1 deletion kolibri/plugins/learn/assets/src/views/CardList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
@extend %dropshadow-1dp;

&:hover {
@extend %dropshadow-8dp;
@extend %dropshadow-6dp;
}
}

Expand Down
2 changes: 1 addition & 1 deletion kolibri/plugins/learn/assets/src/views/ChannelCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
transition: box-shadow $core-time ease;

&:hover {
@extend %dropshadow-8dp;
@extend %dropshadow-6dp;
}

&:focus {
Expand Down
2 changes: 1 addition & 1 deletion kolibri/plugins/learn/assets/src/views/CompletionModal/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@
}

.modal {
@extend %dropshadow-16dp;
@extend %dropshadow-6dp;
@extend %momentum-scroll;

position: absolute;
Expand Down
2 changes: 1 addition & 1 deletion kolibri/plugins/learn/assets/src/views/HybridLearningContentCard/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
@extend %dropshadow-1dp;

&:hover {
@extend %dropshadow-8dp;
@extend %dropshadow-6dp;
}
}

Expand Down
2 changes: 1 addition & 1 deletion kolibri/plugins/learn/assets/src/views/HybridLearningLessonCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
@extend %dropshadow-1dp;

&:hover {
@extend %dropshadow-4dp;
@extend %dropshadow-6dp;
}
}

Expand Down
2 changes: 1 addition & 1 deletion kolibri/plugins/learn/assets/src/views/LibraryPage/UnPinnedDevices.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
transition: box-shadow $core-time ease;

&:hover {
@extend %dropshadow-8dp;
@extend %dropshadow-6dp;
}

&:focus {
Expand Down
2 changes: 1 addition & 1 deletion kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@
transition: box-shadow $core-time ease;

&:hover {
@extend %dropshadow-8dp;
@extend %dropshadow-6dp;
}

&:focus {
Expand Down
2 changes: 1 addition & 1 deletion kolibri/plugins/learn/assets/src/views/StorageNotification.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
@import '~kolibri-design-system/lib/styles/definitions';

.banner {
@extend %dropshadow-16dp;
@extend %dropshadow-6dp;

position: relative;
width: 100%;
Expand Down
5 changes: 4 additions & 1 deletion kolibri/plugins/learn/assets/src/views/TopicsPage/TopicsPanelModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,19 +101,22 @@

<style lang="scss" scoped>

@import '~kolibri-design-system/lib/styles/definitions';

.drawer-panel {
padding-bottom: 60px;
}

.side-panel {
@extend %dropshadow-2dp;
Suraj-kumar00 marked this conversation as resolved.
Show resolved Hide resolved

position: fixed;
top: 60px;
left: 0;
height: 100%;
padding: 24px 24px 0;
overflow-y: scroll;
font-size: 14px;
box-shadow: 0 3px 3px 0 #00000040;
}

/*
Expand Down
2 changes: 1 addition & 1 deletion kolibri/plugins/learn/assets/src/views/cards/CardLink.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
transition: box-shadow $core-time ease;

&:hover {
@extend %dropshadow-8dp;
@extend %dropshadow-6dp;
}
}

Expand Down
4 changes: 3 additions & 1 deletion kolibri/plugins/pdf_viewer/assets/src/views/SideBar/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,11 @@

<style scoped lang="scss">

@import '~kolibri-design-system/lib/styles/definitions';

.pdf-sidebar {
overflow-y: auto;
box-shadow: inset -1px 2px 8px rgba(0, 0, 0, 0.16);
@extend %dropshadow-2dp;
Suraj-kumar00 marked this conversation as resolved.
Show resolved Hide resolved
}

.tab:focus-visible {
Expand Down
4 changes: 2 additions & 2 deletions kolibri/plugins/user_auth/assets/src/views/AuthBase.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@
}

.box {
@extend %dropshadow-16dp;
@extend %dropshadow-6dp;

position: relative;
z-index: 1;
Expand Down Expand Up @@ -409,7 +409,7 @@
}

.footer-cell {
@extend %dropshadow-8dp;
@extend %dropshadow-6dp;

padding: 16px;
}
Expand Down
5 changes: 4 additions & 1 deletion packages/kolibri-common/components/SearchFiltersPanel/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,19 +366,22 @@

<style lang="scss" scoped>

@import '~kolibri-design-system/lib/styles/definitions';

.drawer-panel {
padding-bottom: 60px;
}

.side-panel {
@extend %dropshadow-2dp;

position: fixed;
top: 60px;
left: 0;
height: 100%;
padding: 24px 24px 0;
overflow-y: scroll;
font-size: 14px;
box-shadow: 0 3px 3px 0 #00000040;
}

/*
Expand Down