Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign

This commit is contained in:
Henry Oswald
2014-07-24 14:06:33 +01:00
4 changed files with 24 additions and 6 deletions
@@ -4,6 +4,7 @@ block vars
- var suppressNavbar = true
- var suppressFooter = true
- var suppressDefaultJs = true
- var suppressSystemMessages = true
block content
.editor(ng-controller="IdeController")
+1 -1
View File
@@ -18,7 +18,7 @@ block content
.content.content-alt(ng-controller="ProjectPageController")
.container
.row
.col-md-2.col-xs-3
aside.col-md-2.col-xs-3
include ./list/side-bar
.col-md-10.col-xs-9
@@ -109,11 +109,11 @@
.row.row-spaced
.col-xs-12
.card.card-thin
.card.card-thin.project-list-card
ul.list-unstyled.project-list.structured-list(
select-all-list,
ng-if="projects.length > 0",
max-height="windowHeight - 290",
max-height="projectListHeight - 25",
ng-cloak
)
li.container-fluid