Revert "Merge pull request from BrentleyJones/fixed_modals"

This reverts commit 7e889c4e24, reversing
changes made to e9d37f395f.
This commit is contained in:
Robin Ward 2013-07-16 13:38:01 -04:00
parent 4bfb546942
commit 2577d76e4f
2 changed files with 23 additions and 41 deletions
app/assets
javascripts/discourse/templates/modal
stylesheets/application

View file

@ -1,22 +1,16 @@
<div id='modal-outer-container'> <div class="modal-header">
<div id='modal-middle-container'> <a class="close" {{action closeModal}}><i class='icon-remove icon'></i></a>
<div id='modal-inner-container'> <h3>{{title}}</h3>
<div class="modal-header">
<a class="close" {{action closeModal}}><i class='icon-remove icon'></i></a>
<h3>{{title}}</h3>
</div>
<div id='modal-alert'></div>
{{outlet modalBody}}
{{#each errors}}
<div class="alert alert-error">
<button class="close" data-dismiss="alert">×</button>
{{this}}
</div>
{{/each}}
</div>
</div>
</div> </div>
<div id='modal-alert'></div>
{{outlet modalBody}}
{{#each errors}}
<div class="alert alert-error">
<button class="close" data-dismiss="alert">×</button>
{{this}}
</div>
{{/each}}

View file

@ -38,18 +38,14 @@
filter: alpha(opacity=80); filter: alpha(opacity=80);
} }
#modal-outer-container { .modal {
display:table; position: fixed;
width:100%; top: 50%;
height:100%; left: 50%;
} z-index: 1050;
#modal-middle-container { overflow: auto;
display:table-cell; width: 610px;
vertical-align: middle; margin: -250px 0 0 -305px;
}
#modal-inner-container {
max-width: 610px;
margin: 0 auto;
background-color: #ffffff; background-color: #ffffff;
border: 1px solid #999; border: 1px solid #999;
border: 1px solid rgba(0, 0, 0, 0.3); border: 1px solid rgba(0, 0, 0, 0.3);
@ -60,14 +56,6 @@
box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
background-clip: padding-box; background-clip: padding-box;
} }
.modal {
position: fixed;
top: 0;
width: 100%;
height: 100%;
z-index: 1050;
overflow: auto;
}
.modal.fade { .modal.fade {
-webkit-transition: opacity .3s linear, top .3s ease-out; -webkit-transition: opacity .3s linear, top .3s ease-out;
transition: opacity .3s linear, top .3s ease-out; transition: opacity .3s linear, top .3s ease-out;