Skip to content

Commit 24914fb

Browse files
author
jleveugle
committed
fix(sidebar): user can scroll to the bottom now
1 parent 7f36914 commit 24914fb

File tree

4 files changed

+36
-33
lines changed

4 files changed

+36
-33
lines changed

packages/manager/apps/public-cloud/src/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<div class="w-100 h-100">
1313
<div class="container-fluid h-100">
1414
<div class="row h-100">
15-
<div class="col-md-2 p-0 h-100 d-flex flex-column" data-ng-if="$ctrl.shouldDisplaySidebar" style="overflow: auto; box-shadow: 0 2pt 10pt rgba(40, 89, 192, 0.25); z-index: 1;">
15+
<div class="col-md-2 p-0 h-100 d-flex flex-column" data-ng-if="$ctrl.shouldDisplaySidebar">
1616
<cloud-sidebar></cloud-sidebar>
1717
</div>
1818
<div class="h-100 position-relative" data-ng-class="{ 'col-md-10 p-0': $ctrl.shouldDisplaySidebar, 'col-md-12': !$ctrl.shouldDisplaySidebar }">

packages/manager/apps/public-cloud/src/sidebar/project-list/project-list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</div>
1414
<div class="mt-3" data-ng-if="$ctrl.projects && $ctrl.projects.length > 0">
1515
<strong class="text-white">Mes projets&nbsp;:</strong>
16-
<ul class="list-unstyled mt-2">
16+
<ul class="list-unstyled mt-2 mb-5">
1717
<li data-ng-repeat="project in $ctrl.projects track by $index">
1818
<a ui-sref="pci.projects.project({ projectId: project.project_id })" class="d-flex text-white">
1919
<span class="text-truncate" data-ng-bind="project.description"></span>

packages/manager/apps/public-cloud/src/sidebar/sidebar.html

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,40 @@
1-
<div class="px-3 py-4 w-100">
2-
<div data-ng-if="$ctrl.isLoading">
3-
<oui-skeleton size="xs"></oui-skeleton>
4-
<oui-skeleton class="mt-2" size="s"></oui-skeleton>
5-
</div>
6-
<div class="d-flex" data-ng-if="!$ctrl.isLoading && $ctrl.project">
7-
<div class="w-100 text-truncate mr-3">
8-
<h2 class="mb-0 d-inline-block" style="font-weight: 400;" data-ng-bind="$ctrl.project.description"></h2>
9-
<button class="project-copy w-100 d-flex">
10-
<span class="my-auto oui-icon oui-icon-copy-normal mr-1"></span>
11-
<span class="w-100 text-truncate" data-ng-bind="$ctrl.project.project_id"></span>
12-
</button>
1+
<div class="h-100 d-flex flex-column">
2+
<div class="px-3 py-4 w-100">
3+
<div data-ng-if="$ctrl.isLoading">
4+
<oui-skeleton size="xs"></oui-skeleton>
5+
<oui-skeleton class="mt-2" size="s"></oui-skeleton>
136
</div>
14-
<div class="my-auto">
15-
<button type="button" class="btn btn-primary rounded-circle" style="padding: 6px 13px; background-color: rgb(40, 89, 192);" data-ng-click="$ctrl.toggleProjectsList()">
16-
<span class="oui-icon oui-icon-chevron-right text-white"></span>
17-
</button>
7+
<div class="d-flex" data-ng-if="!$ctrl.isLoading && $ctrl.project">
8+
<div class="w-100 text-truncate mr-3">
9+
<h2 class="mb-0 d-inline-block" style="font-weight: 400;" data-ng-bind="$ctrl.project.description"></h2>
10+
<button class="project-copy w-100 d-flex">
11+
<span class="my-auto oui-icon oui-icon-copy-normal mr-1"></span>
12+
<span class="w-100 text-truncate" data-ng-bind="$ctrl.project.project_id"></span>
13+
</button>
14+
</div>
15+
<div class="my-auto">
16+
<button type="button" class="btn btn-primary rounded-circle" style="padding: 6px 13px; background-color: rgb(40, 89, 192);" data-ng-click="$ctrl.toggleProjectsList()">
17+
<span class="oui-icon oui-icon-chevron-right text-white"></span>
18+
</button>
19+
</div>
1820
</div>
1921
</div>
20-
</div>
21-
<div class="h-100 position-relative">
22-
<div class="position-absolute w-100"
23-
data-ng-class="{
24-
'hidden-xs': !$ctrl.isOpen,
25-
'hidden-sm': !$ctrl.isOpen
26-
}"
27-
data-sidebar-menu>
28-
</div>
22+
<div class="h-100 position-relative mb-2" style="overflow: auto;">
23+
<div class="position-absolute w-100"
24+
data-ng-class="{
25+
'hidden-xs': !$ctrl.isOpen,
26+
'hidden-sm': !$ctrl.isOpen
27+
}"
28+
data-sidebar-menu>
29+
</div>
2930

30-
<div class="oui-navbar-backdrop"
31-
aria-hidden="true"
32-
tabindex="-1"
33-
ng-class="{ 'oui-navbar-backdrop_active': !!$ctrl.isOpen }"
34-
ng-click="$ctrl.toggle()"
35-
role="button"> </div>
31+
<div class="oui-navbar-backdrop"
32+
aria-hidden="true"
33+
tabindex="-1"
34+
ng-class="{ 'oui-navbar-backdrop_active': !!$ctrl.isOpen }"
35+
ng-click="$ctrl.toggle()"
36+
role="button"> </div>
37+
</div>
3638
</div>
3739
<div data-ng-if="$ctrl.isDisplayingProjectsList" class="project-list px-3 py-4">
3840
<div class="d-flex mb-4">

packages/manager/apps/public-cloud/src/sidebar/sidebar.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ cloud-sidebar { /* stylelint-disable-line */
88
height: 100%;
99
z-index: 1;
1010
position: relative;
11+
box-shadow: 0 2pt 10pt rgba(40, 89, 192, 0.25);
1112

1213
.project-list {
1314
position: absolute;

0 commit comments

Comments
 (0)