Merge pull request #188 from sharelatex/as-v1-dash-link

Show link to V1 dash
This commit is contained in:
Alasdair Smith 2017-12-13 10:25:22 +00:00 committed by GitHub
commit 95b8ca5ed7
6 changed files with 44 additions and 2 deletions

View file

@ -63,6 +63,12 @@ block content
aside.project-list-sidebar.col-md-2.col-xs-3
include ./list/side-bar
if isShowingV1Projects && settings.overleaf && settings.overleaf.host
.project-list-sidebar-v1-link.col-md-2.col-xs-3
span Want to go back to the V1 dashboard?
a.btn.btn-default(href=settings.overleaf.host + "/dash?prefer-v1-dash=1")
| Go back to V1
.project-list-main.col-md-10.col-xs-9
include ./list/notifications
include ./list/project-list

View file

@ -0,0 +1 @@
@import "app/sidebar-v1-dash-link.less";

View file

@ -57,7 +57,6 @@
}
.project-list-sidebar when (@is-overleaf) {
height: 100%;
overflow-x: hidden;
overflow-y: auto;
-ms-overflow-style: -ms-autohiding-scrollbar;

View file

@ -0,0 +1,32 @@
@v1-dash-link-height: 130px;
.project-list-sidebar {
height: calc(~"100% -" @v1-dash-link-height);
}
.project-list-sidebar-v1-link {
position: absolute;
bottom: 0;
height: @v1-dash-link-height;
background-color: @v1-dash-link-bg;
text-align: center;
display: flex;
flex-direction: column;
justify-content: center;
color: white;
}
.project-list-sidebar-v1-link a {
display: block;
margin-left: auto;
margin-right: auto;
margin-top: 12.5px;
padding-top: 0;
padding-bottom: 0;
background-color: @v1-dash-link-btn-bg;
color: #fff;
}
.project-list-sidebar-v1-link a:hover {
background-color: @v1-dash-link-btn-hover-bg;
}

View file

@ -110,6 +110,9 @@
@sidebar-active-bg : @ol-blue-gray-6;
@sidebar-hover-bg : @ol-blue-gray-4;
@sidebar-hover-text-decoration : none;
@v1-dash-link-bg : @ol-blue-gray-4;
@v1-dash-link-btn-bg : @ol-blue-gray-5;
@v1-dash-link-btn-hover-bg : @ol-blue-gray-6;
@folders-menu-margin : 0 -(@grid-gutter-width / 2);
@folders-menu-line-height : @structured-list-line-height;

View file

@ -1,4 +1,5 @@
// Core variables and mixins
@import "core/ol-variables.less";
@import "app/ol-style-guide.less";
@import "_style_includes.less";
@import "_style_includes.less";
@import "_ol_style_includes.less";