Skip to content

Commit 0712567

Browse files
lonnieezelllonnieezell
authored
Merge branch 'develop' into user_guide
2 parents c83ee3e + 47dbb16 commit 0712567

File tree

575 files changed

+21188
-9787
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

575 files changed

+21188
-9787
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,5 @@ nb-configuration.xml
123123
.vscode/
124124

125125
/results/
126-
/phpunit*.xml
126+
/phpunit*.xml
127+
/.phpunit.*.cache

‎.travis.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ language: php
33
php:
44
- 7.2
55
- 7.3
6+
- 7.4
67
- nightly
78

89
matrix:
@@ -16,7 +17,7 @@ global:
1617

1718
# Recommended by Travis support
1819
sudo: required
19-
dist: trusty
20+
dist: xenial
2021
group: edge
2122

2223
env:
@@ -30,6 +31,10 @@ services:
3031
- postgresql
3132
- redis-server
3233

34+
cache:
35+
directories:
36+
- vendor
37+
3338
script:
3439
- php vendor/bin/phpunit -v
3540

‎CHANGELOG.md‎

Lines changed: 1799 additions & 0 deletions
Large diffs are not rendered by default.

‎CONTRIBUTING.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ We expect all contributions to conform to our [style guide](https://github.com/c
77
be documented (in the [user guide](https://codeigniter4.github.io/userguide/)), and unit tested (in the [test folder](https://github.com/codeigniter4/CodeIgniter4/tree/develop/tests)).
88
There is a [Contributing to CodeIgniter](./contributing/README.rst) section in the repository which describes the contribution process; this page is an overview.
99

10+
Note, we expect all code changes or bug-fixes to be accompanied by one or more tests added to our test suite to prove the code works. If pull requests are not accompanied by relevant tests, they will likely be closed. Since we are a team of volunteers, we don't have any more time to work on the framework than you do. Please make it as painless for your contributions to be included as possible. If you need help with getting tests running on your local machines, ask for help on the forums. We would be happy to help out.
11+
1012
The [Open Source Guide](https://opensource.guide/) is a good first read for those new to contributing to open source!
1113
## Issues
1214

@@ -23,7 +25,7 @@ Reporting Issues is helpful, but an even [better approach](./contributing/workfl
2325
Before we look into how to contribute to CodeIgniter4, here are some guidelines. If your Pull Requests fail
2426
to pass these guidelines, they will be declined, and you will need to re-submit
2527
when you’ve made the changes. This might sound a bit tough, but it is required
26-
for us to maintain quality of the codebase.
28+
for us to maintain the quality of the codebase.
2729

2830
### PHP Style
2931

@@ -59,7 +61,7 @@ each other and from whatever else you are doing with your repository!
5961

6062
### Signing
6163

62-
You must [GPG-sign](./contributing/signing.rst) your work, certifying that you either wrote the work or otherwise have the right to pass it on to an open source project. This is *not* just a "signed-off-by" commit, but instead, a digitally signed one.
64+
You must [GPG-sign](./contributing/signing.rst) your work, certifying that you either wrote the work or otherwise have the right to pass it on to an open-source project. This is *not* just a "signed-off-by" commit, but instead, a digitally signed one.
6365

6466
## How-to Guide
6567

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ The user guide updating and deployment is a bit awkward at the moment, but we ar
4040

4141
## Repository Management
4242

43+
CodeIgniter is developed completely on a volunteer basis. As such, please give up to 7 days
44+
for your issues to be reviewed. If you haven't heard from one of the team in that time period,
45+
feel free to leave a comment on the issue so that it gets brought back to our attention.
46+
4347
We use Github issues to track **BUGS** and to track approved **DEVELOPMENT** work packages.
4448
We use our [forum](http://forum.codeigniter.com) to provide SUPPORT and to discuss
4549
FEATURE REQUESTS.

‎admin/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,4 @@ scripts used by the release manager:
8888
are built.
8989
- The subfolders inside `admin` contain "next release" files in the case of
9090
`codeigniter4` and over-written distribution files in the other cases.
91+
- The CHANGELOG.md file is auto-generated using the [GitHub Changelog Generator](https://github.com/github-changelog-generator/github-changelog-generator)

‎admin/css/debug-toolbar/_graphic-charter.scss‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// COLORS
2+
// ========================================================================== */
3+
4+
// Themes
5+
$t-dark: #252525;
6+
$t-light: #FFFFFF;
7+
8+
// Glossy colors
9+
$g-blue: #5BC0DE;
10+
$g-gray: #434343;
11+
$g-green: #9ACE25;
12+
$g-orange: #DD8615;
13+
$g-red: #DD4814;
14+
15+
// Matt colors
16+
$m-blue: #D8EAF0;
17+
$m-gray: #DFDFDF;
18+
$m-green: #DFF0D8;
19+
$m-orange: #FDC894;
20+
$m-red: #EF9090;

‎admin/css/debug-toolbar/_mixins.scss‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// MIXINS
2+
// ========================================================================== */
3+
4+
@mixin border-radius($radius) {
5+
border-radius: $radius;
6+
-moz-border-radius: $radius;
7+
-webkit-border-radius: $radius;
8+
}
9+
@mixin box-shadow($left, $top, $radius, $color) {
10+
box-shadow: $left $top $radius $color;
11+
-moz-box-shadow: $left $top $radius $color;
12+
-webkit-box-shadow: $left $top $radius $color;
13+
}

‎admin/css/debug-toolbar/_settings.scss‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// FONT
2+
// ========================================================================== */
3+
4+
// Standard "sans-serif" font stack used by Github
5+
$base-font: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
6+
7+
// Default size, all other styles are based on this size
8+
$base-size: 16px;

‎admin/css/debug-toolbar/_theme-dark.scss‎

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
// IMPORTS
2+
// ========================================================================== */
3+
4+
// The "box-shadow" mixin uses colors
5+
@import '_mixins';
6+
7+
// Graphic charter
8+
@import '_graphic-charter';
9+
10+
11+
// DEBUG ICON
12+
// ========================================================================== */
13+
14+
#debug-icon {
15+
background-color: $t-dark;
16+
@include box-shadow(0, 0, 4px, $m-gray);
17+
a:active, a:link, a:visited {
18+
color: $g-orange;
19+
}
20+
}
21+
22+
23+
// DEBUG BAR
24+
// ========================================================================== */
25+
26+
#debug-bar {
27+
background-color: $t-dark;
28+
color: $m-gray;
29+
30+
// Reset to prevent conflict with other CSS files
31+
h1,
32+
h2,
33+
h3,
34+
p,
35+
a,
36+
button,
37+
table,
38+
thead,
39+
tr,
40+
td,
41+
button,
42+
.toolbar {
43+
background-color: transparent;
44+
color: $m-gray;
45+
}
46+
47+
// Buttons
48+
button {
49+
background-color: $t-dark;
50+
}
51+
52+
// Tables
53+
table {
54+
strong {
55+
color: $m-orange;
56+
}
57+
tbody tr {
58+
&:hover {
59+
background-color: $g-gray;
60+
}
61+
&.current {
62+
background-color: $m-orange;
63+
td {
64+
color: $t-dark;
65+
}
66+
&:hover td {
67+
background-color: $g-red;
68+
color: $t-light;
69+
}
70+
}
71+
}
72+
}
73+
74+
// The toolbar
75+
.toolbar {
76+
background-color: $g-gray;
77+
@include box-shadow(0, 0, 4px, $g-gray);
78+
img {
79+
filter: brightness(0) invert(1);
80+
}
81+
}
82+
83+
// Fixed top
84+
&.fixed-top {
85+
& .toolbar {
86+
@include box-shadow(0, 0, 4px, $g-gray);
87+
}
88+
.tab {
89+
@include box-shadow(0, 1px, 4px, $g-gray);
90+
}
91+
}
92+
93+
// "Muted" elements
94+
.muted {
95+
color: $m-gray;
96+
td {
97+
color: $g-gray;
98+
}
99+
&:hover td {
100+
color: $m-gray;
101+
}
102+
}
103+
104+
// The toolbar preferences
105+
#toolbar-position,
106+
#toolbar-theme, {
107+
filter: brightness(0) invert(0.6);
108+
}
109+
110+
// The toolbar menus
111+
.ci-label {
112+
&.active {
113+
background-color: $t-dark;
114+
}
115+
&:hover {
116+
background-color: $t-dark;
117+
}
118+
.badge {
119+
background-color: $g-blue;
120+
color: $m-gray;
121+
}
122+
}
123+
124+
// The tabs container
125+
.tab {
126+
background-color: $t-dark;
127+
@include box-shadow(0, -1px, 4px, $g-gray);
128+
}
129+
130+
// The "Timeline" tab
131+
.timeline {
132+
th,
133+
td {
134+
border-color: $g-gray;
135+
}
136+
.timer {
137+
background-color: $g-orange;
138+
}
139+
}
140+
}
141+
142+
143+
// DEBUG VIEW
144+
// ========================================================================== */
145+
146+
.debug-view.show-view {
147+
border-color: $g-orange;
148+
}
149+
.debug-view-path {
150+
background-color: $m-orange;
151+
color: $g-gray;
152+
}

0 commit comments

Comments
 (0)