Merge pull request #2 from friendica/master

Upgraded to latest red

1 files changed, 26 insertions, 18 deletions

diff --git a/doc/html/search/variables_24.js b/doc/html/search/variables_24.js
index 023be319b..95ff7416e 100644
--- a/doc/html/search/variables_24.js
+++ b/doc/html/search/variables_24.js
@@ -8,6 +8,8 @@ var searchData=
   ['_24argc',['$argc',['../classApp.html#af58db526040829b1c8bd95561b329262',1,'App']]],
   ['_24argv',['$argv',['../classApp.html#ab3da757abe5cb45bf88f07cc51a73b58',1,'App']]],
   ['_24arr',['$arr',['../extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb',1,'extract.php']]],
+  ['_24background_5fcolour',['$background_colour',['../redbasic_2php_2style_8php.html#af52526ebf7360ba5197e3f12ca74c63d',1,'style.php']]],
+  ['_24background_5fimage',['$background_image',['../redbasic_2php_2style_8php.html#a339624aeef6604a2f00209a3962c6e1c',1,'style.php']]],
   ['_24baseurl',['$baseurl',['../classApp.html#ad5175536561021548ae8188e24c7b80c',1,'App']]],
   ['_24cached_5fprofile_5fimage',['$cached_profile_image',['../classApp.html#abe0e4fa91097f7a6588e1213a834121c',1,'App']]],
   ['_24cached_5fprofile_5fpicdate',['$cached_profile_picdate',['../classApp.html#aab4a685d15a363bb1d7edbbc20bfb94e',1,'App']]],
@@ -17,9 +19,9 @@ var searchData=
   ['_24children',['$children',['../classItem.html#a80dcd0fb7673776c0967839d429c2a0f',1,'Item']]],
   ['_24cid',['$cid',['../classApp.html#ad1c8eb91a6fd470b94f34b7fdad3a2d0',1,'App']]],
   ['_24cmd',['$cmd',['../classApp.html#a495ec082c2719314e536070ca1ce073d',1,'App']]],
-  ['_24colour',['$colour',['../redbasic_2php_2style_8php.html#a4086b1a341b7c8462a47fb1b25fd49ab',1,'$colour(): style.php'],['../redstrap_2php_2style_8php.html#a4086b1a341b7c8462a47fb1b25fd49ab',1,'$colour(): style.php']]],
+  ['_24colour',['$colour',['../redstrap_2php_2style_8php.html#a4086b1a341b7c8462a47fb1b25fd49ab',1,'style.php']]],
   ['_24comment_5fbox_5ftemplate',['$comment_box_template',['../classItem.html#a90743c8348b13213275c223bb9333aa0',1,'Item']]],
-  ['_24commentable',['$commentable',['../classConversation.html#afd4965d22a6e4bfea2f35e931b3273c6',1,'Conversation']]],
+  ['_24commentable',['$commentable',['../classConversation.html#afd4965d22a6e4bfea2f35e931b3273c6',1,'Conversation\$commentable()'],['../classItem.html#aa2c221231ad0fc3720ccc1f00f0c6304',1,'Item\$commentable()']]],
   ['_24config',['$config',['../classApp.html#ac73dc90e4764497e2f1b7e6612c8fb88',1,'App']]],
   ['_24connected',['$connected',['../classdba__driver.html#a205f6535e399700b6fca2492f96f2229',1,'dba_driver']]],
   ['_24contact',['$contact',['../classApp.html#a98ef4cfd36693a3457c879b76bc6d694',1,'App']]],
@@ -36,12 +38,14 @@ var searchData=
   ['_24dir',['$dir',['../docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62',1,'docblox_errorchecker.php']]],
   ['_24dirs',['$dirs',['../typo_8php.html#a1b709c1d79631ebc8320b41bda028b54',1,'typo.php']]],
   ['_24dirstack',['$dirstack',['../docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6',1,'docblox_errorchecker.php']]],
-  ['_24displaystyle',['$displaystyle',['../redbasic_2php_2style_8php.html#aa658152b727ea1233f6df6ded6437dad',1,'$displaystyle(): style.php'],['../redstrap_2php_2style_8php.html#aa658152b727ea1233f6df6ded6437dad',1,'$displaystyle(): style.php']]],
+  ['_24displaystyle',['$displaystyle',['../redstrap_2php_2style_8php.html#aa658152b727ea1233f6df6ded6437dad',1,'style.php']]],
   ['_24done',['$done',['../classTemplate.html#abda4c8d049f70553338eae7c905e9d5c',1,'Template']]],
   ['_24error',['$error',['../classApp.html#ac1a8b2cd40609b231a560201a08852ba',1,'App\$error()'],['../classdba__driver.html#a84675d28c7bd9b7290dd37e66dbd216c',1,'dba_driver\$error()']]],
   ['_24filelist',['$filelist',['../docblox__errorchecker_8php.html#a648a570b0f9f6e0e51b7267647c4b09b',1,'docblox_errorchecker.php']]],
   ['_24filename',['$filename',['../classFriendicaSmarty.html#a33fabbd4d6eef869df496adf357ae690',1,'FriendicaSmarty']]],
   ['_24files',['$files',['../extract_8php.html#a9590b15215a21e9b42eb546aeef79704',1,'$files(): extract.php'],['../tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149',1,'$files(): tpldebug.php'],['../typo_8php.html#a9590b15215a21e9b42eb546aeef79704',1,'$files(): typo.php']]],
+  ['_24font_5fcolour',['$font_colour',['../redbasic_2php_2style_8php.html#a68e3ff836ec87ae1370c9f4a12c21c6b',1,'style.php']]],
+  ['_24font_5fsize',['$font_size',['../redbasic_2php_2style_8php.html#afcbcf57d0b90d2e4226c2e8a1171befc',1,'style.php']]],
   ['_24force_5fmax_5fitems',['$force_max_items',['../classApp.html#ae3f47830543d0d902f66913def8db66b',1,'App']]],
   ['_24gc_5fprobability',['$gc_probability',['../session_8php.html#a96b09cc763572f45280786a7b33feb7e',1,'session.php']]],
   ['_24groups',['$groups',['../classApp.html#ac6e6b1c7d6df408580ff79977fcfa656',1,'App']]],
@@ -55,23 +59,27 @@ var searchData=
   ['_24ink',['$ink',['../php2po_8php.html#a6b0b8ebd9ce811d1325ef2c129443bc0',1,'php2po.php']]],
   ['_24install_5fwizard_5fpass',['$install_wizard_pass',['../setup_8php.html#addb24714bc2542aa4f4215e98fe48432',1,'setup.php']]],
   ['_24interactive',['$interactive',['../classApp.html#a4c7cfc62d39508086cf300dc2e39c4df',1,'App']]],
+  ['_24item_5fcolour',['$item_colour',['../redbasic_2php_2style_8php.html#a27cb59bbc750341f448cd0c298a7ea16',1,'style.php']]],
+  ['_24item_5fopacity',['$item_opacity',['../redbasic_2php_2style_8php.html#a136b0a2cdeb37f3fa506d28f82dcdbf8',1,'style.php']]],
   ['_24js_5fsources',['$js_sources',['../classApp.html#a11e24b3ed9b33ffee7dd41d110b4366d',1,'App']]],
   ['_24k',['$k',['../php2po_8php.html#ad6726cfaa85d4b8299d2b0f034cbf178',1,'php2po.php']]],
   ['_24lang',['$lang',['../classTemplate.html#ace26b8a4252fbc1c385d2b5e1e93e5c8',1,'Template']]],
   ['_24language',['$language',['../classApp.html#a1a297e70b3667b83f4460aa7ed9f5d6f',1,'App']]],
+  ['_24layout',['$layout',['../classApp.html#a58ac598544892ff7c32890291b72635e',1,'App']]],
   ['_24ldelim',['$ldelim',['../classApp.html#a59dd4b665c70e7dbd80682c014ff7145',1,'App']]],
-  ['_24line_5fheight',['$line_height',['../redbasic_2php_2style_8php.html#a4131d1765ee4deb28e83fc4527943ee0',1,'$line_height(): style.php'],['../redstrap_2php_2style_8php.html#a4131d1765ee4deb28e83fc4527943ee0',1,'$line_height(): style.php']]],
-  ['_24linkcolour',['$linkcolour',['../redbasic_2php_2style_8php.html#a6628a80911a6b37b464ef110ac8f6e42',1,'$linkcolour(): style.php'],['../redstrap_2php_2style_8php.html#a6628a80911a6b37b464ef110ac8f6e42',1,'$linkcolour(): style.php']]],
+  ['_24line_5fheight',['$line_height',['../redstrap_2php_2style_8php.html#a4131d1765ee4deb28e83fc4527943ee0',1,'style.php']]],
+  ['_24linkcolour',['$linkcolour',['../redstrap_2php_2style_8php.html#a6628a80911a6b37b464ef110ac8f6e42',1,'style.php']]],
   ['_24mode',['$mode',['../classConversation.html#afb03d1648dbfafe62caa1e30f32f2b1a',1,'Conversation']]],
   ['_24module',['$module',['../classApp.html#a9bf62f8e39585c0aa48fcffc3bf3484d',1,'App']]],
   ['_24module_5floaded',['$module_loaded',['../classApp.html#a6e4f0fbfa3cf6c11baebe22a03db6165',1,'App']]],
   ['_24name',['$name',['../classFriendicaSmartyEngine.html#aaba6a42101bc9ae32e36b7fa2e243f02',1,'FriendicaSmartyEngine\$name()'],['../classTemplate.html#a6eb301a51cc94d8b94f4548fbad85eae',1,'Template\$name()']]],
-  ['_24nav_5fbg_5f1',['$nav_bg_1',['../redbasic_2php_2style_8php.html#a232513bf4339fe34908c4c63cb93168b',1,'$nav_bg_1(): style.php'],['../redstrap_2php_2style_8php.html#a232513bf4339fe34908c4c63cb93168b',1,'$nav_bg_1(): style.php']]],
-  ['_24nav_5fbg_5f2',['$nav_bg_2',['../redbasic_2php_2style_8php.html#a03a72942b7428fd9af1224770d20a8ba',1,'$nav_bg_2(): style.php'],['../redstrap_2php_2style_8php.html#a03a72942b7428fd9af1224770d20a8ba',1,'$nav_bg_2(): style.php']]],
-  ['_24nav_5fbg_5f3',['$nav_bg_3',['../redbasic_2php_2style_8php.html#acc190405dda0a23a80551dee11c74c0c',1,'$nav_bg_3(): style.php'],['../redstrap_2php_2style_8php.html#acc190405dda0a23a80551dee11c74c0c',1,'$nav_bg_3(): style.php']]],
-  ['_24nav_5fbg_5f4',['$nav_bg_4',['../redbasic_2php_2style_8php.html#aef266cfcb27c6ddb3292584c945bab33',1,'$nav_bg_4(): style.php'],['../redstrap_2php_2style_8php.html#aef266cfcb27c6ddb3292584c945bab33',1,'$nav_bg_4(): style.php']]],
+  ['_24nav_5fbg_5f1',['$nav_bg_1',['../redstrap_2php_2style_8php.html#a232513bf4339fe34908c4c63cb93168b',1,'style.php']]],
+  ['_24nav_5fbg_5f2',['$nav_bg_2',['../redstrap_2php_2style_8php.html#a03a72942b7428fd9af1224770d20a8ba',1,'style.php']]],
+  ['_24nav_5fbg_5f3',['$nav_bg_3',['../redstrap_2php_2style_8php.html#acc190405dda0a23a80551dee11c74c0c',1,'style.php']]],
+  ['_24nav_5fbg_5f4',['$nav_bg_4',['../redstrap_2php_2style_8php.html#aef266cfcb27c6ddb3292584c945bab33',1,'style.php']]],
+  ['_24nav_5fcolour',['$nav_colour',['../redbasic_2php_2style_8php.html#a8fdd5874587a9ad86fb05ed0be265649',1,'style.php']]],
   ['_24nav_5fsel',['$nav_sel',['../classApp.html#a33a8e90b60ec4438f6fbf299d0f6839c',1,'App']]],
-  ['_24navcolour',['$navcolour',['../redbasic_2php_2style_8php.html#a938168352fd3cdaa1c10c16a34f5938a',1,'$navcolour(): style.php'],['../redstrap_2php_2style_8php.html#a938168352fd3cdaa1c10c16a34f5938a',1,'$navcolour(): style.php']]],
+  ['_24navcolour',['$navcolour',['../redstrap_2php_2style_8php.html#a938168352fd3cdaa1c10c16a34f5938a',1,'style.php']]],
   ['_24needed',['$needed',['../docblox__errorchecker_8php.html#a852004caba0a34390297a079f4aaac73',1,'docblox_errorchecker.php']]],
   ['_24nodes',['$nodes',['../classTemplate.html#a8f4d17e49f42b876a97364c13fb572d1',1,'Template']]],
   ['_24observer',['$observer',['../classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f',1,'App\$observer()'],['../classConversation.html#a8748445aa26047ebed5141f3c3cbc244',1,'Conversation\$observer()']]],
@@ -96,21 +104,22 @@ var searchData=
   ['_24r',['$r',['../classTemplate.html#aac9a4638f11271e1b1dcc9f247242718',1,'Template']]],
   ['_24radius',['$radius',['../redbasic_2php_2style_8php.html#a6502bedd57105ad1fb2dee2be9cf6351',1,'style.php']]],
   ['_24rdelim',['$rdelim',['../classApp.html#a244b2d53b21be269aad2269d23192f95',1,'App']]],
-  ['_24redbasic_5ffont_5fsize',['$redbasic_font_size',['../redbasic_2php_2style_8php.html#addf42c3d02e53f8e4153f3bb9dabfcda',1,'$redbasic_font_size(): style.php'],['../redstrap_2php_2style_8php.html#addf42c3d02e53f8e4153f3bb9dabfcda',1,'$redbasic_font_size(): style.php']]],
+  ['_24redbasic_5ffont_5fsize',['$redbasic_font_size',['../redstrap_2php_2style_8php.html#addf42c3d02e53f8e4153f3bb9dabfcda',1,'style.php']]],
   ['_24redirect_5furl',['$redirect_url',['../classItem.html#a5b561415861f5b89b0733aacfe0428d1',1,'Item']]],
   ['_24replace',['$replace',['../classTemplate.html#a4e86b566c3f728e95ce5db1b33665c10',1,'Template']]],
   ['_24res',['$res',['../docblox__errorchecker_8php.html#a49a8a4009b02e49717caa88b128affc5',1,'docblox_errorchecker.php']]],
-  ['_24resolution',['$resolution',['../redbasic_2php_2style_8php.html#adcfa918e05b5a98cbddc84bc3f1c15cc',1,'$resolution(): style.php'],['../redstrap_2php_2style_8php.html#adcfa918e05b5a98cbddc84bc3f1c15cc',1,'$resolution(): style.php']]],
+  ['_24resolution',['$resolution',['../redstrap_2php_2style_8php.html#adcfa918e05b5a98cbddc84bc3f1c15cc',1,'style.php']]],
   ['_24s',['$s',['../extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634',1,'extract.php']]],
   ['_24scheme',['$scheme',['../classApp.html#ad082d63acc078e5bf23825a03bdd6a76',1,'App']]],
   ['_24search',['$search',['../classTemplate.html#a317d535946dc065c35dd5cd38380e6c6',1,'Template']]],
   ['_24session_5fexists',['$session_exists',['../session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb',1,'session.php']]],
   ['_24session_5fexpire',['$session_expire',['../session_8php.html#af0100a2642a5268594bbd5742a03d885',1,'session.php']]],
-  ['_24shadows',['$shadows',['../redbasic_2php_2style_8php.html#acb3046ad9c01b7d60cde20f58d77c548',1,'$shadows(): style.php'],['../redstrap_2php_2style_8php.html#acb3046ad9c01b7d60cde20f58d77c548',1,'$shadows(): style.php']]],
-  ['_24shiny',['$shiny',['../redbasic_2php_2style_8php.html#a0b942d36d8862908864e2ffa4521be70',1,'$shiny(): style.php'],['../redstrap_2php_2style_8php.html#a0b942d36d8862908864e2ffa4521be70',1,'$shiny(): style.php']]],
-  ['_24site_5fcolour',['$site_colour',['../redbasic_2php_2style_8php.html#a02d39b683a42fffbb27823d3860283bd',1,'$site_colour(): style.php'],['../redstrap_2php_2style_8php.html#a02d39b683a42fffbb27823d3860283bd',1,'$site_colour(): style.php']]],
-  ['_24site_5fline_5fheight',['$site_line_height',['../redbasic_2php_2style_8php.html#a8749837e08dfb3372662af9c33fa2a2e',1,'$site_line_height(): style.php'],['../redstrap_2php_2style_8php.html#a8749837e08dfb3372662af9c33fa2a2e',1,'$site_line_height(): style.php']]],
-  ['_24site_5fredbasic_5ffont_5fsize',['$site_redbasic_font_size',['../redbasic_2php_2style_8php.html#a45e6fafa363bc4586fa91dce1786be4f',1,'$site_redbasic_font_size(): style.php'],['../redstrap_2php_2style_8php.html#a45e6fafa363bc4586fa91dce1786be4f',1,'$site_redbasic_font_size(): style.php']]],
+  ['_24shadow',['$shadow',['../redbasic_2php_2style_8php.html#ab00dfc29448b183055d2ae61a0e1874a',1,'style.php']]],
+  ['_24shadows',['$shadows',['../redstrap_2php_2style_8php.html#acb3046ad9c01b7d60cde20f58d77c548',1,'style.php']]],
+  ['_24shiny',['$shiny',['../redstrap_2php_2style_8php.html#a0b942d36d8862908864e2ffa4521be70',1,'style.php']]],
+  ['_24site_5fcolour',['$site_colour',['../redstrap_2php_2style_8php.html#a02d39b683a42fffbb27823d3860283bd',1,'style.php']]],
+  ['_24site_5fline_5fheight',['$site_line_height',['../redstrap_2php_2style_8php.html#a8749837e08dfb3372662af9c33fa2a2e',1,'style.php']]],
+  ['_24site_5fredbasic_5ffont_5fsize',['$site_redbasic_font_size',['../redstrap_2php_2style_8php.html#a45e6fafa363bc4586fa91dce1786be4f',1,'style.php']]],
   ['_24sourcename',['$sourcename',['../classApp.html#a13710907ef62554a0b4dd8a5eaa2eb11',1,'App']]],
   ['_24stack',['$stack',['../classTemplate.html#a6f0efc256688c36110180b501067ff11',1,'Template']]],
   ['_24str',['$str',['../typohelper_8php.html#a7542d95618011800c61773127fa625cf',1,'typohelper.php']]],
@@ -138,6 +147,5 @@ var searchData=
   ['_24widgets',['$widgets',['../classApp.html#aa5a87c46ab3fee21362c466bf78042ef',1,'App']]],
   ['_24width',['$width',['../classphoto__driver.html#a3e4215890f4a4894bf3799a7d2e0c0b1',1,'photo_driver']]],
   ['_24writable',['$writable',['../classConversation.html#ae81221251307e315f566a11f921ce0a9',1,'Conversation']]],
-  ['_24x',['$x',['../redbasic_2php_2style_8php.html#af3a16c5f0dd7a74cf9acf6a49fff73a7',1,'style.php']]],
   ['_24zones',['$zones',['../extract_8php.html#a0cbe524ffc9a496114fd7ba9f423ef44',1,'extract.php']]]
 ];