Skip to content

Commit f0aa608

Browse files
committed
Merge branch '6.2' of https://github.com/WoltLab/WCF into 6.2
2 parents e5fb1e6 + 6b9b261 commit f0aa608

File tree

8 files changed

+13
-53
lines changed

8 files changed

+13
-53
lines changed

com.woltlab.wcf/package.xml

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -50,51 +50,6 @@
5050
<instruction type="script">acp/install_com.woltlab.wcf_step2.php</instruction>
5151
</instructions>
5252

53-
<instructions type="update" fromversion="6.1.*">
54-
<!--
55-
tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
56-
acp/database/update_com.woltlab.wcf_6.2_step1.php \
57-
acp/database/update_com.woltlab.wcf_6.2_step2.php \
58-
acp/update_com.woltlab.wcf_6.2_backgroundJob.php \
59-
acp/update_com.woltlab.wcf_6.2_checkSystemRequirements.php \
60-
acp/update_com.woltlab.wcf_6.2_contactOptions.php \
61-
acp/update_com.woltlab.wcf_6.2_styleVariables.php
62-
-->
63-
<instruction type="file">files_pre_check.tar</instruction>
64-
65-
<instruction type="script">acp/update_com.woltlab.wcf_6.2_checkSystemRequirements.php</instruction>
66-
67-
<!-- The following scripts must be executed in this particular order. -->
68-
<instruction type="script">acp/update_com.woltlab.wcf_6.2_backgroundJob.php</instruction>
69-
<instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.2_step1.php</instruction>
70-
<instruction type="script">acp/update_com.woltlab.wcf_6.2_contactOptions.php</instruction>
71-
<instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.2_step2.php</instruction>
72-
73-
<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.2_styleVariables.php</instruction>
74-
75-
<instruction type="acpTemplate">acptemplates_update.tar</instruction>
76-
<instruction type="file">files_update.tar</instruction>
77-
<instruction type="template">templates_update.tar</instruction>
78-
79-
<instruction type="option"/>
80-
<instruction type="script">acp/update_com.woltlab.wcf_6.2_option.php</instruction>
81-
82-
<instruction type="language" run="standalone"/>
83-
84-
<instruction type="objectTypeDefinition"/>
85-
<instruction type="objectType"/>
86-
<instruction type="page"/>
87-
<instruction type="acpMenu"/>
88-
<instruction type="acpTemplateDelete"/>
89-
<instruction type="clipboardAction"/>
90-
<instruction type="coreObject"/>
91-
<instruction type="fileDelete"/>
92-
<instruction type="templateDelete"/>
93-
<instruction type="userGroupOption"/>
94-
<instruction type="userMenu"/>
95-
<instruction type="userOption"/>
96-
</instructions>
97-
9853
<instructions type="update" fromversion="6.2.0 Alpha 3">
9954
<instruction type="file">files_update.tar</instruction>
10055
<instruction type="template">templates_update.tar</instruction>

wcfsetup/install/files/js/3rdParty/ckeditor/ckeditor5.bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wcfsetup/install/files/js/3rdParty/ckeditor/translations/da.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wcfsetup/install/files/js/3rdParty/ckeditor/translations/ja.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wcfsetup/install/files/js/WoltLabSuite.Core.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wcfsetup/install/files/js/WoltLabSuite.Core.tiny.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wcfsetup/install/files/style/ckeditor5.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wcfsetup/install/files/style/ui/entryCardList.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ html[data-color-scheme="dark"] {
6060
transform: translateX(100%);
6161
opacity: 0;
6262
}
63+
64+
#content:has(:focus-visible) .entryCardList__item__buttons {
65+
transform: none;
66+
opacity: 1;
67+
}
6368
}
6469

6570
html[data-color-scheme="dark"] .entryCardList__item__buttons {

0 commit comments

Comments
 (0)