Skip to content

Commit 2a2c3a2

Browse files
authored
Merge pull request #444 from SolidOS/browseStyle
fix browser style
2 parents d07e9bf + bc5a308 commit 2a2c3a2

3 files changed

Lines changed: 5 additions & 22 deletions

File tree

static/browse-test.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
const goButton = dom.getElementById('goButton')
4545
const loginButtonArea = document.getElementById("loginButtonArea");
4646
const webIdArea = dom.getElementById('webId')
47-
const banner = dom.getElementById('inputArea')
47+
const banner = dom.getElementById('PageHeader')
4848
const pageHeader = dom.getElementById('PageHeader')
4949

5050
function updateHeaderOffset () {
@@ -139,12 +139,8 @@
139139

140140
<footer id="PageFooter" role="contentinfo"></footer>
141141
<style>
142-
body {
143-
padding-top: calc(var(--browse-header-offset, var(--app-header-height, 3.8rem)) + 0.35rem);
144-
}
145142
.header-mash {
146143
padding:1em !important;
147-
background-color:#ccbbbb !important;
148144
}
149145
.input-row {
150146
}

static/browse.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
const goButton = dom.getElementById('goButton')
4545
const loginButtonArea = document.getElementById("loginButtonArea");
4646
const webIdArea = dom.getElementById('webId')
47-
const banner = dom.getElementById('inputArea')
47+
const banner = dom.getElementById('PageHeader')
4848
const pageHeader = dom.querySelector('solid-panes-header')
4949

5050
function updateHeaderOffset () {
@@ -142,15 +142,11 @@
142142
</solid-ui-provider>
143143

144144
<style>
145-
body {
146-
padding-top: calc(var(--browse-header-offset, var(--app-header-height, 3.8rem)) + 0.35rem);
147-
}
148145
.outline-view {
149146
width: 100%;
150147
}
151148
.header-mash {
152149
padding:1em !important;
153-
background-color:#ccbbbb !important;
154150
}
155151
.input-row {
156152
}

webpack.config.mjs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -195,18 +195,9 @@ export default (env, args) => {
195195
}
196196
}
197197

198-
// Keep both bundle names in sync during watch/dev runs because downstream
199-
// servers and templates may reference either path.
200-
return [
201-
developmentBundle,
202-
{
203-
...developmentBundle,
204-
output: {
205-
...developmentBundle.output,
206-
filename: 'mashlib.min.js'
207-
}
208-
}
209-
]
198+
// Use a single devServer config for watch/dev runs to avoid duplicate port
199+
// conflicts in webpack-dev-server.
200+
return developmentBundle
210201
}
211202

212203
// UMD Minified, everything bundled

0 commit comments

Comments
 (0)