KXStudio
/
Website
mirror of https://github.com/KXStudio/Website
1
0
Fork 0
Code Releases 0 Activity
KXStudio Website https://kx.studio/
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
608 Commits
2 Branches
109MB
Branch: master
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'master'
${ noResults }
Website/kxstudio-chyrp-changes.patch

1194 lines
38KB
Raw Permalink Blame History 

  1. diff -U 3 -H -w -E -d -r -N -- chyrp/.gitignore News/.gitignore

  2. --- chyrp/.gitignore	1970-01-01 01:00:00.000000000 +0100

  3. +++ News/.gitignore	2011-03-31 20:32:51.000000000 +0200

  4. @@ -0,0 +1,8 @@

  5. +.DS_Store

  6. +.htaccess

  7. +feathers/photo/lib/cache/*

  8. +uploads/*

  9. +includes/config.yaml.php

  10. +includes/database.yaml.php

  11. +themes/*

  12. +!themes/stardust

  13. diff -U 3 -H -w -E -d -r -N -- chyrp/.htaccess News/.htaccess

  14. --- chyrp/.htaccess	1970-01-01 01:00:00.000000000 +0100

  15. +++ News/.htaccess	2013-03-17 00:59:57.000000000 +0100

  16. @@ -0,0 +1,7 @@

  17. +<IfModule mod_rewrite.c>

  18. +RewriteEngine On

  19. +RewriteBase /News/

  20. +RewriteCond %{REQUEST_FILENAME} !-f

  21. +RewriteCond %{REQUEST_FILENAME} !-d

  22. +RewriteRule ^.+$ index.php [L]

  23. +</IfModule>

  24. diff -U 3 -H -w -E -d -r -N -- chyrp/themes/stardust/content/comment.twig News/themes/stardust/content/comment.twig

  25. --- chyrp/themes/stardust/content/comment.twig	2011-03-31 11:32:50.000000000 +0200

  26. +++ News/themes/stardust/content/comment.twig	2013-03-17 02:22:34.000000000 +0100

  27. @@ -2,12 +2,12 @@

  28.              {% if comment.status == "denied" %}

  29.              <span class="waiting">${ "Your comment is awaiting moderation." | translate }</span>

  30.              {% endif %}

  31. +            ${ "<strong>%s</strong> on <a href=\"%s\" class=\"permalink\">%s</a>" | translate | format(comment.author_link, comment.post.url ~ "#comment_"~comment.id, comment.created_at | strftime("%B %d, %Y, at %I:%M %p" | translate)) }

  32.              <blockquote>

  33.                  $comment.body

  34.              </blockquote>

  35.              <cite>

  36.                  ${ comment.delete_link("Delete" | translate, "") }

  37.                  ${ comment.edit_link("Edit" | translate, "") }

  38. -                ${ "<strong>%s</strong> on <a href=\"%s\" class=\"permalink\">%s</a>" | translate | format(comment.author_link, comment.post.url ~ "#comment_"~comment.id, comment.created_at | strftime("%B %d, %Y, at %I:%M %p" | translate)) }

  39.              </cite>

  40.          </li>

  41. diff -U 3 -H -w -E -d -r -N -- chyrp/themes/stardust/content/post.twig News/themes/stardust/content/post.twig

  42. --- chyrp/themes/stardust/content/post.twig	2011-03-31 11:32:50.000000000 +0200

  43. +++ News/themes/stardust/content/post.twig	2013-05-09 13:17:54.000000000 +0200

  44. @@ -1,8 +1,4 @@

  45. -                    {% if post.first_of_day %}

  46. -                    <div class="date">${ post.created_at | strftime("%B %d" | translate) }</div>

  47. -                    {% endif %}

  48. -                    <div class="post $post.feather{% if post.pinned %} pinned{% endif %}" id="post_$post.id">

  49. -                        {% if post.pinned %}<span class="pinned_text">${ "!" | translate }</span>{% endif %}

  50. +                    <div class="post $post.feather" id="post_$post.id">

  51.                          {% block content %}{% endblock %}

  52.                          {% if route.action == "view" and post.paginated and post.paginated.pages > 1 %}

  53.                          <div class="clear"></div>

  54. @@ -11,30 +7,12 @@

  55.                          <span class="pages">${ "Page %d of %d" | translate | format(post.paginated.page, post.paginated.pages) }</span>

  56.                          {% endif %}

  57.                          <div class="clear"></div>

  58. -                        <span class="info">

  59. -                            {% if post.pinned %}

  60. -                            <strong><a href="$post.url">${ post.created_at | strftime("%B %d @ %I:%M %p" | translate) }</a></strong>

  61. -                            {% else %}

  62. -                            <strong><a href="$post.url">${ post.created_at | strftime("%I:%M %p" | translate) }</a></strong>

  63. -                            {% endif %}

  64. -                            {% if enabled_modules.categorize and post.category.id != 0 %}

  65. -                            |

  66. -                            <a href="$post.category.url" rel="tag">$post.category.name</a>

  67. -                            {% endif %}

  68. +                        <p class="info">

  69.                              {% if enabled_modules.comments %}

  70. -                            |

  71. -                            <a href="$post.url#comments">${ "%s Comment" | translate_plural("%s Comments", post.comment_count) | format(post.comment_count) }</a>

  72. -                            {% endif %}

  73. -                            {% if post.linked_tags | length > 0 %}

  74. -                            |

  75. -                            ${ "Tags" | translate }: ${ post.linked_tags | join(", ") }

  76. -                            {% endif %}

  77. -                        </span>

  78. -                        {% if post.editable or post.deletable %}

  79. -                        <span class="controls">

  80. -                            $post.edit_link

  81. -                            ${ post.delete_link("Delete" | translate, " | ") }

  82. -                        </span>

  83. +                            <a href="$post.url#comments">${ "See %s Comment" | translate_plural("See %s Comments", post.comment_count) | format(post.comment_count) }</a>

  84.                          {% endif %}

  85. -                        <div class="clear"></div>

  86. +                        </p>

  87.                      </div>

  88. +                    {% if route.action != "view" %}

  89. +                    <hr/>

  90. +                    {% endif %}

  91. diff -U 3 -H -w -E -d -r -N -- chyrp/themes/stardust/content/sidebar.twig News/themes/stardust/content/sidebar.twig

  92. --- chyrp/themes/stardust/content/sidebar.twig	2011-03-31 11:32:50.000000000 +0200

  93. +++ News/themes/stardust/content/sidebar.twig	2013-03-17 01:18:22.000000000 +0100

  94. @@ -1,4 +1,3 @@

  95. -            <div id="sidebar">

  96.                  <form action="$site.url" method="get" accept-charset="utf-8">

  97.                      <fieldset>

  98.                          <input type="hidden" name="action" value="search" id="action" />

  99. @@ -7,7 +6,7 @@

  100.                  </form>

  101.  

  102.                  {% if theme.pages_list %}

  103. -                <h1>${ "Pages" | translate }</h1>

  104. +                <h2 class="box-header">${ "Pages" | translate }</h2>

  105.                  <ul>

  106.                      {% for item in theme.pages_list %}

  107.                      <li>

  108. @@ -23,13 +22,10 @@

  109.                  </ul>

  110.                  {% endif %}

  111.  

  112. -                <h1>${ "Welcome, %s!" | translate | format(visitor.login | fallback("Guest" | translate)) }</h1>

  113. -                <ul>

  114. +                <h2 class="box-header">${ "Welcome, %s!" | translate | format(visitor.login | fallback("Guest" | translate)) }</h2>

  115. +                <ul class="navigation">

  116.                      {% if visitor.logged_in %}

  117.                      <li><a href="{% url "controls" %}">${ "User Controls" | translate }</a></li>

  118. -                    {% if visitor.group.can("add_post", "add_page", "view_own_draft", "view_draft", "change_settings") %}

  119. -                    <li><a class="toggle_admin" href="{% url "toggle_admin" %}">${ "Toggle Admin Bar" | translate }</a></li>

  120. -                    {% endif %}

  121.                      <li><a href="{% url "logout" %}">${ "Log Out" | translate }</a></li>

  122.                      {% else %}

  123.                      <li><a href="{% url "login" %}">${ "Log In" | translate }</a></li>

  124. @@ -41,32 +37,14 @@

  125.                  </ul>

  126.  

  127.  ${ trigger.call("sidebar") }

  128. -                {% if tags %}

  129. -                <h1>${ "Tags" | translate }</h1>

  130. -                <ul id="tags_list">

  131. -                    {% for tag in tags %}

  132. -                    <li>

  133. -                        <a href="{% url "tag/" ~ tag.url %}" title="${ "%d post tagged &quot;%s&quot;" | translate_plural("%d posts tagged &quot;%s&quot;", tag.popularity) | format(tag.popularity, (tag.name | escape)) }">$tag.name</a>

  134. -                        <span class="sub">($tag.popularity)</span>

  135. -                        {% if route.action == "tag" and not (GET.name | contains(tag.clean)) %}

  136. -                        <span class="sub">&nbsp;<a href="{% url "tag/"~ tag.url ~"+"~ (GET.name | urlencode) %}">(+)</a></span>

  137. -                        {% endif %}

  138. -                    </li>

  139. -                    {% endfor %}

  140. -                    <li><a href="{% url "tags" %}">${ "All &rarr;" | translate }</a></li>

  141. -                </ul>

  142. -                {% endif %}

  143. -

  144.                  {% if theme.archives_list %}

  145. -                <h1>${ "Archives" | translate }</h1>

  146. -                <ul>

  147. +                <h2 class="box-header">${ "Archives" | translate }</h2>

  148. +                <ul class="navigation">

  149.                      {% for archive in theme.archives_list %}

  150.                      <li>

  151. -                        <a href="$archive.url">${ archive.when | strftime("%B %Y" | translate) }</a>

  152. -                        <span class="sub">($archive.count)</span>

  153. +                        <a href="$archive.url">${ archive.when | strftime("%B %Y" | translate) } ($archive.count)</a>

  154.                      </li>

  155.                      {% endfor %}

  156.                      <li><a href="{% url "archive" %}">${ "All &rarr;" | translate }</a></li>

  157.                  </ul>

  158.                  {% endif %}

  159. -            </div>

  160. diff -U 3 -H -w -E -d -r -N -- chyrp/themes/stardust/feathers/text.twig News/themes/stardust/feathers/text.twig

  161. --- chyrp/themes/stardust/feathers/text.twig	2011-03-31 11:32:50.000000000 +0200

  162. +++ News/themes/stardust/feathers/text.twig	2013-03-17 01:51:31.000000000 +0100

  163. @@ -2,9 +2,12 @@

  164.  

  165.  {% block content %}

  166.  {% if post['title'] %}

  167. -                        <h2 class="title">

  168. +                        <p>

  169. +                          <span style="font-size: 20px">&gt;

  170.                              <a href="$post.url" rel="bookmark" title="${ "Permanent Link to" | translate } &quot;$post.title&quot;">$post.title</a>

  171. -                        </h2>

  172. +                          </span><br/>

  173. +                          On <i>${ post.created_at | strftime("%Y-%m-%d") }</i> by<i> falkTX</i>

  174. +                        </p>

  175.  {% endif %}

  176.                          ${ post.body | read_more }

  177.  {% endblock %}

  178. diff -U 3 -H -w -E -d -r -N -- chyrp/themes/stardust/layouts/default.twig News/themes/stardust/layouts/default.twig

  179. --- chyrp/themes/stardust/layouts/default.twig	2011-03-31 11:32:50.000000000 +0200

  180. +++ News/themes/stardust/layouts/default.twig	2014-04-10 01:20:00.000000000 +0200

  181. @@ -1,54 +1,150 @@

  182. -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

  183. -    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

  184. -<html xmlns="http://www.w3.org/1999/xhtml">

  185. -    <head profile="http://gmpg.org/xfn/11">

  186. -        <meta http-equiv="Content-type" content="$theme.type; charset=utf-8" />

  187. -        <title>{% block title %}$site.name{% if title %} &raquo; ${ title | escape }{% endif %}{% endblock %}</title>

  188. -        <meta name="description" content="$site.description" />

  189. -        <meta name="generator" content="Chyrp" />

  190. -        <link rel="pingback" href="$site.chyrp_url/includes/xmlrpc.php" />

  191. -        <link rel="EditURI" type="application/rsd+xml" href="$site.chyrp_url/includes/rsd.php" />

  192. -        <link rel="shortcut icon" href="$site.url/favicon.ico" />

  193. +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

  194. +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">

  195. +<head>

  196. +    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

  197. +    <!--[if lt IE 7]>

  198. +    <meta http-equiv="imagetoolbar" content="no" />

  199. +    <![endif]-->

  200. +

  201. +    <title>KXStudio News</title>

  202. +

  203. +    <link rel="copyright" href="http://creativecommons.org/licenses/publicdomain/" />

  204. +    <link rel="stylesheet" href="../css/style.fluid.css" type="text/css" media="screen" />

  205. +    <link rel="stylesheet" href="../css/style.css" type="text/css" media="screen" />

  206. +    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway:200,700,800,400" type="text/css" media="screen" />

  207. +    <link rel="icon" type="image/png" href="../images/ico_kxstudio.png" />

  208. +    <link rel="shortcut icon" href="../favicon.ico" />

  209.          {% if site.clean_urls %}<link rel="canonical" href="{% if (post.url) %}$post.clean{% elseif page.url %}$page.clean {% else %}$site.url{% endif %}" />{% endif %}

  210.          $theme.feeds

  211.          $theme.stylesheets

  212.          $theme.javascripts

  213.  ${ trigger.call("head") }

  214. +    <script type="text/javascript">

  215. +        function closeAllMenus(){

  216. +            var objSoftwareMenu     = document.getElementById("div_menuSoftware");

  217. +            var objRepositoriesMenu = document.getElementById("div_menuRepositories");

  218. +            var objSupportMenu      = document.getElementById("div_menuSupport");

  219. +            var objCommunityMenu    = document.getElementById("div_menuCommunity");

  220. +

  221. +            if (objSoftwareMenu.style.visibility == "visible")

  222. +                objSoftwareMenu.style.visibility = "hidden";

  223. +

  224. +            if (objRepositoriesMenu.style.visibility == "visible")

  225. +                objRepositoriesMenu.style.visibility = "hidden";

  226. +

  227. +            if (objSupportMenu.style.visibility == "visible")

  228. +                objSupportMenu.style.visibility = "hidden";

  229. +

  230. +            if (objCommunityMenu.style.visibility == "visible")

  231. +                objCommunityMenu.style.visibility = "hidden";

  232. +        };

  233. +

  234. +        function menuItemClicked(event, menu, itemName){

  235. +            event.stopPropagation();

  236. +

  237. +            closeAllMenus();

  238. +

  239. +            //if (menu.style.visibility != "visible")

  240. +            {

  241. +                var leftPos = document.getElementById(itemName).getBoundingClientRect().left - 1;

  242. +                menu.style.left       = "" + leftPos + "px";

  243. +                menu.style.visibility = "visible";

  244. +            }

  245. +            //else

  246. +            //{

  247. +            //    menu.style.visibility = "hidden";

  248. +            //}

  249. +

  250. +            return false;

  251. +        };

  252. +

  253. +        function bodyClicked(){

  254. +            closeAllMenus();

  255. +            return true;

  256. +        };

  257. +

  258. +        function itemSoftwareClicked(event)    { return menuItemClicked(event, document.getElementById("div_menuSoftware"),     "item-soft");      };

  259. +        function itemRepositoriesClicked(event){ return menuItemClicked(event, document.getElementById("div_menuRepositories"), "item-repos");     };

  260. +        function itemSupportClicked(event)     { return menuItemClicked(event, document.getElementById("div_menuSupport"),      "item-support");   };

  261. +        function itemCommunityClicked(event)   { return menuItemClicked(event, document.getElementById("div_menuCommunity"),    "item-community"); };

  262. +

  263. +    </script>

  264.      </head>

  265. -    <body>

  266. -        {% if visitor.group.can("add_post", "add_draft", "add_page", "view_own_draft", "view_draft", "change_settings", "toggle_extensions") %}

  267. -        <div id="controls"{% if hide_admin %} style="display: none"{% endif %}>

  268. -            <ul>

  269. -                {% if visitor.group.can("add_post") %}

  270. -                <li><a id="add_post" href="{% admin "write_post" %}">${ "Write" | translate }</a></li>

  271. -                {% elseif visitor.group.can("add_draft") %}

  272. -                <li><a id="add_draft" href="{% admin "write_post" %}">${ "Write Draft" | translate }</a></li>

  273. -                {% endif %}

  274. -                {% if visitor.group.can("add_page") %}

  275. -                <li><a id="add_page" href="{% admin "write_page" %}">${ "Add Page" | translate }</a></li>

  276. -                {% endif %}

  277. -                {% if visitor.group.can("view_own_draft", "view_draft") %}

  278. -                <li><a id="your_drafts" href="{% url "drafts" %}">${ "Your Drafts" | translate }</a></li>

  279. -                {% endif %}

  280. -                {% if visitor.group.can("change_settings", "toggle_extensions") %}

  281. -                <li><a id="site_settings" href="$site.chyrp_url/admin/">${ "Admin" | translate }</a></li>

  282. -                {% endif %}

  283. -                <li class="close"><a class="toggle_admin" href="{% url "toggle_admin" %}">${ "Close" | translate }</a></li>

  284. -            </ul>

  285. +<body class="mediawiki ltr ns-0 ns-subject skin-bentofluid" style="min-width:1080px" onClick="return bodyClicked();">

  286. +    <!-- Software sub menu -->

  287. +    <div id="div_menuSoftware" class="div_menuDropdown">

  288. +        <p><a href="/Applications"><img src="/images/ico_cadence.png" alt=""/> &nbsp; Applications</a></p>

  289. +        <p><a href="/Plugins"><img src="/images/ico_distrho.png" alt=""/> &nbsp; Plugins</a></p>

  290.          </div>

  291. -        {% endif %}

  292. -        {% if site.name %}

  293. +    <!-- Repositories sub menu -->

  294. +    <div id="div_menuRepositories" class="div_menuDropdown">

  295. +        <p><a href="/Repositories">About</a></p>

  296. +        <p><a href="/Repositories:Applications">Applications (in Repo)</a></p>

  297. +        <p><a href="/Repositories:Plugins">Plugins (in Repo)</a></p>

  298. +    </div>

  299. +    <!-- Support sub menu -->

  300. +    <div id="div_menuSupport" class="div_menuDropdown">

  301. +        <p><a href="/Documentation">Documentation</a></p>

  302. +    </div>

  303. +    <!-- Community sub menu -->

  304. +    <div id="div_menuCommunity" class="div_menuDropdown">

  305. +        <p><a href="http://webchat.freenode.net/?channels=#kxstudio,#opensourcemusicians"><img src="/images/ico_chat.png" class="external" rel="nofollow" target="_blank" alt=""/> &nbsp; Chat</a></p>

  306. +        <p><a href="http://linuxmusicians.com/viewforum.php?f=47"><img src="/images/ico_forum.png" class="external" rel="nofollow" target="_blank" alt=""/> &nbsp; Forum</a></p>

  307. +        <p><a href="https://soundcloud.com/search/sounds?q=kxstudio"><img src="/images/ico_soundcloud.png" class="external" rel="nofollow" target="_blank" alt=""/> &nbsp; Songs</a></p>

  308. +    </div>

  309. +

  310. +    <!-- Top link -->

  311. +    <a name="Top" id="Top"></a>

  312. +

  313. +    <!-- Start: Header -->

  314.          <div id="header">

  315. -            <div class="header_box">

  316. -                <h1><a href="$site.url">$site.name</a></h1>

  317. -                {% if site.description %}

  318. -                <h2>$site.description</h2>

  319. -                {% endif %}

  320. +        <div id="header-content" class="container_12">

  321. +            <a id="header-logo" href="/">

  322. +                <img src="../images/header-logo_mod.png" width="46" height="26" alt="Header Logo"/>

  323. +            </a>

  324. +            <a id="header-home" href="/" style="font-size:1.2em">Home</a>

  325. +            <ul id="global-navigation">

  326. +                <li id="item-news"><a href="/News">News</a></li>

  327. +                <li id="item-soft"><a href="#" onClick="return itemSoftwareClicked(event);">Software &#9660;</a></li>

  328. +                <li id="item-repos"><a href="#" onClick="return itemRepositoriesClicked(event);">Repositories &#9660;</a></li>

  329. +                <li id="item-support"><a href="#" onClick="return itemSupportClicked(event);">Support &#9660;</a></li>

  330. +                <li id="item-community"><a href="#" onClick="return itemCommunityClicked(event);">Community &#9660;</a></li>

  331. +                <li id="item-donate"><a href="/Donations">Donations</a></li>

  332. +                <li id="item-downloads"><a href="/Downloads">Downloads</a></li>

  333. +                <li id="item-paste"><a href="/Paste">Paste</a></li>

  334. +            </ul>

  335.              </div>

  336.          </div>

  337. -        {% endif %}

  338. +    <!-- End: Header -->

  339. +

  340. +    <div id="subheader" class="container_16">

  341. +        <div id="breadcrump" class="grid_12 alpha">

  342. +            <a href="/" title="Home"><img src="../images/home_grey.png" width="16" height="16" alt="Home" /> KXStudio </a>

  343. +                &gt; <a href="/News">News</a>

  344. +        </div>

  345. +    </div>

  346. +

  347. +    <!-- Start: Main Content Area -->

  348. +    <div id="content" class="container_16 content-wrapper">

  349. +        <div id="some-content" class="box box-shadow grid_77 clearfix">

  350. +            <!-- Start: Box header -->

  351. +            <div class="box-header header-tabs">

  352. +                <ul>

  353. +                    <li><a href="#Top">Top</a></li>

  354. +                </ul>

  355. +            </div>

  356. +            <div id="contentSub"></div>

  357. +            <!-- End: Box header -->

  358. +

  359. +            <div class="alpha omega paste_canvas_area">

  360. +                <h1><span class="mw-headline"> KXStudio&nbsp;: News </span></h1>

  361. +<!-- - - - - - - - Begin Content Area - - - - - - - -->

  362. +

  363. +<div style="position: absolute; top: 120px; right: 100px;">

  364. +    <a href="{% url "feed" %}"><img src="../images/rss.png" alt="RSS"/></a>

  365. +</div>

  366. +

  367.          <div id="wrapper">

  368. -{% include "content/sidebar.twig" %}

  369.              <div id="content">

  370.                  {% for type, messages in flash.all | items %}

  371.                  {% for message in messages %}

  372. @@ -59,41 +155,24 @@

  373.                  <div class="clear"></div>

  374.                  $posts.prev_link

  375.                  $posts.next_link

  376. -                {% if posts.paginated and posts.pages > 1 %}

  377. -                <span class="pages">${ "Page %d of %d" | translate | format(posts.page, posts.pages) }</span>

  378. -                {% endif %}

  379. -                <div id="footer">

  380. -                    <p>Stardust theme &copy; 2008 <a href="mailto:aa.macdonald@gmail.com">Aaron MacDonald</a></p>

  381. -                    <p>${ "Powered by <a class=\"chyrp\" href=\"http://chyrp.net/\">Chyrp</a>" | translate }</p>

  382. -                    <a class="atom" href="{% url "feed" %}">atom</a>

  383. -                </div>

  384.              </div>

  385.              <div class="clear"></div>

  386.          </div>

  387. -        {% if debug and visitor.group.name == "Admin" %}

  388. -        <div id="debug">

  389. -            <h5>

  390. -                <a class="toggle" href="javascript:void(0)">${ "Toggle" | translate }</a>

  391. -                ${ "Stats" | translate }

  392. -            </h5>

  393. +

  394. +<!-- - - - - - - - End Content Area - - - - - - - -->

  395. +            </div>

  396. +            <br/>

  397. +            <div class="box-footer header-tabs">

  398.              <ul>

  399. -                <li><strong>${ "Queries:" | translate }</strong> $sql_queries</li>

  400. -                <li><strong>${ "Load Time:" | translate }</strong> $theme.load_time ${ "seconds" | translate }</li>

  401. +                    <li><a href="#Top">Top</a></li>

  402.              </ul>

  403. -            <br />

  404. -            <h5>${ "Queries" | translate }</h5>

  405. -            <ol class="queries">

  406. -                {% for debug in sql_debug %}

  407. -                <li>

  408. -                    <pre>${ debug.query | replace("\t", "    ") | escape }</pre>

  409. -                    <em>${ "Called from <strong>%s</strong> on line <strong>%d</strong> at %ss." | translate | format(debug.file, debug.line, debug.time) }</em>

  410. -                </li>

  411. -                {% endfor %}

  412. -            </ol>

  413. -            <div class="clear"></div>

  414.          </div>

  415. -        {% endif %}

  416. -${ trigger.call("end_content") }

  417. -        <!-- Queries: $sql_queries | Load Time: $theme.load_time -->

  418. +        </div>

  419. +    </div>

  420. +    <!-- End: Main Content Area -->

  421. +

  422. +    <!-- Note: this clears floating, set in previous elements -->

  423. +    <div class="clear"></div>

  424. +    <div id="footer"></div>

  425.      </body>

  426.  </html>

  427. diff -U 3 -H -w -E -d -r -N -- chyrp/themes/stardust/pages/view.twig News/themes/stardust/pages/view.twig

  428. --- chyrp/themes/stardust/pages/view.twig	2011-03-31 11:32:50.000000000 +0200

  429. +++ News/themes/stardust/pages/view.twig	2013-03-17 02:23:03.000000000 +0100

  430. @@ -6,7 +6,6 @@

  431.                  <div class="clear"></div>

  432.  {% include "feathers/" ~ post.feather ~ ".twig" %}

  433.  {% if enabled_modules.comments and (post.comment_count > 0 or post.commentable) %}

  434. -                <br />

  435.                  <h2 class="comments">${ "Comments" | translate }</h2>

  436.                  <ol class="comments" id="comments_$post.id">

  437.                      {% paginate site.comments_per_page comments in post.comments as comment %}

  438. @@ -26,5 +25,6 @@

  439.                  {% if post.comment_status == "closed" %}

  440.                  ${ "Comments are not accepted on this entry." | translate }

  441.                  {% endif %}

  442. +                <br />

  443.  {% endif %}

  444.  {% endblock %}

  445. diff -U 3 -H -w -E -d -r -N -- chyrp/themes/stardust/stylesheets/screen.css News/themes/stardust/stylesheets/screen.css

  446. --- chyrp/themes/stardust/stylesheets/screen.css	2011-03-31 11:32:50.000000000 +0200

  447. +++ News/themes/stardust/stylesheets/screen.css	2013-12-16 23:54:06.000000000 +0100

  448. @@ -1,734 +1,12 @@

  449. -body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td { margin: 0; padding: 0; }

  450. -table { border-collapse: collapse; border-spacing: 0; }

  451. -fieldset,img { border: 0; }

  452. -address,caption,cite,code,dfn,em,strong,th,var { font-style: normal; font-weight: normal; }

  453. -li { list-style: none; }

  454. -caption,th { text-align: left; }

  455. -h1,h2,h3,h4,h5,h6 { font-size: 100%; font-weight: normal; }

  456. -abbr,acronym { border: 0; font-variant: normal; }

  457. -input,textarea,select { font-family: inherit; font-size: inherit; font-weight: inherit; }

  458. -a { text-decoration: none; color: inherit; }

  459. -

  460. -html {

  461. -    font-size: 62.5%;

  462. -    height: 100%;

  463. -}

  464. -body {

  465. -    background-color: #fff;

  466. -    color: #111;

  467. -    font: normal 1.1em/1.5em 'Helvetica Neue', Helvetica, Arial, Verdana, sans-serif;

  468. -    margin: 0;

  469. -    height: 100%;

  470. -}

  471. -

  472. -pre {

  473. -    font-size: 10px;

  474. -}

  475. -code {

  476. -    font-family: monospace;

  477. -}

  478. -pre code {

  479. -    display: block;

  480. -    background: #111;

  481. -    color: #fff;

  482. -    padding: .5em .75em .35em;

  483. -    margin-bottom: 1em;

  484. -}

  485. -

  486. -em {

  487. -    font-style: italic;

  488. -}

  489. -strong {

  490. -    font-weight: bold;

  491. -}

  492. -

  493. -a:link,

  494. -a:visited {

  495. -    color: #222;

  496. -}

  497. -a:hover {

  498. -    text-decoration: underline;

  499. -}

  500. -

  501. -h1,

  502. -h2 {

  503. -    letter-spacing: -.01em;

  504. -}

  505. -h1 {

  506. -    color: #344469;

  507. -    font: bold 2.6em "palatino linotype", palatino, georgia, "times new roman", times, serif;

  508. -    margin-bottom: .3em

  509. -}

  510. -h2 {

  511. -    color: #664761;

  512. -    font: bold 2em "palatino linotype", palatino, georgia, "times new roman", times, serif;

  513. -    margin-bottom: .4em;

  514. -}

  515. -h3 {

  516. -    font: bold 1.75em "palatino linotype", palatino, georgia, "times new roman", times, serif;

  517. -    margin-bottom: .5em;

  518. -}

  519. -h4 {

  520. -    font-size: 1.5em;

  521. -    font-weight: bold;

  522. -    margin-bottom: .9em;

  523. -}

  524. -h5 {

  525. -    font-size: 1em;

  526. -    font-weight: bold;

  527. -    margin-bottom: 1em;

  528. -}

  529. -h6 {

  530. -    font-size: .8em;

  531. -    font-weight: bold;

  532. -    margin-bottom: 1.25em;

  533. -}

  534. -

  535. -ul {

  536. -    margin: 0 0 0 1.75em;

  537. -}

  538. -ul li {

  539. -    list-style-type: disc;

  540. -}

  541. -ol {

  542. -    padding-left: 2em;

  543. -    margin-bottom: 1em;

  544. -}

  545. -ol li {

  546. -    list-style: decimal;

  547. -}

  548. -

  549. -hr {

  550. -    border: 0;

  551. -    border-top: 1px solid #ddd;

  552. -}

  553. -

  554. -a.comment_delete_link,

  555. -a.comment_edit_link,

  556. -a.delete_link,

  557. -a.edit_link,

  558. -a.next_page,

  559. -a.prev_page,

  560. -a.next_post,

  561. -a.prev_post,

  562. -a.cancel,

  563. -a.logout {

  564. -    font-weight: bold;

  565. -}

  566. -

  567. -a.comment_delete_link,

  568. -a.comment_edit_link {

  569. -    float: right;

  570. -    margin: 0 0 0 .5em;

  571. -}

  572. -a.delete_link {

  573. -    color: #d8583e !important;

  574. -}

  575. -a.edit_link {

  576. -    color: #93ba52 !important;

  577. -}

  578. -a.next_page,

  579. -a.prev_page,

  580. -a.next_post,

  581. -a.prev_post {

  582. -    background-color: #e2e2e2;

  583. -    color: #3C4D69;

  584. -    margin: 0 0 2em;

  585. -    padding: .4em .6em;

  586. -}

  587. -a.next_page:hover,

  588. -a.prev_page:hover,

  589. -a.next_post:hover,

  590. -a.prev_post:hover {

  591. -    color: #4E6B83;

  592. -}

  593. -a.cancel {

  594. -    color: #e35533;

  595. -    border: none;

  596. -    text-decoration: underline;

  597. -}

  598. -a.logout {

  599. -    color: #5B7C99;

  600. -    float: right;

  601. -}

  602. -

  603. -label {

  604. -    color: #777;

  605. -    display: block;

  606. -    font: bold 1.4em "palatino linotype", palatino, georgia, "times new roman", times, serif;

  607. -    font-weight: bold;

  608. -    padding: 0 0 0.2em 0;

  609. -}

  610. -input[type="text"],

  611. -input[type="password"],

  612. -textarea {

  613. -    background-color: #f9f9f9;

  614. -    border: 1px solid #ccc;

  615. -    border-bottom: 1px solid #eee;

  616. -    border-right: 1px solid #eee;

  617. -    font-family: 'Monaco', Courier, monospace;

  618. -    margin-bottom: 1.5em;

  619. -    padding: .3em .4em;

  620. -}

  621. -input[type="file"] {

  622. -    margin-bottom: 1.5em;

  623. -}

  624. -input[type="text"],

  625. -input[type="password"] {

  626. -    width: 20em;

  627. -}

  628. -textarea.wide {

  629. -    width: 432px;

  630. -}

  631. -input.big {

  632. -    font-size: 1.5em;

  633. -}

  634. -

  635. -div#controls {

  636. -    background-color: #131313;

  637. -    border-bottom: .1em solid #0f0f0f;

  638. -    padding: .2em 0 .3em;

  639. -    width: 100%;

  640. -}

  641. -div#controls ul {

  642. -    margin: 0 auto;

  643. -    padding: .4em;

  644. -    width: 660px;

  645. -}

  646. -div#controls ul li {

  647. -    background: none;

  648. -    display: inline;

  649. -    font-weight: bold;

  650. -    margin: 0;

  651. -    padding: 0;

  652. -}

  653. -div#controls ul li a:link,

  654. -div#controls ul li a:visited {

  655. -    color: #bbb;

  656. -    border: none;

  657. -    padding: .1em .6em;

  658. -}

  659. -div#controls ul li a:hover {

  660. -    color: #fff;

  661. -}

  662. -div#controls ul li.close a:link,

  663. -div#controls ul li.close a:visited {

  664. -    color: #e35533;

  665. -}

  666. -div#controls ul li.close a:hover {

  667. -    color: #ff6039;

  668. -}

  669. -

  670. -div#wrapper {

  671. -    width: 660px;

  672. -    margin: 2em auto;

  673. -    padding: 0 0 1em 0;

  674. -}

  675. -

  676. -div#content {

  677. -    width: 440px;

  678. -    float: left;

  679. -}

  680. -

  681. -div#sidebar {

  682. -    background: url('../images/dots-grey.gif') top left repeat;

  683. -    float: right;

  684. -    margin: 0 0 2em 0;

  685. -    padding: 1.5em 1em;

  686. -    width: 165px;

  687. -}

  688. -div#sidebar a:link,

  689. -div#sidebar a:visited {

  690. -    padding: .1em .2em;

  691. -    margin: 0 0 0 -.4em;

  692. -}

  693. -div#sidebar a:hover {

  694. -    background-color: #111;

  695. -    color: #ddd;

  696. -    text-decoration: none;

  697. -}

  698. -div#sidebar h1 {

  699. -    color: #664761;

  700. -    font-size: 1.4em;

  701. -    font-style: normal;

  702. -    margin: 1em 0 .2em 0;

  703. -}

  704. -div#sidebar input#search {

  705. -    background-color: #fff;

  706. -    border: 0;

  707. -    margin: -5px auto 0;

  708. -    width: 150px;

  709. -    padding: .4em .7em;

  710. -    display: block;

  711. -}

  712. -div#sidebar ul li {

  713. -    color: #555;

  714. -}

  715. -

  716. -

  717. -div#header {

  718. -    background-color: #111;

  719. -    padding: 2em 0 .6em 0;

  720. -    margin: 0 0 3em;

  721. -    width: 100%;

  722. -}

  723. -div#header .header_box {

  724. -    margin: auto;

  725. -    width: 660px;

  726. -}

  727. -div#header h1 {

  728. -    margin-bottom: .2em;

  729. -}

  730. -div#header h1 a:link,

  731. -div#header h1 a:visited,

  732. -div#header h2 {

  733. -    color: #eee;

  734. -    font-family: Georgia;

  735. -    font-style: italic;

  736. -}

  737. -div#header h1 a:hover {

  738. -    color: #fff;

  739. -    text-decoration: none;

  740. -}

  741. -div#header h2 {

  742. -    color: #664761;

  743. -    margin: -.2em 0 0 0;

  744. -}

  745. -

  746. -div#footer {

  747. -    background: url('../images/dots-lightgrey.gif') top left repeat;

  748. -    clear: both;

  749. -    color: #888;

  750. -    margin: 3em 0;

  751. -    padding: .4em .6em;

  752. -}

  753. -div#footer a.chyrp:hover {

  754. -    color: #6189a3;

  755. -}

  756. -div#footer a.atom {

  757. -    background-color: #bbb;

  758. -    border: none;

  759. -    color: #222;

  760. -    margin: -2.5em .4em 0 0;

  761. -    padding: .3em .6em;

  762. -    float: right;

  763. -}

  764. -div#footer a.atom:hover {

  765. -    background-color: #EEA64A;

  766. -}

  767. -

  768. -div.notice, div.message, div.warning, div.date {

  769. -    color: #111;

  770. -    font-weight: bold;

  771. -    margin: 0 0 1em 0;

  772. -    padding: .5em .8em;

  773. -}

  774. -div.notice {

  775. -    background: url('../images/dots-green.gif') repeat top left;

  776. -}

  777. -div.message {

  778. -    background: url('../images/dots-blue.gif') repeat top left;

  779. -}

  780. -div.warning {

  781. -    background: url('../images/dots-red.gif') repeat top left;

  782. -}

  783. -div.date {

  784. -    background: url('../images/dots-lightgrey.gif') repeat top left;

  785. -    cursor: default;

  786. -}

  787. -div.notice .sub, div.message .sub, div.warning .sub {

  788. -    font-size: .9em;

  789. -    color: #888;

  790. -    margin-left: .5em;

  791. -}

  792. -

  793. -h2.comments {

  794. -    margin: 0 0 1.0em 0;

  795. -}

  796. -ol.comments {

  797. -    list-style: none;

  798. -    margin-bottom: 1em;

  799. -    padding: 0;

  800. -    word-wrap: break-word;

  801. -}

  802. -ol.comments li {

  803. -    list-style: none;

  804. -    margin-bottom: 1.5em;

  805. -    width: auto;

  806. -}

  807. -ol.comments li blockquote {

  808. -    background: #111;

  809. -    color: #eee;

  810. -    margin: 0;

  811. -    padding: 1em 1em 0;

  812. -}

  813. -ol.comments li blockquote p {

  814. -    padding: 0 0 1em;

  815. -}

  816. -ol.comments li blockquote a:link,

  817. -ol.comments li blockquote a:visited {

  818. -    color: #aaa;

  819. -}

  820. -ol.comments li blockquote blockquote {

  821. -    padding: 0 1em;

  822. -    color: #aaa;

  823. -}

  824. -ol.comments li cite {

  825. -    background: #141414;

  826. -    color: #666;

  827. -    display: block;

  828. -    font-style: normal;

  829. -    margin: 0;

  830. -    padding: .4em 1.3em;

  831. -}

  832. -ol.comments li cite a:link,

  833. -ol.comments li cite a:visited {

  834. -    color: #bbb;

  835. -}

  836. -ol.comments li cite a.permalink:link,

  837. -ol.comments li cite a.permalink:visited {

  838. -    color: #666;

  839. -}

  840. -ol.comments li ul,

  841. -ol.comments li ol {

  842. -    margin: 0;

  843. -    padding: 0 0 1em 1.5em;

  844. -}

  845. -ol.comments li ul li,

  846. -ol.comments li ol li {

  847. -    margin: 0;

  848. -    padding: 0;

  849. -}

  850. -ol.comments li ol li {

  851. -    list-style-type: decimal;

  852. -}

  853. -

  854. -#add_comment {

  855. -    margin-top: 3em;

  856. -}

  857. -

  858. -div.post {

  859. -    margin: 0 0 3em;

  860. -    word-wrap: break-word;

  861. -}

  862. -div.post a:link,

  863. -div.post a:visited {

  864. -    color: #3f5161;

  865. -}

  866. -div.post h2.title {

  867. -    font-size: 2em;

  868. -    padding: 0 0 .3em 0;

  869. -    margin: 0;

  870. -}

  871. -div.post h2.title a:link,

  872. -div.post h2.title a:visited {

  873. -    color: #222;

  874. -    font-size: .8em;

  875. -    font-style: normal;

  876. -    font-weight: bold;

  877. -}

  878. -div.post h2.title a:hover {

  879. -    color: #000;

  880. -}

  881. -div.post .pinned_text {

  882. -    content: "!";

  883. -    float: left;

  884. -    font-size: 1.5em;

  885. -    font-weight: bold;

  886. -    margin: .15em 0 0 -1em;

  887. -    color: #e35533;

  888. -}

  889. -div.post p,

  890. -div.page p {

  891. -    padding: 0 0 1em;

  892. -    font-size: 1.1em;

  893. -}

  894. -div.post li,

  895. -div.page li {

  896. -    font-size: 1.1em;

  897. -}

  898. -div.post li p,

  899. -div.page li p {

  900. -    font-size: 1em;

  901. -}

  902. -div.post pre,

  903. -div.page pre {

  904. -    padding: 0 0 1.5em;

  905. -}

  906. -div.post blockquote {

  907. -    padding: .5em .8em;

  908. -    background: #f9f9f9;

  909. -    border: .1em solid #eee;

  910. -    color: #333;

  911. -    margin: 0 0 1em 0;

  912. -}

  913. -div.post blockquote p {

  914. -    padding: 0;

  915. -}

  916. -div.post span.info,

  917. -div.post span.controls,

  918. -div.page span.controls {

  919. -    background-color: #111;

  920. -    color: #666;

  921. -    float: left;

  922. -    margin: .6em 0 0 0;

  923. -    padding: .3em .6em;

  924. -}

  925. -div.post span.info a:link,

  926. -div.post span.info a:visited {

  927. -    color: #bbb;

  928. -    padding: 0;

  929. -}

  930. -div.post span.controls,

  931. -div.page span.controls {

  932. -    background-color: #eee;

  933. -    color: #ccc;

  934. -    margin: .6em 0 0 .6em;

  935. -}

  936. -div.post ul {

  937. -    margin-bottom: 1em;

  938. -}

  939. -div.post.quote blockquote {

  940. -    background: none;

  941. -    border: 0;

  942. -    color: #777;

  943. -    font: 2em/1.25em normal palatino linotype, palatino, georgia, 'times new roman', times, serif;

  944. -    margin: 0 0 -.5em 0;

  945. -    padding: 0;

  946. -}

  947. -div.post.quote .source {

  948. -    color: #999;

  949. -    display: block;

  950. -    margin: 1em 0;

  951. -}

  952. -div.post.link h2 a:link,

  953. -div.post.link h2 a:visited {

  954. -    color: #3f5161;

  955. -    font-size: 1.2em;

  956. -    margin: 0 0 -.5em 0;

  957. -    padding: 0;

  958. -    text-decoration: underline;

  959. -}

  960. -div.post.link h2 a:hover {

  961. -    color: #354451;

  962. -}

  963. -div.post.link p {

  964. -    color: #444;

  965. -}

  966. -div.post.chat p {

  967. -    display: inline;

  968. -}

  969. -div.post.chat ul {

  970. -    font-family: "monaco", monospace;

  971. -    font-size: .9em;

  972. -    margin: 0 1em 1em 0;

  973. -    padding: 0;

  974. -    color: #535353;

  975. -}

  976. -div.post.chat ul li {

  977. -    background: none;

  978. -    list-style-type: none;

  979. -    padding: 0;

  980. -}

  981. -div.post.chat li .label {

  982. -    color: #2D3879;

  983. -}

  984. -div.post.chat li.me .label {

  985. -    color: #AB2F26;

  986. -}

  987. -div.post.photo img {

  988. -    border: .3em solid #111;

  989. -}

  990. -div.post.photo img a:link,

  991. -div.post.photo img a:visited {

  992. -    border: none;

  993. -}

  994. -div.post.photo p,

  995. -div.post.audio p,

  996. -div.post.video p {

  997. -    color: #444;

  998. -    margin: .4em 0;

  999. -}

  1000. -

  1001. -div.page h1 {

  1002. -    margin-bottom: .5em;

  1003. -    color: #4f3a56;

  1004. -    font: bold 2.2em "palatino linotype", palatino, georgia, "times new roman", times, serif;

  1005. -    letter-spacing: -.01em;

  1006. -}

  1007. -div.page span.controls {

  1008. -    float: right;

  1009. -}

  1010. -

  1011. -.inline_edit {

  1012. -    color: #ddd;

  1013. -    padding: 1em;

  1014. -    background: #111;

  1015. -    position: relative;

  1016. -}

  1017. -.inline_edit input[type="text"],

  1018. -.inline_edit textarea {

  1019. -    background-color: #222;

  1020. -    border: none;

  1021. -    color: #eee;

  1022. -    padding: .4em;

  1023. -    width: 410px;

  1024. -}

  1025. -.inline_edit .more_options_link:link {

  1026. -    color: #5B7C99;

  1027. -    display: block;

  1028. -    font-weight: bold;

  1029. -    padding: 0 0 .3em 0;

  1030. -}

  1031. -.inline_edit .more_options {

  1032. -    background-color: #1a1a1a;

  1033. -    padding: 1em;

  1034. -}

  1035. -.inline_edit .more_options p {

  1036. -    float: left;

  1037. -    width: 50%;

  1038. -    min-height: 5em;

  1039. -    padding-bottom: .5em;

  1040. -    margin: 0;

  1041. -}

  1042. -.inline_edit .more_options p input[type="text"] {

  1043. -    width: 90%;

  1044. -    margin-bottom: 0;

  1045. -}

  1046. -.inline_edit .more_options p .sub {

  1047. -    font-size: .8em;

  1048. -    color: #777;

  1049. -}

  1050. -.inline_edit .buttons {

  1051. -    padding: .5em;

  1052. -    background: #1a1a1a;

  1053. -    color: #ddd;

  1054. -}

  1055. -.inline_edit h2 {

  1056. -    color: #83A650;

  1057. -}

  1058. -.post_edit {

  1059. -    margin-bottom: 2em;

  1060. -}

  1061. -

  1062. -div.pagination {

  1063. -    margin: 0 0 2em 0;

  1064. -}

  1065. -

  1066. -.sub {

  1067. -    font-size: .85em;

  1068. -    color: #999;

  1069. -    font-weight: normal;

  1070. -}

  1071. -

  1072. -button {

  1073. -    background-color: #664761;

  1074. -    border: 1px solid #795473;

  1075. -    border-bottom: 1px solid #593E55;

  1076. -    border-right: 1px solid #593E55;

  1077. -    color: #ddd;

  1078. -    font-size: 1em;

  1079. -    font-weight: bold;

  1080. -    padding: 5px 8px;

  1081. -}

  1082. -button:hover {

  1083. -    color: #fff;

  1084. -    cursor: pointer;

  1085. -}

  1086. -

  1087. -p.lost_pass {

  1088. -    margin: 0 0 1em 0;

  1089. -}

  1090. -

  1091. -span.pages {

  1092. -    color: #888;

  1093. -    font-weight: bold;

  1094. -    padding: 0 0.3em;

  1095. -}

  1096. -span.who,

  1097. -span.waiting {

  1098. -    background-color: #e2e2e2;

  1099. -    font-weight: bold;

  1100. -    display: block;

  1101. -    margin: 0 0 1em;

  1102. -    padding: 4px 6px;

  1103. -}

  1104. -

  1105. -.clear {

  1106. -    clear: both;

  1107. -}

  1108. -.right {

  1109. -    float: right;

  1110. -}

  1111. -.left {

  1112. -    float: left;

  1113. -}

  1114. -

  1115. -/* Miscellaneous */

  1116. -    /* Emoticons module. */

  1117. -    img.smiley {

  1118. -        margin: 0 0 -.3em;

  1119. -    }

  1120. -

  1121. -    /* Tags module. */

  1122. -    .tag {

  1123. -        font-family: "palatino linotype", palatino, georgia, "times new roman", times, serif;

  1124. -    }

  1125. -    .tags_select {

  1126. -        display: inline-block;

  1127. -        margin-top: .5em;

  1128. -    }

  1129. -    .tags_select a {

  1130. -        padding: .1em .4em;

  1131. -        border: .1em solid #DDDDA8;

  1132. -        background: #FFFFCA;

  1133. -        text-decoration: none;

  1134. -        border-top-width: 0;

  1135. -        border-left-width: 0;

  1136. -        color: #555;

  1137. -    }

  1138. -    .tags_select a.tag_added {

  1139. -        background: #111;

  1140. -        border-top-width: .1em;

  1141. -        border-bottom: 0;

  1142. -        border-left-width: .1em;

  1143. -        border-right: 0;

  1144. -        border-color: #000;

  1145. -    }

  1146. +/*

  1147. + * Title: openSUSE.org stylesheet (Bento-Theme)

  1148. + * Author: Robert Lihm <rlihm@opensuse.org>

  1149. + * Copyright (c) 2009 AUTHORS.txt (http://www.opensuse.org)

  1150. + * Licensed under the MIT (MIT-LICENSE.txt) license.

  1151. + */

  1152.  

  1153. -/* Debugger */

  1154. -#debug {

  1155. -    background: #ffffdd;

  1156. -    color: #666;

  1157. -    padding: .4em .75em .5em .75em;

  1158. -    border-top: .1em solid #ddd;

  1159. -    position: fixed;

  1160. -    bottom: 0;

  1161. -    left: 0;

  1162. -    right: 0;

  1163. -    max-height: 33%;

  1164. -    overflow-y: auto;

  1165. -    overflow-x: hidden;

  1166. -}

  1167. -#debug h5 {

  1168. -    margin: 0;

  1169. -    font-size: 1.1em;

  1170. -    color: #a3a39a;

  1171. -}

  1172. -#debug h5 .sub {

  1173. -    color: #b3b3aa;

  1174. -}

  1175. -#debug ol.queries li {

  1176. -    margin: 0 0 1em;

  1177. -}

  1178. -#debug pre {

  1179. -    background: #fff;

  1180. -    border: 1px solid #ddd;

  1181. -    padding: 0 .5em;

  1182. -    word-wrap: break-word;

  1183. -}

  1184. -#debug .toggle {

  1185. -    font-weight: bold;

  1186. -    color: #666;

  1187. -    float: right;

  1188. -}

  1189. +@import url("../../../../css/reset.css");	/* reset default browser settings */

  1190. +@import url("../../../../css/grid.css"); 	/* add fluid 960 Grid System */

  1191. +@import url("../../../../css/base.css");	/* Basic CSS - Common styles */

  1192. +@import url("../../../../css/base.fluid.fix.css");	/* Fixes for Bento with fluid 960gs */

  1193. +@import url("../../../../css/style.css");