Merge pull request #965 from cakephp/merge-4next

merge 4.next => 5.x
cakephp · Sep 6, 2023 · b1d5ba6 · b1d5ba6
2 parents ed98c1f + baf5948
commit b1d5ba6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/config/bootstrap.php b/config/bootstrap.php
@@ -223,3 +223,9 @@
 //Inflector::rules('plural', ['/^(inflect)or$/i' => '\1ables']);
 //Inflector::rules('irregular', ['red' => 'redlings']);
 //Inflector::rules('uninflected', ['dontinflectme']);
+
+// set a custom date and time format
+// see https://book.cakephp.org/4/en/core-libraries/time.html#setting-the-default-locale-and-format-string
+// and https://unicode-org.github.io/icu/userguide/format_parse/datetime/#datetime-format-syntax
+//\Cake\I18n\FrozenDate::setToStringFormat('dd.MM.yyyy');
+//\Cake\I18n\FrozenTime::setToStringFormat('dd.MM.yyyy HH:mm');
diff --git a/webroot/css/cake.css b/webroot/css/cake.css
@@ -104,6 +104,9 @@ th a,
     font-weight: bold;
     padding: 0 0.4rem;
 }
+.actions a:first-child {
+    padding-left: 0;
+}
 th {
     white-space: nowrap;
 }