From 34b1f2c9c38457778b5dbc212ab89bd9936088dd Mon Sep 17 00:00:00 2001 From: Jesus Herman Date: Fri, 4 Dec 2015 17:13:12 +0100 Subject: [PATCH] modal works but height is off --- css/editor.css | 39 ++++++++++++++++++++++++++++++++-- scss/editor.scss | 1 + scss/partials/_overwrites.scss | 28 ++++++++++++------------ 3 files changed, 53 insertions(+), 15 deletions(-) diff --git a/css/editor.css b/css/editor.css index bb52cea..62529ff 100644 --- a/css/editor.css +++ b/css/editor.css @@ -323,8 +323,6 @@ a.language-selected { background: inherit; color: inherit; display: inherit; - /*font-family: inherit;*/ - /*font-size: inherit;*/ line-height: inherit; margin: inherit; padding: inherit; @@ -332,3 +330,40 @@ a.language-selected { -ms-text-size-adjust: inherit; } .toolbox-reset .collapse { display: block; } + .toolbox-reset .modal { + left: inherit; } + +/* + * Stuff we've deleted that comes from the bootstrap-combined.css file + */ +.toolbox-reset .modal { + position: fixed; + top: 10%; + left: 50%; + z-index: 1050; + width: 560px; + margin-left: -280px; + background-color: #ffffff; + border: 1px solid #999; + border: 1px solid rgba(0, 0, 0, 0.3); + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; + outline: none; } + +.toolbox-reset .modal.fade { + -webkit-transition: opacity .3s linear, top .3s ease-out; + -moz-transition: opacity .3s linear, top .3s ease-out; + -o-transition: opacity .3s linear, top .3s ease-out; + transition: opacity .3s linear, top .3s ease-out; + top: -25%; } + +.toolbox-reset .modal.fade.in { + top: 10%; + display: inherit !important; } diff --git a/scss/editor.scss b/scss/editor.scss index 99ac416..434298b 100644 --- a/scss/editor.scss +++ b/scss/editor.scss @@ -1,2 +1,3 @@ @import 'partials/legacy'; @import 'partials/overwrites'; +@import 'partials/editor'; diff --git a/scss/partials/_overwrites.scss b/scss/partials/_overwrites.scss index 14669c6..200cc99 100644 --- a/scss/partials/_overwrites.scss +++ b/scss/partials/_overwrites.scss @@ -1,16 +1,18 @@ .toolbox-reset { - background: inherit; - color: inherit; - display: inherit; - /*font-family: inherit;*/ - /*font-size: inherit;*/ - line-height: inherit; - margin: inherit; - padding: inherit; - -webkit-text-size-adjust: inherit; - -ms-text-size-adjust: inherit; + background: inherit; + color: inherit; + display: inherit; + line-height: inherit; + margin: inherit; + padding: inherit; + -webkit-text-size-adjust: inherit; + -ms-text-size-adjust: inherit; - & .collapse { - display: block; - } + .collapse { + display: block; + } + + .modal { + left: inherit; + } }