From 2218acdc3bd3de87a2d9ff688b11f3bf66752e5d Mon Sep 17 00:00:00 2001 From: James Allen Date: Wed, 23 Jul 2014 11:26:45 +0100 Subject: [PATCH 1/3] Add close buttons to modals --- .../web/app/views/project/list/modals.jade | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) 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') From 134ea6f3dfd6a9659961fdc9c182910638a809f7 Mon Sep 17 00:00:00 2001 From: James Allen Date: Wed, 23 Jul 2014 12:03:13 +0100 Subject: [PATCH 2/3] Add retina logo --- services/web/public/img/logo.png | Bin 8327 -> 1747 bytes services/web/public/img/logo@2x.png | Bin 0 -> 3678 bytes .../public/stylesheets/components/navbar.less | 9 ++++++++- 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 services/web/public/img/logo@2x.png diff --git a/services/web/public/img/logo.png b/services/web/public/img/logo.png index 5ecceead1e46c685e0b1d9a5d9c8119da13d71eb..3c256411433d9855e3edb2ce20fd62ef63e9f58b 100644 GIT binary patch delta 1728 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 wxrfV!Z literal 0 HcmV?d00001 diff --git a/services/web/public/stylesheets/components/navbar.less b/services/web/public/stylesheets/components/navbar.less index 6b765f0b14..b93ea3a806 100755 --- a/services/web/public/stylesheets/components/navbar.less +++ b/services/web/public/stylesheets/components/navbar.less @@ -371,11 +371,18 @@ .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(-webkit-min-device-pixel-ratio: 2) { + .navbar-brand { + background-image: url('/img/logo@2x.png'); + } } .navbar-text { From 50748069f8dc2d35fac63dd17101070450b1d2d4 Mon Sep 17 00:00:00 2001 From: James Allen Date: Wed, 23 Jul 2014 12:09:11 +0100 Subject: [PATCH 3/3] Don't just use webkit retina detection: --- .../web/public/stylesheets/components/navbar.less | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/services/web/public/stylesheets/components/navbar.less b/services/web/public/stylesheets/components/navbar.less index b93ea3a806..23158c29d4 100755 --- a/services/web/public/stylesheets/components/navbar.less +++ b/services/web/public/stylesheets/components/navbar.less @@ -378,11 +378,16 @@ padding: 0; width: 135px; } - - @media(-webkit-min-device-pixel-ratio: 2) { - .navbar-brand { - background-image: url('/img/logo@2x.png'); - } + @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 {