Merge pull request #11719 from overleaf/em-survey-sidebar

Make survey notification the width of the dashboard sidebar

GitOrigin-RevId: 754ec21692505107e683369628a2b5481e7cef9a
This commit is contained in:
Eric Mc Sween
2023-02-08 09:45:21 -05:00
committed by Copybot
parent 6ca86168b1
commit 204e7a0c87
3 changed files with 8 additions and 10 deletions

View File

@@ -87,7 +87,7 @@ function ProjectListPageContent() {
</div> </div>
</Col> </Col>
</Row> </Row>
<div className="project-list-sidebar-survey-wrapper"> <div className="project-list-sidebar-survey-wrapper visible-xs">
<SurveyWidget /> <SurveyWidget />
</div> </div>
<div className="visible-xs mt-1"> <div className="visible-xs mt-1">

View File

@@ -1,6 +1,7 @@
import NewProjectButton from '../new-project-button' import NewProjectButton from '../new-project-button'
import SidebarFilters from './sidebar-filters' import SidebarFilters from './sidebar-filters'
import AddAffiliation, { useAddAffiliation } from '../add-affiliation' import AddAffiliation, { useAddAffiliation } from '../add-affiliation'
import SurveyWidget from '../survey-widget'
import { usePersistedResize } from '../../../../shared/hooks/use-resize' import { usePersistedResize } from '../../../../shared/hooks/use-resize'
function Sidebar() { function Sidebar() {
@@ -25,6 +26,9 @@ function Sidebar() {
{showAddAffiliationWidget && <hr />} {showAddAffiliationWidget && <hr />}
<AddAffiliation /> <AddAffiliation />
</aside> </aside>
<div className="project-list-sidebar-survey-wrapper">
<SurveyWidget />
</div>
</div> </div>
<div <div
{...getHandleProps({ {...getHandleProps({

View File

@@ -1,8 +1,6 @@
@project-list-sidebar-wrapper-flex: 0 0 15%; @project-list-sidebar-wrapper-flex: 0 0 15%;
.project-list-react { .project-list-react {
overflow-x: hidden;
body > .content& { body > .content& {
padding-top: @header-height; padding-top: @header-height;
padding-bottom: 0; padding-bottom: 0;
@@ -46,7 +44,7 @@
height: 100%; height: 100%;
.project-list-sidebar-react { .project-list-sidebar-react {
height: 100%; flex-grow: 1;
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
-ms-overflow-style: -ms-autohiding-scrollbar; -ms-overflow-style: -ms-autohiding-scrollbar;
@@ -81,6 +79,7 @@
.project-list-main-react { .project-list-main-react {
max-width: 100%; max-width: 100%;
overflow-x: hidden;
padding: @content-margin-vertical @grid-gutter-width / 2; padding: @content-margin-vertical @grid-gutter-width / 2;
} }
@@ -724,11 +723,8 @@
} }
.project-list-sidebar-survey-wrapper { .project-list-sidebar-survey-wrapper {
position: fixed; position: sticky;
z-index: 1;
bottom: 0; bottom: 0;
left: 0;
width: 15%;
.alert-info-alt { .alert-info-alt {
font-size: @font-size-small; font-size: @font-size-small;
@@ -741,9 +737,7 @@
@media (max-width: @screen-xs-max) { @media (max-width: @screen-xs-max) {
position: static; position: static;
display: block;
margin-top: @margin-sm; margin-top: @margin-sm;
width: initial;
.alert-info-alt { .alert-info-alt {
font-size: unset; font-size: unset;