Skip to content

Commit b1d5ba6

Browse files
authored
Merge pull request #965 from cakephp/merge-4next
merge 4.next => 5.x
2 parents ed98c1f + baf5948 commit b1d5ba6

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

config/bootstrap.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,3 +223,9 @@
223223
//Inflector::rules('plural', ['/^(inflect)or$/i' => '\1ables']);
224224
//Inflector::rules('irregular', ['red' => 'redlings']);
225225
//Inflector::rules('uninflected', ['dontinflectme']);
226+
227+
// set a custom date and time format
228+
// see https://book.cakephp.org/4/en/core-libraries/time.html#setting-the-default-locale-and-format-string
229+
// and https://unicode-org.github.io/icu/userguide/format_parse/datetime/#datetime-format-syntax
230+
//\Cake\I18n\FrozenDate::setToStringFormat('dd.MM.yyyy');
231+
//\Cake\I18n\FrozenTime::setToStringFormat('dd.MM.yyyy HH:mm');

webroot/css/cake.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ th a,
104104
font-weight: bold;
105105
padding: 0 0.4rem;
106106
}
107+
.actions a:first-child {
108+
padding-left: 0;
109+
}
107110
th {
108111
white-space: nowrap;
109112
}

0 commit comments

Comments
 (0)