Skip to content

Commit

Permalink
Merge pull request #1852 from CodeNow/hotfix-loading-error
Browse files Browse the repository at this point in the history
We no longer show the error modal by default
  • Loading branch information
Myztiq authored Oct 17, 2016
2 parents 7250efe + ff9d44f commit c240685
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
1 change: 1 addition & 0 deletions client/assets/styles/scss/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
@import "modals/modals-sheets";

// modal specific
@import "modals/modals-backdrop-error";
@import "modals/modals-backup";
@import "modals/modals-branch-setup";
@import "modals/modals-confirm-setup";
Expand Down
7 changes: 7 additions & 0 deletions client/assets/styles/scss/modals/modals-backdrop-error.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.modal-backdrop-error {
display: none;

&.in {
display: flex;
}
}
13 changes: 11 additions & 2 deletions layout.jade
Original file line number Diff line number Diff line change
Expand Up @@ -150,16 +150,25 @@ html(

.spinner-wrapper.spinner-md.spinner-purple.spinner-backdrop.spinner-fixed.in(
ng-if = "!dataApp"
ng-include = "'spinner'"
)
svg.spinner(
viewbox = '0 0 16 16'
)
circle.path(
cx = '8'
cy = '8'
r = '7'
stroke-linecap = 'round'
)

//- page
.layout-wrapper(
ui-view
)

//- error modal
.modal-backdrop.modal-backdrop-error.in(
.modal-backdrop.modal-backdrop-error(
ng-class = "{'in': dataApp.data.modalError.data.in}"
ng-click = "$event.stopPropagation()"
ng-if = "dataApp.data.modalError.data.in"
)
Expand Down

0 comments on commit c240685

Please sign in to comment.