Skip to content

Commit 99b1c7e

Browse files
kenjiskenjis
committed
Merge branch '1.8/develop' into upstream-1.8-merge
 Conflicts: assets/js/combined.js classes/autoloader.html classes/session/usage.html classes/view.html contribute.html general/configuration.html general/tasks.html installation/tutorials.html installation/upgrade.html packages/orm/crud.html packages/orm/intro.html packages/orm/relations/intro.html packages/parser/intro.html toc.html
2 parents 96ba9ca + 69311cd commit 99b1c7e

File tree

167 files changed

+541
-472
lines changed

Some content is hidden

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

167 files changed

+541
-472
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ nbproject
55

66
#intellij
77
.idea
8-
8+
/change.php

‎assets/css/combined.css‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -505,26 +505,23 @@ html{
505505
font-weight: normal;
506506
line-height: 66px;
507507
font-size: 25px;
508-
display: block;
509508
height: 60px;
510509
padding: 2px 0px 14px 0px;
511510
color: #e3e3e3;
512511
}
513512

513+
#header h1 img{
514+
margin: 13px 10px 0px 0px;
515+
vertical-align: top;
516+
}
517+
514518
#header h1 strong{
515-
display: inline-block;
516-
height: 37px;
517-
width: 147px;
518-
background: url(../img/fuel.png) no-repeat;
519-
text-indent: -7000px;
520-
overflow: hidden;
521-
position: relative;
522-
top: 5px;
523-
margin-right: 10px;
519+
font-weight: normal;
524520
}
525521

526522
#header h1 span{
527523
font-size: 34px;
524+
margin-right: 10px;
528525
}
529526

530527
#header nav{

‎assets/js/combined.js‎

Lines changed: 9 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎classes/agent/config.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<header id="header">
1919
<div class="table">
2020
<h1>
21-
<strong>FuelPHP, a PHP 5.3 Framework</strong>
22-
Documentation
21+
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
22+
<strong>Documentation</strong>
2323
</h1>
2424

2525
<form id="google_search">

‎classes/agent/usage.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<header id="header">
1919
<div class="table">
2020
<h1>
21-
<strong>FuelPHP, a PHP 5.3 Framework</strong>
22-
Documentation
21+
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
22+
<strong>Documentation</strong>
2323
</h1>
2424

2525
<form id="google_search">

‎classes/arr.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<header id="header">
1919
<div class="table">
2020
<h1>
21-
<strong>FuelPHP, a PHP 5.3 Framework</strong>
22-
Documentation
21+
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../assets/img/fuel.png" /></a>
22+
<strong>Documentation</strong>
2323
</h1>
2424

2525
<form id="google_search">

‎classes/asset/advanced.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<header id="header">
1919
<div class="table">
2020
<h1>
21-
<strong>FuelPHP, a PHP 5.3 Framework</strong>
22-
Documentation
21+
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
22+
<strong>Documentation</strong>
2323
</h1>
2424

2525
<form id="google_search">

‎classes/asset/config.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<header id="header">
1919
<div class="table">
2020
<h1>
21-
<strong>FuelPHP, a PHP 5.3 Framework</strong>
22-
Documentation
21+
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
22+
<strong>Documentation</strong>
2323
</h1>
2424

2525
<form id="google_search">

‎classes/asset/usage.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<header id="header">
1919
<div class="table">
2020
<h1>
21-
<strong>FuelPHP, a PHP 5.3 Framework</strong>
22-
Documentation
21+
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../../assets/img/fuel.png" /></a>
22+
<strong>Documentation</strong>
2323
</h1>
2424

2525
<form id="google_search">

‎classes/autoloader.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<header id="header">
1919
<div class="table">
2020
<h1>
21-
<strong>FuelPHP, a PHP 5.3 Framework</strong>
22-
Documentation
21+
<a href="http://fuelphp.com"><img height="37px" width="147px" src="./../assets/img/fuel.png" /></a>
22+
<strong>Documentation</strong>
2323
</h1>
2424

2525
<form id="google_search">
@@ -129,7 +129,7 @@ <h4 class="method" id="method_add_namespaces">add_namespaces($namespace, $prepen
129129
<tr>
130130
<th><kbd>$prepend</kbd></th>
131131
<td><em>false</em></td>
132-
<td class="description">配列冒頭に加えたいなら <em>true</em> にします。</td>
132+
<td class="description">配列の先頭に加えたいなら <em>true</em> にします。</td>
133133
</tr>
134134
</table>
135135
</td>

0 commit comments

Comments
 (0)