Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#1312] stylesheet.tag missing trailing slash in documentation #1312

Merged
merged 1 commit into from
Aug 2, 2019
Merged

[#1312] stylesheet.tag missing trailing slash in documentation #1312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions documentation/manual/tags.textile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,10 +570,11 @@ h2. <a name="stylesheet">stylesheet</a>

Inserts a @link@ tag in the template. By convention, the tag refers to a CSS file in @/public/stylesheets@

* @src@ (required) - file name, without the leading path @/public/stylesheets@
* @id@ (optional) - an @id@ attribute value for the generated @link@ tag
* @media@ (optional) - a @media@ attribute value: screen, print, aural, projection…
* @src@ (required) - file name without the leading path
* @id@ (optional) - @id@ attribute value for the generated @link@ tag
* @media@ (optional) - @media@ attribute value: screen, print, aural, projection…
* @title@ (optional) - @title@ attribute value (or description)
* @path@ (optional) - leading path (default: "/public/stylesheets/")

The @src@ parameter can be replaced by the default @arg@ argument.

Expand Down
3 changes: 2 additions & 1 deletion documentation/manual_ja/tags.textile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,10 +535,11 @@ h2. <a name="stylesheet">stylesheet</a>

テンプレートに @link@ タグを挿入します。利便性のため、このタグは @/public/stylesheets@ 内の CSS ファイルを参照します。

* @src@ (必須) - @/public/stylesheets@ パスを含まないファイル名
* @src@ (必須) - @/public/stylesheets/@ パスを含まないファイル名
* @id@ (オプション) - 生成された @link@ タグの @id@ 属性の値
* @media@ (オプション) - @media@ 属性の値: screen, print, aural, projection…
* @title@ (オプション) - @title@ 属性の値 (または説明)
* @path@ (オプション)

@src@ パラメータはデフォルトの @arg@ 引数に置き換えることもできます。

Expand Down
12 changes: 6 additions & 6 deletions framework/templates/tags/stylesheet.tag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
*{
* create a link element for a CSS file
* src (required) filename without the leading path (default:"/public/stylesheets")
* id (optional) an id attribute for the generated link tag
* media (optional) media : screen, print, aural, projection ...
* title (optional) title attribute (or description)
* path (optional) : sets the path defaults to "/public/stylesheets"
* ${stylesheet src:'default.css' media:'screen,print' /}
* src (required) filename without the leading path
* id (optional) id attribute for the generated link tag
* media (optional) media attribute value: screen, print, aural, projection...
* title (optional) title attribute value (or description)
* path (optional) leading path (default: "/public/stylesheets/")
* ${stylesheet src:'default.css', media:'screen,print' /}
}*
%{
(_arg ) && (_src = _arg);
Expand Down