Fixed some cross browser flexbox popup issues

Set min height for poor IE & safari flexbox support.
Fixes #105.
This commit is contained in:
Dan Brown 2016-09-03 10:32:14 +01:00
parent 23e014cb25
commit b14e9fc619
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
4 changed files with 34 additions and 6 deletions

View File

@ -134,17 +134,24 @@ $(function () {
$('.popup-close').click(function() {
$(this).closest('.overlay').fadeOut(240);
});
$('.overlay').click(function(event) {
if (!$(event.target).hasClass('overlay')) return;
$(this).fadeOut(240);
});
// Prevent markdown display link click redirect
$('.markdown-display').on('click', 'a', function(event) {
event.preventDefault();
window.open($(this).attr('href'));
});
// Detect IE for css
if(navigator.userAgent.indexOf('MSIE')!==-1
|| navigator.appVersion.indexOf('Trident/') > 0
|| navigator.userAgent.indexOf('Safari') !== -1){
$('body').addClass('flexbox-support');
}
});
// Page specific items

View File

@ -16,6 +16,10 @@
display: none;
}
.popup-body-wrap {
display: flex;
}
.popup-body {
background-color: #FFF;
max-height: 90%;
@ -39,6 +43,10 @@
}
}
//body.ie .popup-body {
// min-height: 100%;
//}
.corner-button {
position: absolute;
top: 0;
@ -50,19 +58,28 @@
}
.popup-header, .popup-footer {
display: block;
display: block !important;
position: relative;
height: 40px;
flex: none !important;
.popup-title {
color: #FFF;
padding: 8px $-m;
}
}
body.flexbox-support #entity-selector-wrap .popup-body .form-group {
height: 444px;
min-height: 444px;
}
#entity-selector-wrap .popup-body .form-group {
margin: 0;
}
//body.ie #entity-selector-wrap .popup-body .form-group {
// min-height: 60vh;
//}
.image-manager-body {
min-height: 60vh;
min-height: 70vh;
}
#image-manager .dropzone-container {

View File

@ -29,6 +29,10 @@ body.flexbox {
flex: 1;
}
//body.ie .flex-child > div {
// flex: 1 0 0px;
//}
/** Rules for all columns */
div[class^="col-"] img {
max-width: 100%;

View File

@ -4,7 +4,7 @@
<div class="popup-header primary-background">
<div class="popup-title">Image Select</div>
<button class="popup-close neg button">x</button>
<button class="popup-close neg corner-button button">x</button>
</div>
<div class="flex-fill image-manager-body">
@ -31,7 +31,7 @@
<img ng-src="@{{image.thumbs.gallery}}" ng-attr-alt="@{{image.title}}" ng-attr-title="@{{image.name}}">
<div class="image-meta">
<span class="name" ng-bind="image.name"></span>
<span class="date">Uploaded @{{ getDate(image.created_at) | date:'mediumDate' }}</span>
<span class="date">Uploaded @{{ getDate(image.created_at) }}</span>
</div>
</div>
</div>
@ -70,7 +70,7 @@
<div class="clearfix">
<form class="float left" ng-submit="deleteImage($event)">
<button class="button neg"><i class="zmdi zmdi-delete"></i></button>
<button class="button icon neg"><i class="zmdi zmdi-delete"></i></button>
</form>
<button class="button pos anim fadeIn float right" ng-show="selectedImage" ng-click="selectButtonClick()">
<i class="zmdi zmdi-square-right"></i>Select Image