diff --git a/services/web/app/views/project/list/modals.jade b/services/web/app/views/project/list/modals.jade index 5f0cac85a2..ca5f6fbbe3 100644 --- a/services/web/app/views/project/list/modals.jade +++ b/services/web/app/views/project/list/modals.jade @@ -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') diff --git a/services/web/public/img/logo.png b/services/web/public/img/logo.png index 5ecceead1e..3c25641143 100644 Binary files a/services/web/public/img/logo.png and b/services/web/public/img/logo.png differ diff --git a/services/web/public/img/logo@2x.png b/services/web/public/img/logo@2x.png new file mode 100644 index 0000000000..cf9969c627 Binary files /dev/null and b/services/web/public/img/logo@2x.png differ diff --git a/services/web/public/stylesheets/components/navbar.less b/services/web/public/stylesheets/components/navbar.less index 6b765f0b14..23158c29d4 100755 --- a/services/web/public/stylesheets/components/navbar.less +++ b/services/web/public/stylesheets/components/navbar.less @@ -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 {