release: v2.7.2

liriliri · Dec 7, 2022 · bfc5b82 · bfc5b82
1 parent 7165dc6
commit bfc5b82
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.7.2 (7 Dec 2022)
+
+* fix: luna modal style
+
 ## 2.7.1 (7 Dec 2022)
 
 * fix: remove debug log

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eruda",
-  "version": "2.7.1",
+  "version": "2.7.2",
   "description": "Console for Mobile Browsers",
   "main": "eruda.js",
   "browserslist": [
@@ -71,7 +71,7 @@
     "luna-console": "^1.1.2",
     "luna-data-grid": "^0.2.1",
     "luna-dom-viewer": "^1.0.2",
-    "luna-modal": "^0.1.1",
+    "luna-modal": "^0.1.2",
     "luna-notification": "^0.1.4",
     "luna-object-viewer": "^0.2.2",
     "node-sass": "^7.0.1",

diff --git a/src/DevTools/DevTools.js b/src/DevTools/DevTools.js
@@ -16,6 +16,7 @@ import extend from 'licia/extend'
 import evalCss from '../lib/evalCss'
 import { isDarkTheme } from '../lib/themes'
 import LunaNotification from 'luna-notification'
+import LunaModal from 'luna-modal'
 import { classPrefix as c } from '../lib/util'
 
 export default class DevTools extends Emitter {
@@ -45,6 +46,7 @@ export default class DevTools extends Emitter {
     this._appendTpl()
     this._initNavBar()
     this._initNotification()
+    this._initModal()
     this._bindEvent()
   }
   show() {
@@ -227,6 +229,7 @@ export default class DevTools extends Emitter {
         </div>
         <div class="tools"></div>
         <div class="notification"></div>
+        <div class="modal"></div>
       </div>
       `)
     )
@@ -249,6 +252,9 @@ export default class DevTools extends Emitter {
       }
     )
   }
+  _initModal() {
+    LunaModal.setContainer(this._$el.find(c('.modal')).get(0))
+  }
   _bindEvent() {
     const $resizer = this._$el.find(c('.resizer'))
     const $navBar = this._$el.find(c('.nav-bar'))

diff --git a/src/eruda.js b/src/eruda.js
@@ -194,9 +194,6 @@ export default {
     const className = 'eruda-style-container'
     const $el = this._$el
 
-    evalCss.container = document.head
-    evalCss(require('luna-modal/luna-modal.css'))
-
     if (this._shadowRoot) {
       evalCss.container = this._shadowRoot
       evalCss(':host { all: initial }')
@@ -212,6 +209,7 @@ export default {
       require('luna-notification/luna-notification.css') + 
       require('luna-data-grid/luna-data-grid.css') +
       require('luna-dom-viewer/luna-dom-viewer.css') +
+      require('luna-modal/luna-modal.css') +
       require('./style/style.scss') +
       require('./style/icon.css')
     )

diff --git a/src/style/luna.scss b/src/style/luna.scss
@@ -249,13 +249,11 @@
 
 .luna-modal-button-group {
   .luna-modal-secondary {
-    overflow: hidden;
     border-color: var(--border);
     color: var(--foreground);
     background: var(--background);
   }
   .luna-modal-primary {
-    overflow: hidden;
     background: var(--accent);
   }
   .luna-modal-button {