Skip to content

Commit

Permalink
Merge pull request #12630 from Suraj-kumar00/develop
Browse files Browse the repository at this point in the history
Update dropshadows to the latest Kolibri Design System guidelines
  • Loading branch information
AlexVelezLl authored Oct 22, 2024
2 parents 39f41b8 + ecabfde commit 3e417b6
Show file tree
Hide file tree
Showing 24 changed files with 34 additions and 26 deletions.
2 changes: 1 addition & 1 deletion kolibri/core/assets/src/views/AppBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@
}
.points-popover {
@extend %dropshadow-4dp;
@extend %dropshadow-6dp;
position: absolute;
right: 50px;
Expand Down
2 changes: 1 addition & 1 deletion kolibri/core/assets/src/views/BottomAppBar.vue
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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;
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
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
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;
}
.tab:focus-visible {
Expand Down
4 changes: 2 additions & 2 deletions kolibri/plugins/user_auth/assets/src/views/AuthBase.vue
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
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

0 comments on commit 3e417b6

Please sign in to comment.