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 branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign

Browse source
This commit is contained in:
Henry Oswald 2014-07-15 12:15:15 +01:00
commit ef4b7f7036
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/views/project/editor.jade
View file

@ -61,7 +61,7 @@ block content
include ./editor/track-changes include ./editor/track-changes
.ui-layout-east .ui-layout-east
include ./editor/chat //- include ./editor/chat
script(type="text/ng-template", id="genericMessageModalTemplate") script(type="text/ng-template", id="genericMessageModalTemplate")
.modal-header .modal-header

18
services/web/app/views/project/editor/header.jade
View file

@ -50,12 +50,12 @@ header.toolbar.toolbar-header(ng-cloak, ng-hide="state.loading")
tooltip-placement="bottom" tooltip-placement="bottom"
) )
i.fa.fa-fw.fa-history i.fa.fa-fw.fa-history
a.btn.btn-full-height( //- a.btn.btn-full-height(
href, //- href,
tooltip="Chat", //- tooltip="Chat",
tooltip-placement="bottom", //- tooltip-placement="bottom",
ng-class="{ active: ui.chatOpen }", //- ng-class="{ active: ui.chatOpen }",
ng-click="toggleChat()", //- ng-click="toggleChat()",
ng-controller="ChatButtonController" //- ng-controller="ChatButtonController"
) //- )
i.fa.fa-fw.fa-comment //- i.fa.fa-fw.fa-comment