github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-28 15:30:59 +00: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-23 12:17:14 +01:00
commit e46bc51c67
4 changed files with 48 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
services/web/app/views/project/list/modals.jade
View file

@ -1,5 +1,10 @@
script(type='text/ng-template', id='newTagModalTemplate')
.modal-header
button.close(
type="button"
data-dismiss="modal"
ng-click="cancel()"
) ×
h3 Create New Folder
.modal-body
form(name="newTagForm", novalidate)
@ -27,6 +32,11 @@ script(type='text/ng-template', id='newTagModalTemplate')
script(type='text/ng-template', id='renameProjectModalTemplate')
.modal-header
button.close(
type="button"
data-dismiss="modal"
ng-click="cancel()"
) ×
h3 Rename Project
.modal-body
form(name="renameProjectForm", novalidate)
@ -47,6 +57,11 @@ script(type='text/ng-template', id='renameProjectModalTemplate')
script(type='text/ng-template', id='cloneProjectModalTemplate')
.modal-header
button.close(
type="button"
data-dismiss="modal"
ng-click="cancel()"
) ×
h3 Copy Project
.modal-body
form(name="cloneProjectForm", novalidate)
@ -74,6 +89,11 @@ script(type='text/ng-template', id='cloneProjectModalTemplate')
script(type='text/ng-template', id='newProjectModalTemplate')
.modal-header
button.close(
type="button"
data-dismiss="modal"
ng-click="cancel()"
) ×
h3 New Project
.modal-body
form(novalidate, name="newProjectForm")
@ -99,6 +119,11 @@ script(type='text/ng-template', id='newProjectModalTemplate')
script(type='text/ng-template', id='deleteProjectsModalTemplate')
.modal-header
button.close(
type="button"
data-dismiss="modal"
ng-click="cancel()"
) ×
h3 {{action}} Projects
.modal-body
div(ng-show="projectsToDelete.length > 0")
@ -121,6 +146,11 @@ script(type='text/ng-template', id='deleteProjectsModalTemplate')
script(type="text/ng-template", id="uploadProjectModalTemplate")
.modal-header
button.close(
type="button"
data-dismiss="modal"
ng-click="cancel()"
) ×
h3 Upload Zipped Project
.modal-body(
fine-upload
@ -139,6 +169,11 @@ script(type="text/ng-template", id="uploadProjectModalTemplate")
script(type="text/ng-template", id="userProfileModalTemplate")
.modal-header
button.close(
type="button"
data-dismiss="modal"
ng-click="done()"
) ×
h3 Your Profile
.modal-body
form(enctype='multipart/form-data', method='post')

BIN
services/web/public/img/logo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
services/web/public/img/logo@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

14
services/web/public/stylesheets/components/navbar.less
View file

@ -371,11 +371,23 @@
.navbar-brand {
background-image: url('/img/logo.png');
background-size: 135px 16px;
background-repeat: no-repeat;
height: 16px;
margin-top: 10px;
padding: 0;
width: 128px;
width: 135px;
}
@media
only screen and (-webkit-min-device-pixel-ratio: 2),
only screen and ( min--moz-device-pixel-ratio: 2),
only screen and ( -o-min-device-pixel-ratio: 2/1),
only screen and ( min-device-pixel-ratio: 2),
only screen and ( min-resolution: 192dpi),
only screen and ( min-resolution: 2dppx) {
.navbar-brand {
background-image: url('/img/logo@2x.png');
}
}
.navbar-text {