Skip to content

Commit 12cf0bb

Browse files
authored
Merge pull request #28 from monkenWu/v4.1.1.T1
V4.1.1.t1
2 parents ab3d1a7 + 627bd5e commit 12cf0bb

100 files changed

Lines changed: 4372 additions & 2402 deletions

File tree

Some content is hidden

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

source/_static/css/citheme.css

Lines changed: 121 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
font-weight: 200;
1111
src: url('../fonts/Raleway/raleway-v14-latin-200.eot'); /* IE9 Compat Modes */
1212
src: local('Raleway ExtraLight'), local('Raleway-ExtraLight'),
13-
url('../fonts/Raleway/raleway-v14-latin-200.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
14-
url('../fonts/Raleway/raleway-v14-latin-200.woff2') format('woff2'), /* Super Modern Browsers */
15-
url('../fonts/Raleway/raleway-v14-latin-200.woff') format('woff'), /* Modern Browsers */
16-
url('../fonts/Raleway/raleway-v14-latin-200.ttf') format('truetype'), /* Safari, Android, iOS */
17-
url('../fonts/Raleway/raleway-v14-latin-200.svg#Raleway') format('svg'); /* Legacy iOS */
13+
url('../fonts/Raleway/raleway-v14-latin-200.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
14+
url('../fonts/Raleway/raleway-v14-latin-200.woff2') format('woff2'), /* Super Modern Browsers */
15+
url('../fonts/Raleway/raleway-v14-latin-200.woff') format('woff'), /* Modern Browsers */
16+
url('../fonts/Raleway/raleway-v14-latin-200.ttf') format('truetype'), /* Safari, Android, iOS */
17+
url('../fonts/Raleway/raleway-v14-latin-200.svg#Raleway') format('svg'); /* Legacy iOS */
1818
}
1919

2020
@font-face {
@@ -23,11 +23,11 @@
2323
font-weight: 200;
2424
src: url('../fonts/Raleway/raleway-v14-latin-200italic.eot'); /* IE9 Compat Modes */
2525
src: local('Raleway ExtraLight Italic'), local('Raleway-ExtraLightItalic'),
26-
url('../fonts/Raleway/raleway-v14-latin-200italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
27-
url('../fonts/Raleway/raleway-v14-latin-200italic.woff2') format('woff2'), /* Super Modern Browsers */
28-
url('../fonts/Raleway/raleway-v14-latin-200italic.woff') format('woff'), /* Modern Browsers */
29-
url('../fonts/Raleway/raleway-v14-latin-200italic.ttf') format('truetype'), /* Safari, Android, iOS */
30-
url('../fonts/Raleway/raleway-v14-latin-200italic.svg#Raleway') format('svg'); /* Legacy iOS */
26+
url('../fonts/Raleway/raleway-v14-latin-200italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
27+
url('../fonts/Raleway/raleway-v14-latin-200italic.woff2') format('woff2'), /* Super Modern Browsers */
28+
url('../fonts/Raleway/raleway-v14-latin-200italic.woff') format('woff'), /* Modern Browsers */
29+
url('../fonts/Raleway/raleway-v14-latin-200italic.ttf') format('truetype'), /* Safari, Android, iOS */
30+
url('../fonts/Raleway/raleway-v14-latin-200italic.svg#Raleway') format('svg'); /* Legacy iOS */
3131
}
3232

3333
@font-face {
@@ -36,11 +36,11 @@
3636
font-weight: 400;
3737
src: url('../fonts/Raleway/raleway-v14-latin-regular.eot'); /* IE9 Compat Modes */
3838
src: local('Raleway'), local('Raleway-Regular'),
39-
url('../fonts/Raleway/raleway-v14-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
40-
url('../fonts/Raleway/raleway-v14-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
41-
url('../fonts/Raleway/raleway-v14-latin-regular.woff') format('woff'), /* Modern Browsers */
42-
url('../fonts/Raleway/raleway-v14-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
43-
url('../fonts/Raleway/raleway-v14-latin-regular.svg#Raleway') format('svg'); /* Legacy iOS */
39+
url('../fonts/Raleway/raleway-v14-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
40+
url('../fonts/Raleway/raleway-v14-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
41+
url('../fonts/Raleway/raleway-v14-latin-regular.woff') format('woff'), /* Modern Browsers */
42+
url('../fonts/Raleway/raleway-v14-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
43+
url('../fonts/Raleway/raleway-v14-latin-regular.svg#Raleway') format('svg'); /* Legacy iOS */
4444
}
4545

4646
@font-face {
@@ -49,11 +49,11 @@
4949
font-weight: 400;
5050
src: url('../fonts/Raleway/raleway-v14-latin-italic.eot'); /* IE9 Compat Modes */
5151
src: local('Raleway Italic'), local('Raleway-Italic'),
52-
url('../fonts/Raleway/raleway-v14-latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
53-
url('../fonts/Raleway/raleway-v14-latin-italic.woff2') format('woff2'), /* Super Modern Browsers */
54-
url('../fonts/Raleway/raleway-v14-latin-italic.woff') format('woff'), /* Modern Browsers */
55-
url('../fonts/Raleway/raleway-v14-latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */
56-
url('../fonts/Raleway/raleway-v14-latin-italic.svg#Raleway') format('svg'); /* Legacy iOS */
52+
url('../fonts/Raleway/raleway-v14-latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
53+
url('../fonts/Raleway/raleway-v14-latin-italic.woff2') format('woff2'), /* Super Modern Browsers */
54+
url('../fonts/Raleway/raleway-v14-latin-italic.woff') format('woff'), /* Modern Browsers */
55+
url('../fonts/Raleway/raleway-v14-latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */
56+
url('../fonts/Raleway/raleway-v14-latin-italic.svg#Raleway') format('svg'); /* Legacy iOS */
5757
}
5858

5959
@font-face {
@@ -62,11 +62,11 @@
6262
font-weight: 700;
6363
src: url('../fonts/Raleway/raleway-v14-latin-700.eot'); /* IE9 Compat Modes */
6464
src: local('Raleway Bold'), local('Raleway-Bold'),
65-
url('../fonts/Raleway/raleway-v14-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
66-
url('../fonts/Raleway/raleway-v14-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
67-
url('../fonts/Raleway/raleway-v14-latin-700.woff') format('woff'), /* Modern Browsers */
68-
url('../fonts/Raleway/raleway-v14-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
69-
url('../fonts/Raleway/raleway-v14-latin-700.svg#Raleway') format('svg'); /* Legacy iOS */
65+
url('../fonts/Raleway/raleway-v14-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
66+
url('../fonts/Raleway/raleway-v14-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
67+
url('../fonts/Raleway/raleway-v14-latin-700.woff') format('woff'), /* Modern Browsers */
68+
url('../fonts/Raleway/raleway-v14-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
69+
url('../fonts/Raleway/raleway-v14-latin-700.svg#Raleway') format('svg'); /* Legacy iOS */
7070
}
7171

7272
@font-face {
@@ -75,31 +75,30 @@
7575
font-weight: 700;
7676
src: url('../fonts/Raleway/raleway-v14-latin-700italic.eot'); /* IE9 Compat Modes */
7777
src: local('Raleway Bold Italic'), local('Raleway-BoldItalic'),
78-
url('../fonts/Raleway/raleway-v14-latin-700italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
79-
url('../fonts/Raleway/raleway-v14-latin-700italic.woff2') format('woff2'), /* Super Modern Browsers */
80-
url('../fonts/Raleway/raleway-v14-latin-700italic.woff') format('woff'), /* Modern Browsers */
81-
url('../fonts/Raleway/raleway-v14-latin-700italic.ttf') format('truetype'), /* Safari, Android, iOS */
82-
url('../fonts/Raleway/raleway-v14-latin-700italic.svg#Raleway') format('svg'); /* Legacy iOS */
78+
url('../fonts/Raleway/raleway-v14-latin-700italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
79+
url('../fonts/Raleway/raleway-v14-latin-700italic.woff2') format('woff2'), /* Super Modern Browsers */
80+
url('../fonts/Raleway/raleway-v14-latin-700italic.woff') format('woff'), /* Modern Browsers */
81+
url('../fonts/Raleway/raleway-v14-latin-700italic.ttf') format('truetype'), /* Safari, Android, iOS */
82+
url('../fonts/Raleway/raleway-v14-latin-700italic.svg#Raleway') format('svg'); /* Legacy iOS */
8383
}
8484

8585
/* General ------------------------------------------------------------------ */
8686

8787
body, p, legend {
88-
font-family: "Raleway","Helvetica", "Arial", sans-serif, "Microsoft JhengHei";
88+
font-family: "Raleway","Helvetica", "Arial", sans-serif;
8989
}
9090

9191
.wy-nav-content {
92-
background-attachment: fixed;
9392
background-image: url('../img/ci-background.png');
9493
background-position: bottom right;
9594
background-repeat: no-repeat;
96-
background-size: contain;
95+
background-size: 200px;
9796
}
9897

9998
/* Titles ------------------------------------------------------------------- */
10099

101100
h1, h2, h3, h4, h5, h6 {
102-
font-family: "Raleway", "Helvetica", "Arial", sans-serif, "Microsoft JhengHei";
101+
font-family: "Raleway", "Helvetica", "Arial", sans-serif;
103102
}
104103

105104
h1 {
@@ -134,71 +133,6 @@ h2, h3 {
134133
max-width: 400px;
135134
}
136135

137-
/* Navigation --------------------------------------------------------------- */
138-
139-
#nav {
140-
background-color: #494949!important;
141-
margin: 0;
142-
padding: 0;
143-
display: none;
144-
}
145-
146-
#nav2 {
147-
background: url(data:image/jpeg;base64,/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAARgAA/+4ADkFkb2JlAGTAAAAAAf/bAIQABAMDAwMDBAMDBAYEAwQGBwUEBAUHCAYGBwYGCAoICQkJCQgKCgwMDAwMCgwMDQ0MDBERERERFBQUFBQUFBQUFAEEBQUIBwgPCgoPFA4ODhQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQU/8AAEQgAMgAzAwERAAIRAQMRAf/EAFkAAQADAQAAAAAAAAAAAAAAAAABBQcIAQEAAAAAAAAAAAAAAAAAAAAAEAABAgYDAAAAAAAAAAAAAAAAAVERAtMEFJRVBxgRAQAAAAAAAAAAAAAAAAAAAAD/2gAMAwEAAhEDEQA/AMRAAAAAAAA7a87dZcCu3e1wHnbrLgV272uA87dZcCu3e1wHnbrLgV272uA87dZcCu3e1wHnbrLgV272uA87dZcCu3e1wN/wJGAYEjAMCRgGBIwDAkYBgSMAwJGAsoIwCCMAgjAIIwCCMAgjAIIwEgAAAAAAAAAAAAAAAAAAAAAAAH//2Q==) repeat-x scroll left top transparent;
148-
margin: 0;
149-
padding: 0 310px 0 0;
150-
text-align: right;
151-
display: none;
152-
}
153-
154-
#nav_inner {
155-
background-color: transparent;
156-
font-size: 11px;
157-
margin: 0;
158-
padding: 8px 12px 0 20px;
159-
}
160-
161-
div#pulldown-menu {
162-
-moz-column-count: 5;
163-
-moz-column-gap: 20px;
164-
-webkit-column-count: 5;
165-
-webkit-column-gap: 20px;
166-
column-count: 5;
167-
column-gap: 20px;
168-
-webkit-column-rule: 1px groove #b8b8b8;
169-
-moz-column-rule: 1px groove #b8b8b8;
170-
column-rule: 1px groove #b8b8b8;
171-
}
172-
173-
#pulldown-menu > ul {
174-
padding-top: 10px;
175-
padding-bottom: 10px;
176-
-webkit-column-break-inside: avoid; /*Chrome, Safari*/
177-
display: table; /*Firefox*/
178-
break-inside: avoid; /*IE 10+ theoretically*/
179-
}
180-
181-
#pulldown-menu ul li.toctree-l2 {
182-
font-size: 0.82em;
183-
margin-left: 20px;
184-
list-style-image: url(data:image/gif;base64,R0lGODlhCwAJALMJAO7u7uTk5PLy8unp6fb29t7e3vj4+Li4uIWFheTk5AAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAkALAAAAAALAAkAAAQoMJ1JqTQ4Z3SI98jHCWSJkByArCyiHkMsIzEX3DeCc0Xv+4hEa5iIAAA7);
185-
}
186-
187-
#pulldown-menu ul li.toctree-l1 a {
188-
color: #ffffff;
189-
text-decoration: none;
190-
font-size: 12px;
191-
font-weight: 700;
192-
}
193-
194-
#pulldown-menu ul li.toctree-l2 a {
195-
text-decoration: none;
196-
font-size: 11px;
197-
line-height: 1.4em;
198-
font-weight: 300;
199-
color: #aaaaaa;
200-
}
201-
202136
/* Side Menu ---------------------------------------------------------------- */
203137

204138
.wy-nav-side {
@@ -211,7 +145,6 @@ div#pulldown-menu {
211145

212146
.wy-side-nav-search a {
213147
color: #ffffff;
214-
font-family: "Railway", "Helvetica", "Arial", sans-serif, "Microsoft JhengHei";
215148
}
216149

217150
.wy-side-nav-search input[type=text] {
@@ -231,7 +164,7 @@ div#pulldown-menu {
231164
}
232165

233166
.wy-nav-content {
234-
max-width: none;
167+
max-width: 900px;
235168
}
236169

237170
.wy-nav-content-wrap a, .wy-nav-content-wrap a:visited {
@@ -246,6 +179,10 @@ div#pulldown-menu {
246179
margin-right: 0.65em;
247180
}
248181

182+
.wy-menu-vertical li span.toctree-expand::before {
183+
display: none !important;
184+
}
185+
249186
/* Elements ----------------------------------------------------------------- */
250187

251188
.highlighted {
@@ -256,31 +193,43 @@ div#pulldown-menu {
256193

257194
/* override table width restrictions */
258195
.wy-table-responsive table td, .wy-table-responsive table th {
259-
white-space: normal;
196+
white-space: pre;
260197
}
261198

262-
.wy-table-responsive {
263-
margin-bottom: 24px;
264-
max-width: 100%;
265-
overflow: visible;
199+
.rst-content dl.class>dt {
200+
margin-bottom: 1rem !important;
266201
}
267202

268-
.rst-content dl:not(.docutils) dt {
203+
.rst-content .section ol p, .rst-content .section ul p {
204+
margin: 0;
205+
}
206+
207+
html.writer-html4 .rst-content dl:not(.docutils)>dt,
208+
html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple)>dt {
269209
background: #fdc894;
270210
color: #434343;
271211
border-top: solid 3px #dd4814;
272212
}
273213

274-
.rst-content .section ol p, .rst-content .section ul p {
275-
margin: 0;
214+
html.writer-html4 .rst-content dl:not(.docutils) code.descname,
215+
html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) code.descname {
216+
padding-right: 0.2rem;
276217
}
277218

278-
.rst-content dl:not(.docutils) dt:first-child {
219+
.rst-content dl.field-list {
279220
margin-top: 1rem;
221+
margin-bottom: 0.5rem;
280222
}
281223

282-
.rst-content dl:not(.docutils) tt.descname, .rst-content dl:not(.docutils) tt.descname, .rst-content dl:not(.docutils) code.descname {
283-
padding-right: 0.2rem;
224+
.rst-content dl.field-list dt, .rst-content dl.field-list p,
225+
html.writer-html4 .rst-content dl:not(.docutils) dl:not(.field-list)>dt,
226+
html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) dl:not(.field-list)>dt {
227+
font-size: 90%;
228+
}
229+
230+
html.writer-html4 .rst-content dl:not(.docutils) dl:not(.field-list)>dt,
231+
html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) dl:not(.field-list)>dt {
232+
padding: 6px;
284233
}
285234

286235
.admonition {
@@ -320,3 +269,63 @@ div#pulldown-menu {
320269
margin-bottom: 2.5rem;
321270
margin-top: 2.5rem;
322271
}
272+
273+
/* Carbon Ads --------------------------------------------------------------- */
274+
275+
#carbonads {
276+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu,
277+
Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif;
278+
}
279+
280+
#carbonads {
281+
display: flex;
282+
max-width: 330px;
283+
background-color: hsla(0, 0%, 98%, 0.1);
284+
border: 1px solid hsla(0, 0%, 98%, 0.15);
285+
margin: 3em 1.5em;
286+
}
287+
288+
#carbonads a {
289+
color: inherit;
290+
text-decoration: none;
291+
}
292+
293+
#carbonads a:hover {
294+
color: inherit;
295+
}
296+
297+
#carbonads span {
298+
position: relative;
299+
display: block;
300+
overflow: hidden;
301+
}
302+
303+
.carbon-img {
304+
display: block;
305+
margin: 0;
306+
line-height: 1;
307+
text-align: center;
308+
}
309+
310+
.carbon-img img {
311+
display: block;
312+
margin: auto;
313+
}
314+
315+
.carbon-text {
316+
font-size: 13px;
317+
padding: 10px;
318+
line-height: 1.5;
319+
text-align: left;
320+
}
321+
322+
.carbon-poweredby {
323+
display: block;
324+
padding: 8px 10px;
325+
text-align: center;
326+
text-transform: uppercase;
327+
letter-spacing: .5px;
328+
font-weight: lighter;
329+
font-size: 9px;
330+
line-height: 1;
331+
}

source/_static/js/carbon.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
* Add Carbon Ads underneath navigation to support CodeIgniter Foundation
3+
*/
4+
if (window.location.hostname === 'codeigniter.com') {
5+
window.onload = function () {
6+
// Create a HTML DOM Element Object
7+
var carbon = document.createElement('script');
8+
carbon.async = true;
9+
carbon.type = 'text/javascript';
10+
carbon.src = 'https://cdn.carbonads.com/carbon.js?serve=CE7I62QW&placement=codeignitercom';
11+
carbon.id = '_carbonads_js';
12+
13+
// Append Carbon Ads to .wy-menu
14+
document.querySelector('.wy-menu').appendChild(carbon);
15+
}
16+
}

source/changelogs/index.rst

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,18 @@ Change Logs
55
Version |version|
66
====================================================
77

8-
Release Date: Not Released
8+
**List of all CodeIgniter4 releases**
99

10-
**Next release of CodeIgniter4**
11-
12-
13-
:doc:`See all the changes. </changelogs/next>`
10+
See all the changes.
1411

1512
.. toctree::
1613
:titlesonly:
1714

18-
next
15+
v4.1.2
16+
v4.1.1
17+
v4.1.0
18+
v4.0.5
19+
v4.0.4
1920
v4.0.3
2021
v4.0.0
2122
v4.0.0-rc.4

source/changelogs/next.rst

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)