Merge remote-tracking branch 'upstream/develop' into develop

YoYoGames · Feb 2, 2024 · 74a1b08 · 74a1b08
2 parents ef7229a + c2951f4
commit 74a1b08
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/...l/contents/GameMaker_Language/GML_Reference/Asset_Management/Instances/instance_count.htm b/...l/contents/GameMaker_Language/GML_Reference/Asset_Management/Instances/instance_count.htm
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>instance_count</title>
-  <meta name="generator" content="Adobe RoboHelp 2020" />
+  <meta name="generator" content="Adobe RoboHelp 2022" />
   <link rel="stylesheet" href="../../../../assets/css/default.css" type="text/css" />
   <script src="../../../../assets/scripts/main_script.js"></script>
   <meta name="rh-authors" content="Mark Alexander" />
@@ -22,10 +22,10 @@
     }</p><p> 위의 코드는 총 인스턴스 수가 100에 도달할 때까지 &quot;obj_Star&quot; 개체의 여러 인스턴스를 만듭니다. </p><p></p><p></p><p></p><div class="footer"><div class="buttons"><div class="clear"><div style="float:left"> 뒤로: <a href="Instances.htm">인스턴스</a></div><div style="float:right"> 다음: <a href="alarm_get.htm"><span class="notranslate">alarm_get</span></a></div></div></div><h5> <span data-keyref="Copyright Notice">© Copyright YoYo Games Ltd. 2021 판권 소유</span></h5>
   </div>
   <!-- KEYWORDS
-instance_id_get
+instance_count
 -->
   <!-- TAGS
-instance_id_get
+instance_count
 -->
 </body>
 </html>
diff --git a/Manual/publish/skins/Charcoal_Grey/toc_book_closed_mobile.png b/Manual/publish/skins/Charcoal_Grey/toc_book_closed_mobile.png
diff --git a/SupportFiles/layout_fix_append.css b/SupportFiles/layout_fix_append.css
@@ -1,3 +1,11 @@
 div.topic {
 	background-color: #282828 !important;
+}
+
+body.media-landscape div.idx-holder div.Index {
+    color: #505050;
+}
+
+body.media-landscape div.glo-holder div.Glossary {
+    color: #505050;
 }