Skip to content

Commit

Permalink
Merge pull request #23 from wp-media/branch-1.5.6
Browse files Browse the repository at this point in the history
Sweet Alert + get max upload size dynamically
  • Loading branch information
jbma authored Jul 29, 2016
2 parents 67c506e + ffca70a commit 3e62534
Show file tree
Hide file tree
Showing 18 changed files with 2,101 additions and 1,041 deletions.
18 changes: 16 additions & 2 deletions assets/css/admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ body.imagify-modal-is-open {
background-color: #40b1d0 !important;
box-shadow: 0 3px 0 #338ea6 !important;
}
.imagify-sweet-alert button.cancel {
.imagify-sweet-alert button.swal2-cancel {
background: #777 !important;
box-shadow: 0 3px 0 #444 !important;
}
Expand Down Expand Up @@ -1160,8 +1160,13 @@ input[id^="imagify_sizes_"]:checked + label {
margin-top: 2em;
}
@media (max-width: 820px) {
.imagify-settings {
.imagify-settings {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
}
.imagify-main {
Expand Down Expand Up @@ -2410,9 +2415,18 @@ td.imagify-cell-filename {

/* Imagify Modal */
.imagify-modal {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: center;
-ms-flex-pack: center;
justify-content: center;
}
.js .imagify-modal {
Expand Down
2 changes: 1 addition & 1 deletion assets/css/admin.min.css

Large diffs are not rendered by default.

Loading

0 comments on commit 3e62534

Please sign in to comment.