Browse Source

Merge pull request #58 from yiijan/docs-small-fix

docs/guide small fixes [ci skip]
tags/2.0.5
Alexander Makarov 10 years ago
parent
commit
4f78e465df
  1. 8
      docs/guide/asset-bundles.md
  2. 6
      docs/guide/helper-html.md

8
docs/guide/asset-bundles.md

@ -2,12 +2,12 @@ Asset Bundles
============= =============
Bootstrap is a complex front-end solution, which includes CSS, JavaScript, fonts and so on. Bootstrap is a complex front-end solution, which includes CSS, JavaScript, fonts and so on.
In order to allow you most flexible control over Bootstrap components, this extension provides several asset bundles. In order to allow you the most flexible control over Bootstrap components, this extension provides several asset bundles.
They are: They are:
- [[yii\bootstrap\BootstrapAsset|BootstrapAsset]] - contains only main CSS files. - [[yii\bootstrap\BootstrapAsset|BootstrapAsset]] - contains only the main CSS files.
- [[yii\bootstrap\BootstrapPluginAsset|BootstrapPluginAsset]] - depends on [[yii\bootstrap\BootstrapAsset]], contains javascript files. - [[yii\bootstrap\BootstrapPluginAsset|BootstrapPluginAsset]] - depends on [[yii\bootstrap\BootstrapAsset]], contains the javascript files.
- [[yii\bootstrap\BootstrapThemeAsset|BootstrapThemeAsset]] - depends on [[yii\bootstrap\BootstrapAsset]], contains Bootstrap default theme CSS. - [[yii\bootstrap\BootstrapThemeAsset|BootstrapThemeAsset]] - depends on [[yii\bootstrap\BootstrapAsset]], contains the Bootstrap default theme CSS.
Particular application needs may require different bundle (or bundle combination) usage. Particular application needs may require different bundle (or bundle combination) usage.
If you need only CSS styles, [[yii\bootstrap\BootstrapAsset]] will be enough for you. However, if If you need only CSS styles, [[yii\bootstrap\BootstrapAsset]] will be enough for you. However, if

6
docs/guide/helper-html.md

@ -2,7 +2,7 @@ Html helper
=========== ===========
Bootstrap introduces many consistent HTML constructions and skeletons, which allow creating different visual effects. Bootstrap introduces many consistent HTML constructions and skeletons, which allow creating different visual effects.
Only the most complex of them are covered by widgets provided with this extension. The rest should be composed manually Only the most complex of them are covered by the widgets provided with this extension. The rest should be composed manually
using direct HTML composition. using direct HTML composition.
However, several special Bootstrap markup cases are covered by [[\yii\bootstrap\Html]] helper. However, several special Bootstrap markup cases are covered by [[\yii\bootstrap\Html]] helper.
[[\yii\bootstrap\Html]] is an enhanced version of the regular [[\yii\helpers\Html]] dedicated to the Bootstrap needs. [[\yii\bootstrap\Html]] is an enhanced version of the regular [[\yii\helpers\Html]] dedicated to the Bootstrap needs.
@ -11,7 +11,7 @@ It provides several useful methods:
- `icon()` - allows rendering of Glyphicon icons - `icon()` - allows rendering of Glyphicon icons
- `staticControl()` - allows rendering of form "static controls" - `staticControl()` - allows rendering of form "static controls"
[[\yii\bootstrap\Html]] inherits all functionality available at [[\yii\helpers\Html]] and can be used as substitute, [[\yii\bootstrap\Html]] inherits all functionality available at [[\yii\helpers\Html]] and can be used as a substitute,
so you don't need them both inside your view files. so you don't need them both inside your view files.
For example: For example:
@ -26,5 +26,5 @@ use yii\bootstrap\Html;
]); ?> ]); ?>
``` ```
> Attention: do not confuse [[\yii\bootstrap\Html]] and [[\yii\helpers\Html]], be careful in which class > Attention: do not confuse [[\yii\bootstrap\Html]] and [[\yii\helpers\Html]], be careful of which class
you are using inside your views. you are using inside your views.
Loading…
Cancel
Save