javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove modal max-width, closes #824

Browse Source
This commit is contained in:
Adam Bradley
2014-03-18 14:47:36 -05:00
parent 33b93924a4
commit 5d663a61cc
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
js/ext/angular/test/modal.html
View File

@@ -11,7 +11,11 @@
</head>
<body>
<ion-pane ng-controller="AppCtrl">
<ion-header-bar type="bar-positive" title="'Contacts'" right-buttons="contactsRightButtons">
<ion-header-bar class="bar-positive" title="Contacts">
<h1 class="title">Modal</h1>
<div class="buttons">
<button class="button" ng-click="modal.show()">Modal</button>
</div>
</ion-header-bar>
<ion-content has-header="true">
<ion-list>
@@ -70,15 +74,6 @@
{ name: 'Barney Calhoun' },
{ name: 'Lamarr the Headcrab' },
];
$scope.contactsRightButtons = [
{
type: 'button-icon',
content: '<i class="icon ion-compose"></i>',
tap: function(e) {
$scope.openModal();
}
}
];
$scope.openModal = function() {
$scope.modal.show();
};

5
scss/_modal.scss
View File

@@ -25,10 +25,8 @@
top: 0;
z-index: $z-index-modal;
overflow: hidden;
min-height: 100%;
width: 100%;
background-color: $modal-bg-color;
}
@@ -42,7 +40,6 @@
left: $modal-inset-mode-left;
overflow: visible;
min-height: $modal-inset-mode-min-height;
max-width: $modal-inset-mode-max-width;
width: (100% - $modal-inset-mode-left - $modal-inset-mode-right);
}
@@ -57,4 +54,4 @@
.modal {
pointer-events: auto;
}
}
}

1
scss/_variables.scss
View File

@@ -529,7 +529,6 @@ $modal-inset-mode-right: 20% !default;
$modal-inset-mode-bottom: 20% !default;
$modal-inset-mode-left: 20% !default;
$modal-inset-mode-min-height: 240px !default;
$modal-inset-mode-max-width: 768px !default;
// Grids