Skip to content
This repository was archived by the owner on May 1, 2020. It is now read-only.

Commit 7c2fb59

Browse files
committed
fix(error): safari css fixes
1 parent 53d6e30 commit 7c2fb59

File tree

5 files changed

+35
-11
lines changed

5 files changed

+35
-11
lines changed

bin/ion-dev.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bin/ion-dev.js

+9-7
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,15 @@ window.IonicDevServer = {
6464
c.push(' </div>');
6565
c.push('</div>');
6666

67-
c.push('<div class="ion-diagnostic">');
68-
c.push(' <div class="ion-diagnostic-masthead">');
69-
c.push(' <div class="ion-diagnostic-header">Runtime Error</div>');
70-
c.push(' <div class="ion-diagnostic-message">' + err.message + '</div>');
67+
c.push('<div class="ion-diagnostics-content">');
68+
c.push(' <div class="ion-diagnostic">');
69+
c.push(' <div class="ion-diagnostic-masthead">');
70+
c.push(' <div class="ion-diagnostic-header">Runtime Error</div>');
71+
c.push(' <div class="ion-diagnostic-message">' + err.message + '</div>');
72+
c.push(' </div>');
73+
c.push(' <div class="ion-diagnostic-stack-header">Stack</div>');
74+
c.push(' <div class="ion-diagnostic-stack">' + err.stack + '</div>');
7175
c.push(' </div>');
72-
c.push(' <div class="ion-diagnostic-stack-header">Stack</div>');
73-
c.push(' <div class="ion-diagnostic-stack">' + err.stack + '</div>');
7476
c.push('</div>');
7577

7678
this.buildUpdate({
@@ -264,7 +266,7 @@ window.IonicDevServer = {
264266
systemInfoEle = document.createElement('div');
265267
systemInfoEle.id = 'ion-diagnostics-system-info';
266268
systemInfoEle.innerHTML = IonicDevServerConfig.systemInfo.join('\n');
267-
diagnosticsEle.appendChild(systemInfoEle);
269+
diagnosticsEle.querySelector('.ion-diagnostics-content').appendChild(systemInfoEle);
268270
}
269271
}
270272
}

src/dev-client/sass/_diagnostics.scss

+7-1
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,16 @@
2929
background-color: $background-color;
3030

3131
box-sizing: border-box;
32-
overflow: auto;
32+
overflow: hidden;
3333
user-select: auto;
3434
}
3535

36+
.ion-diagnostics-content {
37+
overflow-x: hidden;
38+
overflow-y: scroll;
39+
-webkit-overflow-scrolling: touch;
40+
}
41+
3642
#ion-diagnostics .ion-diagnostic {
3743
margin: 20px;
3844
border: 1px solid $diagnostics-border;

src/dev-client/sass/_header.scss

+14-2
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,40 @@
1010
}
1111

1212
.ion-diagnostics-header-content {
13+
display: -webkit-flex;
1314
display: flex;
15+
1416
overflow: hidden;
1517

18+
-webkit-flex-direction: row;
1619
flex-direction: row;
20+
21+
-webkit-align-items: center;
1722
align-items: center;
23+
24+
-webkit-justify-content: space-between;
1825
justify-content: space-between;
1926

2027
width: 100%;
2128
min-height: 44px;
2229
}
2330

2431
.ion-diagnostics-header-inner {
32+
-webkit-flex: 1;
2533
flex: 1;
34+
35+
display: -webkit-flex;
2636
display: flex;
37+
2738
padding: 0 20px;
2839
font-size: 20px;
2940
}
3041

3142
.ion-diagnostics-buttons {
32-
flex: 0;
33-
padding: 0 0 0 20px;
43+
display: -webkit-flex;
3444
display: flex;
45+
46+
padding: 0 0 0 20px;
3547
}
3648

3749
#ion-diagnostic-close {

src/logger/logger-diagnostics.ts

+4
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,8 @@ export function getDiagnosticsHtmlContent(buildDir: string, includeDiagnosticsHt
190190
</div>
191191
`);
192192

193+
c.push(`<div class="ion-diagnostics-content">`);
194+
193195
if (includeDiagnosticsHtml) {
194196
c.push(includeDiagnosticsHtml);
195197
}
@@ -203,6 +205,8 @@ export function getDiagnosticsHtmlContent(buildDir: string, includeDiagnosticsHt
203205
}
204206
}
205207

208+
c.push(`</div>`);
209+
206210
return c.join('\n');
207211
}
208212

0 commit comments

Comments
 (0)