mirror of https://github.com/rancher/ui.git
bug fixes
This commit is contained in:
parent
204ec50375
commit
47b9871fdd
|
|
@ -4,7 +4,7 @@ import C from 'ui/utils/constants';
|
|||
import ModalBase from 'lacsso/components/modal-base';
|
||||
|
||||
export default ModalBase.extend(NewOrEdit, {
|
||||
classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'],
|
||||
classNames: ['lacsso', 'modal-container', 'full-width-modal'],
|
||||
access: Ember.inject.service(),
|
||||
primaryResource: Ember.computed.alias('model.account'),
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import ModalBase from 'lacsso/components/modal-base';
|
|||
import NewServiceAlias from 'ui/mixins/new-service-alias';
|
||||
|
||||
export default ModalBase.extend(NewServiceAlias, {
|
||||
classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3', 'modal-logs'],
|
||||
classNames: ['lacsso', 'modal-container', 'full-width-modal', 'modal-logs'],
|
||||
originalModel : Ember.computed.alias('modalService.modalOpts'),
|
||||
allServicesService: Ember.inject.service('all-services'),
|
||||
editing: true,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import NewOrEdit from 'ui/mixins/new-or-edit';
|
|||
import ModalBase from 'lacsso/components/modal-base';
|
||||
|
||||
export default ModalBase.extend(NewOrEdit, {
|
||||
classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'],
|
||||
classNames: ['lacsso', 'modal-container', 'full-width-modal'],
|
||||
originalModel: Ember.computed.alias('modalService.modalOpts'),
|
||||
model: null,
|
||||
clone: null,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import NewBalancer from 'ui/mixins/new-balancer';
|
|||
import ModalBase from 'lacsso/components/modal-base';
|
||||
|
||||
export default ModalBase.extend(NewBalancer, {
|
||||
classNames : ['lacsso', 'modal-container', 'span-6', 'offset-3', 'modal-logs'],
|
||||
classNames : ['lacsso', 'modal-container', 'full-width-modal', 'modal-logs'],
|
||||
originalModel : Ember.computed.alias('modalService.modalOpts'),
|
||||
|
||||
actions: {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import NewOrEdit from 'ui/mixins/new-or-edit';
|
|||
import ModalBase from 'lacsso/components/modal-base';
|
||||
|
||||
export default ModalBase.extend(NewOrEdit, {
|
||||
classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'],
|
||||
classNames: ['lacsso', 'modal-container', 'full-width-modal'],
|
||||
originalModel: Ember.computed.alias('modalService.modalOpts'),
|
||||
editing: true,
|
||||
model: null,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import NewOrEdit from 'ui/mixins/new-or-edit';
|
|||
import ModalBase from 'lacsso/components/modal-base';
|
||||
|
||||
export default ModalBase.extend(NewOrEdit, {
|
||||
classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'],
|
||||
classNames: ['lacsso', 'modal-container', 'full-width-modal'],
|
||||
originalModel: Ember.computed.alias('modalService.modalOpts'),
|
||||
editing: true,
|
||||
isService: false,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import Ember from 'ember';
|
|||
import ModalBase from 'lacsso/components/modal-base';
|
||||
|
||||
export default ModalBase.extend(NewOrEdit, {
|
||||
classNames : ['lacsso', 'modal-container', 'span-6', 'offset-3', 'modal-logs'],
|
||||
classNames : ['lacsso', 'modal-container', 'full-width-modal', 'modal-logs'],
|
||||
originalModel : Ember.computed.alias('modalService.modalOpts'),
|
||||
existing: Ember.computed.alias('originalModel'),
|
||||
editing: true,
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import NewOrEdit from 'ui/mixins/new-or-edit';
|
|||
import ModalBase from 'lacsso/components/modal-base';
|
||||
|
||||
export default ModalBase.extend(NewOrEdit, ManageLabels, {
|
||||
classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'],
|
||||
classNames: ['lacsso', 'modal-container', 'full-width-modal'],
|
||||
originalModel: Ember.computed.alias('modalService.modalOpts'),
|
||||
model: null,
|
||||
editing: true,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import NewOrEdit from 'ui/mixins/new-or-edit';
|
|||
import ModalBase from 'lacsso/components/modal-base';
|
||||
|
||||
export default ModalBase.extend(NewOrEdit, {
|
||||
classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'],
|
||||
classNames: ['lacsso', 'modal-container', 'full-width-modal'],
|
||||
originalModel: Ember.computed.alias('modalService.modalOpts'),
|
||||
error: null,
|
||||
credentials: null,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import NewOrEdit from 'ui/mixins/new-or-edit';
|
|||
import ModalBase from 'lacsso/components/modal-base';
|
||||
|
||||
export default ModalBase.extend(NewOrEdit, {
|
||||
classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'],
|
||||
classNames: ['lacsso', 'modal-container', 'full-width-modal'],
|
||||
originalModel: Ember.computed.alias('modalService.modalOpts'),
|
||||
service: null,
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import NewOrEdit from 'ui/mixins/new-or-edit';
|
|||
import ModalBase from 'lacsso/components/modal-base';
|
||||
|
||||
export default ModalBase.extend(NewOrEdit, {
|
||||
classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'],
|
||||
classNames: ['lacsso', 'modal-container', 'full-width-modal'],
|
||||
originalModel: Ember.computed.alias('modalService.modalOpts'),
|
||||
editing: true,
|
||||
model: null,
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@ import Ember from 'ember';
|
|||
import ModalBase from 'lacsso/components/modal-base';
|
||||
|
||||
export default ModalBase.extend({
|
||||
classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3', 'generic', 'about'],
|
||||
classNames: ['lacsso', 'modal-container', 'generic', 'about', 'full-width-modal'],
|
||||
closeWithOutsideClick: true,
|
||||
settings: Ember.inject.service(),
|
||||
|
||||
actions: {
|
||||
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import Ember from 'ember';
|
|||
import ModalBase from 'lacsso/components/modal-base';
|
||||
|
||||
export default ModalBase.extend({
|
||||
classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3', 'modal-logs'],
|
||||
classNames: ['lacsso', 'modal-container', 'full-width-modal', 'modal-logs'],
|
||||
requestObject : Ember.computed.alias('modalService.modalOpts.requestObject'),
|
||||
responseObject : Ember.computed.alias('modalService.modalOpts.responseObject'),
|
||||
requestJSON : null,
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@ import Ember from 'ember';
|
|||
import ModalBase from 'lacsso/components/modal-base';
|
||||
|
||||
export default ModalBase.extend({
|
||||
classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3', 'modal-shell'],
|
||||
classNames: ['lacsso', 'modal-container', 'full-width-modal', 'modal-shell'],
|
||||
originalModel: Ember.computed.alias('modalService.modalOpts'),
|
||||
});
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import Ember from 'ember';
|
|||
import ModalBase from 'lacsso/components/modal-base';
|
||||
|
||||
export default ModalBase.extend({
|
||||
classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3', 'modal-logs'],
|
||||
classNames: ['lacsso', 'modal-container', 'full-width-modal', 'modal-logs'],
|
||||
originalModel: Ember.computed.alias('modalService.modalOpts'),
|
||||
|
||||
});
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import Ember from 'ember';
|
|||
import ModalBase from 'lacsso/components/modal-base';
|
||||
|
||||
export default ModalBase.extend({
|
||||
classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'],
|
||||
classNames: ['lacsso', 'modal-container', 'full-width-modal'],
|
||||
originalModel: Ember.computed.alias('modalService.modalOpts.originalModel'),
|
||||
backupTargets : Ember.computed.alias('modalService.modalOpts.backupTargets'),
|
||||
editing : false,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import NewOrEdit from 'ui/mixins/new-or-edit';
|
|||
import ModalBase from 'lacsso/components/modal-base';
|
||||
|
||||
export default ModalBase.extend(NewOrEdit, {
|
||||
classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'],
|
||||
classNames: ['lacsso', 'modal-container', 'full-width-modal'],
|
||||
originalModel: Ember.computed.alias('modalService.modalOpts'),
|
||||
settings: Ember.inject.service(),
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import Ember from 'ember';
|
|||
import ModalBase from 'lacsso/components/modal-base';
|
||||
|
||||
export default ModalBase.extend({
|
||||
classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'],
|
||||
classNames: ['lacsso', 'modal-container', 'full-width-modal'],
|
||||
originalModel: Ember.computed.alias('modalService.modalOpts'),
|
||||
editing : false,
|
||||
clone : null,
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import Ember from 'ember';
|
|||
import ModalBase from 'lacsso/components/modal-base';
|
||||
|
||||
export default ModalBase.extend({
|
||||
classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3', 'modal-logs'],
|
||||
classNames: ['lacsso', 'modal-container', 'full-width-modal', 'modal-logs'],
|
||||
exception: Ember.computed.alias('modalService.modalOpts'),
|
||||
actions: {
|
||||
dismiss: function() {
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@ import Ember from 'ember';
|
|||
import ModalBase from 'lacsso/components/modal-base';
|
||||
|
||||
export default ModalBase.extend({
|
||||
classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3', 'modal-shell'],
|
||||
classNames: ['lacsso', 'modal-container', 'full-width-modal', 'modal-shell'],
|
||||
originalModel: Ember.computed.alias('modalService.modalOpts'),
|
||||
});
|
||||
|
|
|
|||
|
|
@ -15,7 +15,9 @@ export default Ember.Component.extend({
|
|||
modalService: Ember.inject.service('modal'),
|
||||
actions: {
|
||||
showAbout() {
|
||||
this.get('modalService').toggleModal('modal-about');
|
||||
this.get('modalService').toggleModal('modal-about', {
|
||||
closeWithOutsideClick: true
|
||||
});
|
||||
},
|
||||
|
||||
composeDownload(os) {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,14 @@
|
|||
.lacsso.modal-overlay.modal-open .modal-container.modal-logs {
|
||||
max-height: 100%;
|
||||
}
|
||||
|
||||
.lacsso {
|
||||
&.full-width-modal {
|
||||
&.modal-container {
|
||||
width: calc(100% - 40px);
|
||||
max-width: 990px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@
|
|||
"forever-agent": "^0.6.1",
|
||||
"glob": "^5.0.3",
|
||||
"http-proxy": "^1.11.1",
|
||||
"lacsso": "0.0.13",
|
||||
"lacsso": "^0.0.13",
|
||||
"liquid-fire": "0.26.1",
|
||||
"loader.js": "^4.0.1",
|
||||
"shell-quote": "^1.4.3",
|
||||
|
|
|
|||
Loading…
Reference in New Issue