github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2227 from overleaf/ns-title-rename-overlap

Browse source 
fix title rename overlap with online collaborators

GitOrigin-RevId: ccb5065a73e3e8e4079d14e029d57c302f9fc0cb
This commit is contained in:
Simon Detheridge 2019-10-18 10:32:35 +01:00 committed by sharelatex
parent 2c147f575c
commit 123f74da72
4 changed files with 40 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
services/web/app/views/project/editor/header.pug
View file

@ -69,11 +69,10 @@ header.toolbar.toolbar-header.toolbar-with-labels(
i.fa.fa-pencil i.fa.fa-pencil
.toolbar-right .toolbar-right
span.online-users( .online-users(
ng-show="onlineUsersArray.length > 0" ng-if="onlineUsersArray.length < 4"
ng-controller="OnlineUsersController" ng-controller="OnlineUsersController"
) )
span(ng-if="onlineUsersArray.length < 4")
span.online-user( span.online-user(
ng-repeat="user in onlineUsersArray", ng-repeat="user in onlineUsersArray",
ng-style="{ 'background-color': 'hsl({{ getHueForUserId(user.user_id) }}, 70%, 50%)' }", ng-style="{ 'background-color': 'hsl({{ getHueForUserId(user.user_id) }}, 70%, 50%)' }",
@ -84,14 +83,18 @@ header.toolbar.toolbar-header.toolbar-with-labels(
ng-click="gotoUser(user)" ng-click="gotoUser(user)"
) {{ userInitial(user) }} ) {{ userInitial(user) }}
span.dropdown(dropdown, ng-if="onlineUsersArray.length >= 4") .online-users.dropdown(
dropdown
ng-if="onlineUsersArray.length >= 4"
ng-controller="OnlineUsersController"
)
span.online-user.online-user-multi( span.online-user.online-user-multi(
dropdown-toggle, dropdown-toggle,
tooltip=translate('connected_users'), tooltip=translate('connected_users'),
tooltip-placement="left" tooltip-placement="left"
) )
strong {{ onlineUsersArray.length }} strong {{ onlineUsersArray.length }}
i.fa.fa-fw.fa-user i.fa.fa-fw.fa-users
ul.dropdown-menu.pull-right ul.dropdown-menu.pull-right
li.dropdown-header #{translate('connected_users')} li.dropdown-header #{translate('connected_users')}
li(ng-repeat="user in onlineUsersArray") li(ng-repeat="user in onlineUsersArray")

2
services/web/public/stylesheets/app/editor.less
View file

@ -179,7 +179,6 @@
.project-name { .project-name {
.name { .name {
display: inline-block; display: inline-block;
max-width: 250px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
vertical-align: top; vertical-align: top;
@ -194,6 +193,7 @@
text-align: center; text-align: center;
padding: 6px; padding: 6px;
font-weight: 700; font-weight: 700;
max-width: 500px;
} }
a.rename { a.rename {
visibility: hidden; visibility: hidden;

5
services/web/public/stylesheets/app/editor/online-users.less
View file

@ -1,6 +1,8 @@
@online-user-color: rgb(0, 170, 255); @online-user-color: rgb(0, 170, 255);
.online-users { .online-users {
display: flex;
.online-user { .online-user {
background-color: @online-user-color; background-color: @online-user-color;
width: 24px; width: 24px;
@ -19,9 +21,12 @@
min-width: 24px; min-width: 24px;
padding-left: 8px; padding-left: 8px;
padding-right: 5px; padding-right: 5px;
display: flex;
align-items: center;
} }
.dropdown-menu { .dropdown-menu {
margin-right: 8px;
a { a {
// Override toolbar link styles // Override toolbar link styles
display: block; display: block;

9
services/web/public/stylesheets/app/editor/toolbar.less
View file

@ -118,15 +118,6 @@
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
// At large screen sizes, center relative to the viewport
@media (min-width: @screen-lg-min) {
width: 300px;
position: absolute;
top: 0;
left: 50%;
margin-left: -150px;
}
} }
&.toolbar-header { &.toolbar-header {