From 28de886bb19a8a8b6962d3d01e401426fd225174 Mon Sep 17 00:00:00 2001 From: Keivan Beigi Date: Wed, 26 Jun 2013 16:45:05 -0700 Subject: [PATCH] fixed less prefixer path fixed modals --- UI/Content/Backgrid/paginator.less | 5 ++--- UI/Content/base.less | 2 +- UI/Content/menu.less | 2 +- UI/Series/Delete/DeleteSeriesView.js | 2 +- UI/Series/series.less | 2 +- UI/Settings/Quality/Profile/DeleteView.js | 2 +- UI/Shared/Modal/Region.js | 12 ++++-------- UI/Shared/Styles/card.less | 2 +- 8 files changed, 12 insertions(+), 17 deletions(-) diff --git a/UI/Content/Backgrid/paginator.less b/UI/Content/Backgrid/paginator.less index 369e333f9..dfa222dd0 100644 --- a/UI/Content/Backgrid/paginator.less +++ b/UI/Content/Backgrid/paginator.less @@ -1,11 +1,11 @@ -@import "/content/prefixer"; +@import "../prefixer"; .backgrid-paginator { text-align : center; box-sizing : border-box; border-top : none; .box-sizing(border-box); - .border-radios(0 0 4px 4px); + .border-radius(0 0 4px 4px); ul { display : inline-block; @@ -25,7 +25,6 @@ text-decoration : none; } } - .active { i, span { background-color : #f5f5f5; diff --git a/UI/Content/base.less b/UI/Content/base.less index bada8b3b0..8f61632ea 100644 --- a/UI/Content/base.less +++ b/UI/Content/base.less @@ -8,7 +8,7 @@ @import "menu"; @import "backgrid/backgrid"; @import "../shared/styles/clickable"; -@import "/content/prefixer"; +@import "prefixer"; .progress { width : 125px; diff --git a/UI/Content/menu.less b/UI/Content/menu.less index aeacc6c22..9034e5117 100644 --- a/UI/Content/menu.less +++ b/UI/Content/menu.less @@ -1,4 +1,4 @@ -@import "/content/prefixer"; +@import "prefixer"; #main-menu-region { i:before { diff --git a/UI/Series/Delete/DeleteSeriesView.js b/UI/Series/Delete/DeleteSeriesView.js index 4a7c4e532..f4c0b76fa 100644 --- a/UI/Series/Delete/DeleteSeriesView.js +++ b/UI/Series/Delete/DeleteSeriesView.js @@ -24,7 +24,7 @@ define( data: { 'deleteFiles': deleteFiles }, wait: true }).done(function () { - App.modalRegion.close(); + App.modalRegion.closeModal(); }); } }); diff --git a/UI/Series/series.less b/UI/Series/series.less index 70f63a575..4748f73d9 100644 --- a/UI/Series/series.less +++ b/UI/Series/series.less @@ -1,6 +1,6 @@ @import "../Shared/Styles/card.less"; @import "../Shared/Styles/clickable.less"; -@import "/content/prefixer"; +@import "../Content/prefixer"; .series-item { padding-bottom : 30px; diff --git a/UI/Settings/Quality/Profile/DeleteView.js b/UI/Settings/Quality/Profile/DeleteView.js index 1d0576bb9..33b6c6df8 100644 --- a/UI/Settings/Quality/Profile/DeleteView.js +++ b/UI/Settings/Quality/Profile/DeleteView.js @@ -17,7 +17,7 @@ define( this.model.destroy({ wait: true }).done(function () { - App.modalRegion.close(); + App.modalRegion.closeModal(); }); } }); diff --git a/UI/Shared/Modal/Region.js b/UI/Shared/Modal/Region.js index c2b2a8e2b..e48ad946b 100644 --- a/UI/Shared/Modal/Region.js +++ b/UI/Shared/Modal/Region.js @@ -1,9 +1,10 @@ 'use strict'; define( [ + '$', 'marionette', 'bootstrap' - ], function (Marionette) { + ], function ($, Marionette) { return Marionette.Region.extend({ el: '#modal-region', @@ -30,14 +31,9 @@ define( 'backdrop': 'static'}); }, - - onClose: function(){ - this.closeModal(); - }, - - closeModal: function () { - this.$el.modal('hide'); + $(this.el).modal('hide'); + this.reset(); } }); diff --git a/UI/Shared/Styles/card.less b/UI/Shared/Styles/card.less index ef1122d69..9cfc0904c 100644 --- a/UI/Shared/Styles/card.less +++ b/UI/Shared/Styles/card.less @@ -1,4 +1,4 @@ -@import "/Content/prefixer"; +@import "../../Content/prefixer"; .card() { margin : 10px;