Skip to content

Commit b8e61b4

Browse files
authored
chore: fixed git determination and fixed no skin css issues (#7089)
1 parent 6970c3a commit b8e61b4

File tree

3 files changed

+67
-1
lines changed

3 files changed

+67
-1
lines changed

src/node/utils/Settings.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ const parseSettings = (settingsFilename: string, isSettings: boolean) => {
135135
export const getGitCommit = () => {
136136
let version = '';
137137
try {
138-
let rootPath = settings.root;
138+
let rootPath = absolutePaths.findEtherpadRoot();
139139
if (fs.lstatSync(`${rootPath}/.git`).isFile()) {
140140
rootPath = fs.readFileSync(`${rootPath}/.git`, 'utf8');
141141
rootPath = rootPath.split(' ').pop()?.trim() ?? '';

src/static/skins/no-skin/index.css

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,59 @@
66
#editbar LI {border:1px solid #d5d5d5;}
77
from pad.css
88
*/
9+
#button {
10+
font-size: 90%;
11+
width: 100%;
12+
position: unset;
13+
}
14+
15+
button[type="submit"], input[type="text"] {
16+
position: unset;
17+
}
18+
19+
button[type="submit"] {
20+
width: auto;
21+
}
22+
23+
#label {
24+
display: none;
25+
}
26+
27+
28+
#padname {
29+
max-width: 80%;
30+
}
31+
32+
33+
34+
#inner {
35+
max-width: 400px;
36+
}
37+
38+
39+
body {
40+
border-top: none;
41+
}
42+
43+
.body {
44+
display: grid;
45+
place-items: center;
46+
height: 100%;
47+
}
48+
49+
#wrapper {
50+
width: 100%;
51+
margin-top: 0;
52+
padding: 15px 0 15px 0;
53+
}
54+
55+
56+
form {
57+
display: flex;
58+
gap: 10px;
59+
background-color: transparent;
60+
border: none;
61+
height: 4rem;
62+
flex-direction: row;
63+
margin-top: 1rem;
64+
}

src/static/skins/no-skin/index.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,14 @@ window.customStart = () => {
44
// define your javascript here
55
// jquery is available - except index.js
66
// you can load extra scripts with $.getScript http://api.jquery.com/jQuery.getScript/
7+
const divHoldingPlaceHolderLabel = document
8+
.querySelector('[data-l10n-id="index.placeholderPadEnter"]');
9+
10+
const observer = new MutationObserver(() => {
11+
document.querySelector('#go2Name input')
12+
.setAttribute('placeholder', divHoldingPlaceHolderLabel.textContent);
13+
});
14+
15+
observer
16+
.observe(divHoldingPlaceHolderLabel, {childList: true, subtree: true, characterData: true});
717
};

0 commit comments

Comments
 (0)