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.

kxstudio-chyrp-changes.patch 38KB

4 years ago
12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193
  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. {% if theme.pages_list %}
  102. - <h1>${ "Pages" | translate }</h1>
  103. + <h2 class="box-header">${ "Pages" | translate }</h2>
  104. <ul>
  105. {% for item in theme.pages_list %}
  106. <li>
  107. @@ -23,13 +22,10 @@
  108. </ul>
  109. {% endif %}
  110. - <h1>${ "Welcome, %s!" | translate | format(visitor.login | fallback("Guest" | translate)) }</h1>
  111. - <ul>
  112. + <h2 class="box-header">${ "Welcome, %s!" | translate | format(visitor.login | fallback("Guest" | translate)) }</h2>
  113. + <ul class="navigation">
  114. {% if visitor.logged_in %}
  115. <li><a href="{% url "controls" %}">${ "User Controls" | translate }</a></li>
  116. - {% if visitor.group.can("add_post", "add_page", "view_own_draft", "view_draft", "change_settings") %}
  117. - <li><a class="toggle_admin" href="{% url "toggle_admin" %}">${ "Toggle Admin Bar" | translate }</a></li>
  118. - {% endif %}
  119. <li><a href="{% url "logout" %}">${ "Log Out" | translate }</a></li>
  120. {% else %}
  121. <li><a href="{% url "login" %}">${ "Log In" | translate }</a></li>
  122. @@ -41,32 +37,14 @@
  123. </ul>
  124. ${ trigger.call("sidebar") }
  125. - {% if tags %}
  126. - <h1>${ "Tags" | translate }</h1>
  127. - <ul id="tags_list">
  128. - {% for tag in tags %}
  129. - <li>
  130. - <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>
  131. - <span class="sub">($tag.popularity)</span>
  132. - {% if route.action == "tag" and not (GET.name | contains(tag.clean)) %}
  133. - <span class="sub">&nbsp;<a href="{% url "tag/"~ tag.url ~"+"~ (GET.name | urlencode) %}">(+)</a></span>
  134. - {% endif %}
  135. - </li>
  136. - {% endfor %}
  137. - <li><a href="{% url "tags" %}">${ "All &rarr;" | translate }</a></li>
  138. - </ul>
  139. - {% endif %}
  140. -
  141. {% if theme.archives_list %}
  142. - <h1>${ "Archives" | translate }</h1>
  143. - <ul>
  144. + <h2 class="box-header">${ "Archives" | translate }</h2>
  145. + <ul class="navigation">
  146. {% for archive in theme.archives_list %}
  147. <li>
  148. - <a href="$archive.url">${ archive.when | strftime("%B %Y" | translate) }</a>
  149. - <span class="sub">($archive.count)</span>
  150. + <a href="$archive.url">${ archive.when | strftime("%B %Y" | translate) } ($archive.count)</a>
  151. </li>
  152. {% endfor %}
  153. <li><a href="{% url "archive" %}">${ "All &rarr;" | translate }</a></li>
  154. </ul>
  155. {% endif %}
  156. - </div>
  157. diff -U 3 -H -w -E -d -r -N -- chyrp/themes/stardust/feathers/text.twig News/themes/stardust/feathers/text.twig
  158. --- chyrp/themes/stardust/feathers/text.twig 2011-03-31 11:32:50.000000000 +0200
  159. +++ News/themes/stardust/feathers/text.twig 2013-03-17 01:51:31.000000000 +0100
  160. @@ -2,9 +2,12 @@
  161. {% block content %}
  162. {% if post['title'] %}
  163. - <h2 class="title">
  164. + <p>
  165. + <span style="font-size: 20px">&gt;
  166. <a href="$post.url" rel="bookmark" title="${ "Permanent Link to" | translate } &quot;$post.title&quot;">$post.title</a>
  167. - </h2>
  168. + </span><br/>
  169. + On <i>${ post.created_at | strftime("%Y-%m-%d") }</i> by<i> falkTX</i>
  170. + </p>
  171. {% endif %}
  172. ${ post.body | read_more }
  173. {% endblock %}
  174. diff -U 3 -H -w -E -d -r -N -- chyrp/themes/stardust/layouts/default.twig News/themes/stardust/layouts/default.twig
  175. --- chyrp/themes/stardust/layouts/default.twig 2011-03-31 11:32:50.000000000 +0200
  176. +++ News/themes/stardust/layouts/default.twig 2014-04-10 01:20:00.000000000 +0200
  177. @@ -1,54 +1,150 @@
  178. -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
  179. - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
  180. -<html xmlns="http://www.w3.org/1999/xhtml">
  181. - <head profile="http://gmpg.org/xfn/11">
  182. - <meta http-equiv="Content-type" content="$theme.type; charset=utf-8" />
  183. - <title>{% block title %}$site.name{% if title %} &raquo; ${ title | escape }{% endif %}{% endblock %}</title>
  184. - <meta name="description" content="$site.description" />
  185. - <meta name="generator" content="Chyrp" />
  186. - <link rel="pingback" href="$site.chyrp_url/includes/xmlrpc.php" />
  187. - <link rel="EditURI" type="application/rsd+xml" href="$site.chyrp_url/includes/rsd.php" />
  188. - <link rel="shortcut icon" href="$site.url/favicon.ico" />
  189. +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  190. +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
  191. +<head>
  192. + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
  193. + <!--[if lt IE 7]>
  194. + <meta http-equiv="imagetoolbar" content="no" />
  195. + <![endif]-->
  196. +
  197. + <title>KXStudio News</title>
  198. +
  199. + <link rel="copyright" href="http://creativecommons.org/licenses/publicdomain/" />
  200. + <link rel="stylesheet" href="../css/style.fluid.css" type="text/css" media="screen" />
  201. + <link rel="stylesheet" href="../css/style.css" type="text/css" media="screen" />
  202. + <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway:200,700,800,400" type="text/css" media="screen" />
  203. + <link rel="icon" type="image/png" href="../images/ico_kxstudio.png" />
  204. + <link rel="shortcut icon" href="../favicon.ico" />
  205. {% if site.clean_urls %}<link rel="canonical" href="{% if (post.url) %}$post.clean{% elseif page.url %}$page.clean {% else %}$site.url{% endif %}" />{% endif %}
  206. $theme.feeds
  207. $theme.stylesheets
  208. $theme.javascripts
  209. ${ trigger.call("head") }
  210. + <script type="text/javascript">
  211. + function closeAllMenus(){
  212. + var objSoftwareMenu = document.getElementById("div_menuSoftware");
  213. + var objRepositoriesMenu = document.getElementById("div_menuRepositories");
  214. + var objSupportMenu = document.getElementById("div_menuSupport");
  215. + var objCommunityMenu = document.getElementById("div_menuCommunity");
  216. +
  217. + if (objSoftwareMenu.style.visibility == "visible")
  218. + objSoftwareMenu.style.visibility = "hidden";
  219. +
  220. + if (objRepositoriesMenu.style.visibility == "visible")
  221. + objRepositoriesMenu.style.visibility = "hidden";
  222. +
  223. + if (objSupportMenu.style.visibility == "visible")
  224. + objSupportMenu.style.visibility = "hidden";
  225. +
  226. + if (objCommunityMenu.style.visibility == "visible")
  227. + objCommunityMenu.style.visibility = "hidden";
  228. + };
  229. +
  230. + function menuItemClicked(event, menu, itemName){
  231. + event.stopPropagation();
  232. +
  233. + closeAllMenus();
  234. +
  235. + //if (menu.style.visibility != "visible")
  236. + {
  237. + var leftPos = document.getElementById(itemName).getBoundingClientRect().left - 1;
  238. + menu.style.left = "" + leftPos + "px";
  239. + menu.style.visibility = "visible";
  240. + }
  241. + //else
  242. + //{
  243. + // menu.style.visibility = "hidden";
  244. + //}
  245. +
  246. + return false;
  247. + };
  248. +
  249. + function bodyClicked(){
  250. + closeAllMenus();
  251. + return true;
  252. + };
  253. +
  254. + function itemSoftwareClicked(event) { return menuItemClicked(event, document.getElementById("div_menuSoftware"), "item-soft"); };
  255. + function itemRepositoriesClicked(event){ return menuItemClicked(event, document.getElementById("div_menuRepositories"), "item-repos"); };
  256. + function itemSupportClicked(event) { return menuItemClicked(event, document.getElementById("div_menuSupport"), "item-support"); };
  257. + function itemCommunityClicked(event) { return menuItemClicked(event, document.getElementById("div_menuCommunity"), "item-community"); };
  258. +
  259. + </script>
  260. </head>
  261. - <body>
  262. - {% if visitor.group.can("add_post", "add_draft", "add_page", "view_own_draft", "view_draft", "change_settings", "toggle_extensions") %}
  263. - <div id="controls"{% if hide_admin %} style="display: none"{% endif %}>
  264. - <ul>
  265. - {% if visitor.group.can("add_post") %}
  266. - <li><a id="add_post" href="{% admin "write_post" %}">${ "Write" | translate }</a></li>
  267. - {% elseif visitor.group.can("add_draft") %}
  268. - <li><a id="add_draft" href="{% admin "write_post" %}">${ "Write Draft" | translate }</a></li>
  269. - {% endif %}
  270. - {% if visitor.group.can("add_page") %}
  271. - <li><a id="add_page" href="{% admin "write_page" %}">${ "Add Page" | translate }</a></li>
  272. - {% endif %}
  273. - {% if visitor.group.can("view_own_draft", "view_draft") %}
  274. - <li><a id="your_drafts" href="{% url "drafts" %}">${ "Your Drafts" | translate }</a></li>
  275. - {% endif %}
  276. - {% if visitor.group.can("change_settings", "toggle_extensions") %}
  277. - <li><a id="site_settings" href="$site.chyrp_url/admin/">${ "Admin" | translate }</a></li>
  278. - {% endif %}
  279. - <li class="close"><a class="toggle_admin" href="{% url "toggle_admin" %}">${ "Close" | translate }</a></li>
  280. - </ul>
  281. +<body class="mediawiki ltr ns-0 ns-subject skin-bentofluid" style="min-width:1080px" onClick="return bodyClicked();">
  282. + <!-- Software sub menu -->
  283. + <div id="div_menuSoftware" class="div_menuDropdown">
  284. + <p><a href="/Applications"><img src="/images/ico_cadence.png" alt=""/> &nbsp; Applications</a></p>
  285. + <p><a href="/Plugins"><img src="/images/ico_distrho.png" alt=""/> &nbsp; Plugins</a></p>
  286. </div>
  287. - {% endif %}
  288. - {% if site.name %}
  289. + <!-- Repositories sub menu -->
  290. + <div id="div_menuRepositories" class="div_menuDropdown">
  291. + <p><a href="/Repositories">About</a></p>
  292. + <p><a href="/Repositories:Applications">Applications (in Repo)</a></p>
  293. + <p><a href="/Repositories:Plugins">Plugins (in Repo)</a></p>
  294. + </div>
  295. + <!-- Support sub menu -->
  296. + <div id="div_menuSupport" class="div_menuDropdown">
  297. + <p><a href="/Documentation">Documentation</a></p>
  298. + </div>
  299. + <!-- Community sub menu -->
  300. + <div id="div_menuCommunity" class="div_menuDropdown">
  301. + <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>
  302. + <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>
  303. + <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>
  304. + </div>
  305. +
  306. + <!-- Top link -->
  307. + <a name="Top" id="Top"></a>
  308. +
  309. + <!-- Start: Header -->
  310. <div id="header">
  311. - <div class="header_box">
  312. - <h1><a href="$site.url">$site.name</a></h1>
  313. - {% if site.description %}
  314. - <h2>$site.description</h2>
  315. - {% endif %}
  316. + <div id="header-content" class="container_12">
  317. + <a id="header-logo" href="/">
  318. + <img src="../images/header-logo_mod.png" width="46" height="26" alt="Header Logo"/>
  319. + </a>
  320. + <a id="header-home" href="/" style="font-size:1.2em">Home</a>
  321. + <ul id="global-navigation">
  322. + <li id="item-news"><a href="/News">News</a></li>
  323. + <li id="item-soft"><a href="#" onClick="return itemSoftwareClicked(event);">Software &#9660;</a></li>
  324. + <li id="item-repos"><a href="#" onClick="return itemRepositoriesClicked(event);">Repositories &#9660;</a></li>
  325. + <li id="item-support"><a href="#" onClick="return itemSupportClicked(event);">Support &#9660;</a></li>
  326. + <li id="item-community"><a href="#" onClick="return itemCommunityClicked(event);">Community &#9660;</a></li>
  327. + <li id="item-donate"><a href="/Donations">Donations</a></li>
  328. + <li id="item-downloads"><a href="/Downloads">Downloads</a></li>
  329. + <li id="item-paste"><a href="/Paste">Paste</a></li>
  330. + </ul>
  331. </div>
  332. </div>
  333. - {% endif %}
  334. + <!-- End: Header -->
  335. +
  336. + <div id="subheader" class="container_16">
  337. + <div id="breadcrump" class="grid_12 alpha">
  338. + <a href="/" title="Home"><img src="../images/home_grey.png" width="16" height="16" alt="Home" /> KXStudio </a>
  339. + &gt; <a href="/News">News</a>
  340. + </div>
  341. + </div>
  342. +
  343. + <!-- Start: Main Content Area -->
  344. + <div id="content" class="container_16 content-wrapper">
  345. + <div id="some-content" class="box box-shadow grid_77 clearfix">
  346. + <!-- Start: Box header -->
  347. + <div class="box-header header-tabs">
  348. + <ul>
  349. + <li><a href="#Top">Top</a></li>
  350. + </ul>
  351. + </div>
  352. + <div id="contentSub"></div>
  353. + <!-- End: Box header -->
  354. +
  355. + <div class="alpha omega paste_canvas_area">
  356. + <h1><span class="mw-headline"> KXStudio&nbsp;: News </span></h1>
  357. +<!-- - - - - - - - Begin Content Area - - - - - - - -->
  358. +
  359. +<div style="position: absolute; top: 120px; right: 100px;">
  360. + <a href="{% url "feed" %}"><img src="../images/rss.png" alt="RSS"/></a>
  361. +</div>
  362. +
  363. <div id="wrapper">
  364. -{% include "content/sidebar.twig" %}
  365. <div id="content">
  366. {% for type, messages in flash.all | items %}
  367. {% for message in messages %}
  368. @@ -59,41 +155,24 @@
  369. <div class="clear"></div>
  370. $posts.prev_link
  371. $posts.next_link
  372. - {% if posts.paginated and posts.pages > 1 %}
  373. - <span class="pages">${ "Page %d of %d" | translate | format(posts.page, posts.pages) }</span>
  374. - {% endif %}
  375. - <div id="footer">
  376. - <p>Stardust theme &copy; 2008 <a href="mailto:aa.macdonald@gmail.com">Aaron MacDonald</a></p>
  377. - <p>${ "Powered by <a class=\"chyrp\" href=\"http://chyrp.net/\">Chyrp</a>" | translate }</p>
  378. - <a class="atom" href="{% url "feed" %}">atom</a>
  379. - </div>
  380. </div>
  381. <div class="clear"></div>
  382. </div>
  383. - {% if debug and visitor.group.name == "Admin" %}
  384. - <div id="debug">
  385. - <h5>
  386. - <a class="toggle" href="javascript:void(0)">${ "Toggle" | translate }</a>
  387. - ${ "Stats" | translate }
  388. - </h5>
  389. +
  390. +<!-- - - - - - - - End Content Area - - - - - - - -->
  391. + </div>
  392. + <br/>
  393. + <div class="box-footer header-tabs">
  394. <ul>
  395. - <li><strong>${ "Queries:" | translate }</strong> $sql_queries</li>
  396. - <li><strong>${ "Load Time:" | translate }</strong> $theme.load_time ${ "seconds" | translate }</li>
  397. + <li><a href="#Top">Top</a></li>
  398. </ul>
  399. - <br />
  400. - <h5>${ "Queries" | translate }</h5>
  401. - <ol class="queries">
  402. - {% for debug in sql_debug %}
  403. - <li>
  404. - <pre>${ debug.query | replace("\t", " ") | escape }</pre>
  405. - <em>${ "Called from <strong>%s</strong> on line <strong>%d</strong> at %ss." | translate | format(debug.file, debug.line, debug.time) }</em>
  406. - </li>
  407. - {% endfor %}
  408. - </ol>
  409. - <div class="clear"></div>
  410. </div>
  411. - {% endif %}
  412. -${ trigger.call("end_content") }
  413. - <!-- Queries: $sql_queries | Load Time: $theme.load_time -->
  414. + </div>
  415. + </div>
  416. + <!-- End: Main Content Area -->
  417. +
  418. + <!-- Note: this clears floating, set in previous elements -->
  419. + <div class="clear"></div>
  420. + <div id="footer"></div>
  421. </body>
  422. </html>
  423. diff -U 3 -H -w -E -d -r -N -- chyrp/themes/stardust/pages/view.twig News/themes/stardust/pages/view.twig
  424. --- chyrp/themes/stardust/pages/view.twig 2011-03-31 11:32:50.000000000 +0200
  425. +++ News/themes/stardust/pages/view.twig 2013-03-17 02:23:03.000000000 +0100
  426. @@ -6,7 +6,6 @@
  427. <div class="clear"></div>
  428. {% include "feathers/" ~ post.feather ~ ".twig" %}
  429. {% if enabled_modules.comments and (post.comment_count > 0 or post.commentable) %}
  430. - <br />
  431. <h2 class="comments">${ "Comments" | translate }</h2>
  432. <ol class="comments" id="comments_$post.id">
  433. {% paginate site.comments_per_page comments in post.comments as comment %}
  434. @@ -26,5 +25,6 @@
  435. {% if post.comment_status == "closed" %}
  436. ${ "Comments are not accepted on this entry." | translate }
  437. {% endif %}
  438. + <br />
  439. {% endif %}
  440. {% endblock %}
  441. diff -U 3 -H -w -E -d -r -N -- chyrp/themes/stardust/stylesheets/screen.css News/themes/stardust/stylesheets/screen.css
  442. --- chyrp/themes/stardust/stylesheets/screen.css 2011-03-31 11:32:50.000000000 +0200
  443. +++ News/themes/stardust/stylesheets/screen.css 2013-12-16 23:54:06.000000000 +0100
  444. @@ -1,734 +1,12 @@
  445. -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; }
  446. -table { border-collapse: collapse; border-spacing: 0; }
  447. -fieldset,img { border: 0; }
  448. -address,caption,cite,code,dfn,em,strong,th,var { font-style: normal; font-weight: normal; }
  449. -li { list-style: none; }
  450. -caption,th { text-align: left; }
  451. -h1,h2,h3,h4,h5,h6 { font-size: 100%; font-weight: normal; }
  452. -abbr,acronym { border: 0; font-variant: normal; }
  453. -input,textarea,select { font-family: inherit; font-size: inherit; font-weight: inherit; }
  454. -a { text-decoration: none; color: inherit; }
  455. -
  456. -html {
  457. - font-size: 62.5%;
  458. - height: 100%;
  459. -}
  460. -body {
  461. - background-color: #fff;
  462. - color: #111;
  463. - font: normal 1.1em/1.5em 'Helvetica Neue', Helvetica, Arial, Verdana, sans-serif;
  464. - margin: 0;
  465. - height: 100%;
  466. -}
  467. -
  468. -pre {
  469. - font-size: 10px;
  470. -}
  471. -code {
  472. - font-family: monospace;
  473. -}
  474. -pre code {
  475. - display: block;
  476. - background: #111;
  477. - color: #fff;
  478. - padding: .5em .75em .35em;
  479. - margin-bottom: 1em;
  480. -}
  481. -
  482. -em {
  483. - font-style: italic;
  484. -}
  485. -strong {
  486. - font-weight: bold;
  487. -}
  488. -
  489. -a:link,
  490. -a:visited {
  491. - color: #222;
  492. -}
  493. -a:hover {
  494. - text-decoration: underline;
  495. -}
  496. -
  497. -h1,
  498. -h2 {
  499. - letter-spacing: -.01em;
  500. -}
  501. -h1 {
  502. - color: #344469;
  503. - font: bold 2.6em "palatino linotype", palatino, georgia, "times new roman", times, serif;
  504. - margin-bottom: .3em
  505. -}
  506. -h2 {
  507. - color: #664761;
  508. - font: bold 2em "palatino linotype", palatino, georgia, "times new roman", times, serif;
  509. - margin-bottom: .4em;
  510. -}
  511. -h3 {
  512. - font: bold 1.75em "palatino linotype", palatino, georgia, "times new roman", times, serif;
  513. - margin-bottom: .5em;
  514. -}
  515. -h4 {
  516. - font-size: 1.5em;
  517. - font-weight: bold;
  518. - margin-bottom: .9em;
  519. -}
  520. -h5 {
  521. - font-size: 1em;
  522. - font-weight: bold;
  523. - margin-bottom: 1em;
  524. -}
  525. -h6 {
  526. - font-size: .8em;
  527. - font-weight: bold;
  528. - margin-bottom: 1.25em;
  529. -}
  530. -
  531. -ul {
  532. - margin: 0 0 0 1.75em;
  533. -}
  534. -ul li {
  535. - list-style-type: disc;
  536. -}
  537. -ol {
  538. - padding-left: 2em;
  539. - margin-bottom: 1em;
  540. -}
  541. -ol li {
  542. - list-style: decimal;
  543. -}
  544. -
  545. -hr {
  546. - border: 0;
  547. - border-top: 1px solid #ddd;
  548. -}
  549. -
  550. -a.comment_delete_link,
  551. -a.comment_edit_link,
  552. -a.delete_link,
  553. -a.edit_link,
  554. -a.next_page,
  555. -a.prev_page,
  556. -a.next_post,
  557. -a.prev_post,
  558. -a.cancel,
  559. -a.logout {
  560. - font-weight: bold;
  561. -}
  562. -
  563. -a.comment_delete_link,
  564. -a.comment_edit_link {
  565. - float: right;
  566. - margin: 0 0 0 .5em;
  567. -}
  568. -a.delete_link {
  569. - color: #d8583e !important;
  570. -}
  571. -a.edit_link {
  572. - color: #93ba52 !important;
  573. -}
  574. -a.next_page,
  575. -a.prev_page,
  576. -a.next_post,
  577. -a.prev_post {
  578. - background-color: #e2e2e2;
  579. - color: #3C4D69;
  580. - margin: 0 0 2em;
  581. - padding: .4em .6em;
  582. -}
  583. -a.next_page:hover,
  584. -a.prev_page:hover,
  585. -a.next_post:hover,
  586. -a.prev_post:hover {
  587. - color: #4E6B83;
  588. -}
  589. -a.cancel {
  590. - color: #e35533;
  591. - border: none;
  592. - text-decoration: underline;
  593. -}
  594. -a.logout {
  595. - color: #5B7C99;
  596. - float: right;
  597. -}
  598. -
  599. -label {
  600. - color: #777;
  601. - display: block;
  602. - font: bold 1.4em "palatino linotype", palatino, georgia, "times new roman", times, serif;
  603. - font-weight: bold;
  604. - padding: 0 0 0.2em 0;
  605. -}
  606. -input[type="text"],
  607. -input[type="password"],
  608. -textarea {
  609. - background-color: #f9f9f9;
  610. - border: 1px solid #ccc;
  611. - border-bottom: 1px solid #eee;
  612. - border-right: 1px solid #eee;
  613. - font-family: 'Monaco', Courier, monospace;
  614. - margin-bottom: 1.5em;
  615. - padding: .3em .4em;
  616. -}
  617. -input[type="file"] {
  618. - margin-bottom: 1.5em;
  619. -}
  620. -input[type="text"],
  621. -input[type="password"] {
  622. - width: 20em;
  623. -}
  624. -textarea.wide {
  625. - width: 432px;
  626. -}
  627. -input.big {
  628. - font-size: 1.5em;
  629. -}
  630. -
  631. -div#controls {
  632. - background-color: #131313;
  633. - border-bottom: .1em solid #0f0f0f;
  634. - padding: .2em 0 .3em;
  635. - width: 100%;
  636. -}
  637. -div#controls ul {
  638. - margin: 0 auto;
  639. - padding: .4em;
  640. - width: 660px;
  641. -}
  642. -div#controls ul li {
  643. - background: none;
  644. - display: inline;
  645. - font-weight: bold;
  646. - margin: 0;
  647. - padding: 0;
  648. -}
  649. -div#controls ul li a:link,
  650. -div#controls ul li a:visited {
  651. - color: #bbb;
  652. - border: none;
  653. - padding: .1em .6em;
  654. -}
  655. -div#controls ul li a:hover {
  656. - color: #fff;
  657. -}
  658. -div#controls ul li.close a:link,
  659. -div#controls ul li.close a:visited {
  660. - color: #e35533;
  661. -}
  662. -div#controls ul li.close a:hover {
  663. - color: #ff6039;
  664. -}
  665. -
  666. -div#wrapper {
  667. - width: 660px;
  668. - margin: 2em auto;
  669. - padding: 0 0 1em 0;
  670. -}
  671. -
  672. -div#content {
  673. - width: 440px;
  674. - float: left;
  675. -}
  676. -
  677. -div#sidebar {
  678. - background: url('../images/dots-grey.gif') top left repeat;
  679. - float: right;
  680. - margin: 0 0 2em 0;
  681. - padding: 1.5em 1em;
  682. - width: 165px;
  683. -}
  684. -div#sidebar a:link,
  685. -div#sidebar a:visited {
  686. - padding: .1em .2em;
  687. - margin: 0 0 0 -.4em;
  688. -}
  689. -div#sidebar a:hover {
  690. - background-color: #111;
  691. - color: #ddd;
  692. - text-decoration: none;
  693. -}
  694. -div#sidebar h1 {
  695. - color: #664761;
  696. - font-size: 1.4em;
  697. - font-style: normal;
  698. - margin: 1em 0 .2em 0;
  699. -}
  700. -div#sidebar input#search {
  701. - background-color: #fff;
  702. - border: 0;
  703. - margin: -5px auto 0;
  704. - width: 150px;
  705. - padding: .4em .7em;
  706. - display: block;
  707. -}
  708. -div#sidebar ul li {
  709. - color: #555;
  710. -}
  711. -
  712. -
  713. -div#header {
  714. - background-color: #111;
  715. - padding: 2em 0 .6em 0;
  716. - margin: 0 0 3em;
  717. - width: 100%;
  718. -}
  719. -div#header .header_box {
  720. - margin: auto;
  721. - width: 660px;
  722. -}
  723. -div#header h1 {
  724. - margin-bottom: .2em;
  725. -}
  726. -div#header h1 a:link,
  727. -div#header h1 a:visited,
  728. -div#header h2 {
  729. - color: #eee;
  730. - font-family: Georgia;
  731. - font-style: italic;
  732. -}
  733. -div#header h1 a:hover {
  734. - color: #fff;
  735. - text-decoration: none;
  736. -}
  737. -div#header h2 {
  738. - color: #664761;
  739. - margin: -.2em 0 0 0;
  740. -}
  741. -
  742. -div#footer {
  743. - background: url('../images/dots-lightgrey.gif') top left repeat;
  744. - clear: both;
  745. - color: #888;
  746. - margin: 3em 0;
  747. - padding: .4em .6em;
  748. -}
  749. -div#footer a.chyrp:hover {
  750. - color: #6189a3;
  751. -}
  752. -div#footer a.atom {
  753. - background-color: #bbb;
  754. - border: none;
  755. - color: #222;
  756. - margin: -2.5em .4em 0 0;
  757. - padding: .3em .6em;
  758. - float: right;
  759. -}
  760. -div#footer a.atom:hover {
  761. - background-color: #EEA64A;
  762. -}
  763. -
  764. -div.notice, div.message, div.warning, div.date {
  765. - color: #111;
  766. - font-weight: bold;
  767. - margin: 0 0 1em 0;
  768. - padding: .5em .8em;
  769. -}
  770. -div.notice {
  771. - background: url('../images/dots-green.gif') repeat top left;
  772. -}
  773. -div.message {
  774. - background: url('../images/dots-blue.gif') repeat top left;
  775. -}
  776. -div.warning {
  777. - background: url('../images/dots-red.gif') repeat top left;
  778. -}
  779. -div.date {
  780. - background: url('../images/dots-lightgrey.gif') repeat top left;
  781. - cursor: default;
  782. -}
  783. -div.notice .sub, div.message .sub, div.warning .sub {
  784. - font-size: .9em;
  785. - color: #888;
  786. - margin-left: .5em;
  787. -}
  788. -
  789. -h2.comments {
  790. - margin: 0 0 1.0em 0;
  791. -}
  792. -ol.comments {
  793. - list-style: none;
  794. - margin-bottom: 1em;
  795. - padding: 0;
  796. - word-wrap: break-word;
  797. -}
  798. -ol.comments li {
  799. - list-style: none;
  800. - margin-bottom: 1.5em;
  801. - width: auto;
  802. -}
  803. -ol.comments li blockquote {
  804. - background: #111;
  805. - color: #eee;
  806. - margin: 0;
  807. - padding: 1em 1em 0;
  808. -}
  809. -ol.comments li blockquote p {
  810. - padding: 0 0 1em;
  811. -}
  812. -ol.comments li blockquote a:link,
  813. -ol.comments li blockquote a:visited {
  814. - color: #aaa;
  815. -}
  816. -ol.comments li blockquote blockquote {
  817. - padding: 0 1em;
  818. - color: #aaa;
  819. -}
  820. -ol.comments li cite {
  821. - background: #141414;
  822. - color: #666;
  823. - display: block;
  824. - font-style: normal;
  825. - margin: 0;
  826. - padding: .4em 1.3em;
  827. -}
  828. -ol.comments li cite a:link,
  829. -ol.comments li cite a:visited {
  830. - color: #bbb;
  831. -}
  832. -ol.comments li cite a.permalink:link,
  833. -ol.comments li cite a.permalink:visited {
  834. - color: #666;
  835. -}
  836. -ol.comments li ul,
  837. -ol.comments li ol {
  838. - margin: 0;
  839. - padding: 0 0 1em 1.5em;
  840. -}
  841. -ol.comments li ul li,
  842. -ol.comments li ol li {
  843. - margin: 0;
  844. - padding: 0;
  845. -}
  846. -ol.comments li ol li {
  847. - list-style-type: decimal;
  848. -}
  849. -
  850. -#add_comment {
  851. - margin-top: 3em;
  852. -}
  853. -
  854. -div.post {
  855. - margin: 0 0 3em;
  856. - word-wrap: break-word;
  857. -}
  858. -div.post a:link,
  859. -div.post a:visited {
  860. - color: #3f5161;
  861. -}
  862. -div.post h2.title {
  863. - font-size: 2em;
  864. - padding: 0 0 .3em 0;
  865. - margin: 0;
  866. -}
  867. -div.post h2.title a:link,
  868. -div.post h2.title a:visited {
  869. - color: #222;
  870. - font-size: .8em;
  871. - font-style: normal;
  872. - font-weight: bold;
  873. -}
  874. -div.post h2.title a:hover {
  875. - color: #000;
  876. -}
  877. -div.post .pinned_text {
  878. - content: "!";
  879. - float: left;
  880. - font-size: 1.5em;
  881. - font-weight: bold;
  882. - margin: .15em 0 0 -1em;
  883. - color: #e35533;
  884. -}
  885. -div.post p,
  886. -div.page p {
  887. - padding: 0 0 1em;
  888. - font-size: 1.1em;
  889. -}
  890. -div.post li,
  891. -div.page li {
  892. - font-size: 1.1em;
  893. -}
  894. -div.post li p,
  895. -div.page li p {
  896. - font-size: 1em;
  897. -}
  898. -div.post pre,
  899. -div.page pre {
  900. - padding: 0 0 1.5em;
  901. -}
  902. -div.post blockquote {
  903. - padding: .5em .8em;
  904. - background: #f9f9f9;
  905. - border: .1em solid #eee;
  906. - color: #333;
  907. - margin: 0 0 1em 0;
  908. -}
  909. -div.post blockquote p {
  910. - padding: 0;
  911. -}
  912. -div.post span.info,
  913. -div.post span.controls,
  914. -div.page span.controls {
  915. - background-color: #111;
  916. - color: #666;
  917. - float: left;
  918. - margin: .6em 0 0 0;
  919. - padding: .3em .6em;
  920. -}
  921. -div.post span.info a:link,
  922. -div.post span.info a:visited {
  923. - color: #bbb;
  924. - padding: 0;
  925. -}
  926. -div.post span.controls,
  927. -div.page span.controls {
  928. - background-color: #eee;
  929. - color: #ccc;
  930. - margin: .6em 0 0 .6em;
  931. -}
  932. -div.post ul {
  933. - margin-bottom: 1em;
  934. -}
  935. -div.post.quote blockquote {
  936. - background: none;
  937. - border: 0;
  938. - color: #777;
  939. - font: 2em/1.25em normal palatino linotype, palatino, georgia, 'times new roman', times, serif;
  940. - margin: 0 0 -.5em 0;
  941. - padding: 0;
  942. -}
  943. -div.post.quote .source {
  944. - color: #999;
  945. - display: block;
  946. - margin: 1em 0;
  947. -}
  948. -div.post.link h2 a:link,
  949. -div.post.link h2 a:visited {
  950. - color: #3f5161;
  951. - font-size: 1.2em;
  952. - margin: 0 0 -.5em 0;
  953. - padding: 0;
  954. - text-decoration: underline;
  955. -}
  956. -div.post.link h2 a:hover {
  957. - color: #354451;
  958. -}
  959. -div.post.link p {
  960. - color: #444;
  961. -}
  962. -div.post.chat p {
  963. - display: inline;
  964. -}
  965. -div.post.chat ul {
  966. - font-family: "monaco", monospace;
  967. - font-size: .9em;
  968. - margin: 0 1em 1em 0;
  969. - padding: 0;
  970. - color: #535353;
  971. -}
  972. -div.post.chat ul li {
  973. - background: none;
  974. - list-style-type: none;
  975. - padding: 0;
  976. -}
  977. -div.post.chat li .label {
  978. - color: #2D3879;
  979. -}
  980. -div.post.chat li.me .label {
  981. - color: #AB2F26;
  982. -}
  983. -div.post.photo img {
  984. - border: .3em solid #111;
  985. -}
  986. -div.post.photo img a:link,
  987. -div.post.photo img a:visited {
  988. - border: none;
  989. -}
  990. -div.post.photo p,
  991. -div.post.audio p,
  992. -div.post.video p {
  993. - color: #444;
  994. - margin: .4em 0;
  995. -}
  996. -
  997. -div.page h1 {
  998. - margin-bottom: .5em;
  999. - color: #4f3a56;
  1000. - font: bold 2.2em "palatino linotype", palatino, georgia, "times new roman", times, serif;
  1001. - letter-spacing: -.01em;
  1002. -}
  1003. -div.page span.controls {
  1004. - float: right;
  1005. -}
  1006. -
  1007. -.inline_edit {
  1008. - color: #ddd;
  1009. - padding: 1em;
  1010. - background: #111;
  1011. - position: relative;
  1012. -}
  1013. -.inline_edit input[type="text"],
  1014. -.inline_edit textarea {
  1015. - background-color: #222;
  1016. - border: none;
  1017. - color: #eee;
  1018. - padding: .4em;
  1019. - width: 410px;
  1020. -}
  1021. -.inline_edit .more_options_link:link {
  1022. - color: #5B7C99;
  1023. - display: block;
  1024. - font-weight: bold;
  1025. - padding: 0 0 .3em 0;
  1026. -}
  1027. -.inline_edit .more_options {
  1028. - background-color: #1a1a1a;
  1029. - padding: 1em;
  1030. -}
  1031. -.inline_edit .more_options p {
  1032. - float: left;
  1033. - width: 50%;
  1034. - min-height: 5em;
  1035. - padding-bottom: .5em;
  1036. - margin: 0;
  1037. -}
  1038. -.inline_edit .more_options p input[type="text"] {
  1039. - width: 90%;
  1040. - margin-bottom: 0;
  1041. -}
  1042. -.inline_edit .more_options p .sub {
  1043. - font-size: .8em;
  1044. - color: #777;
  1045. -}
  1046. -.inline_edit .buttons {
  1047. - padding: .5em;
  1048. - background: #1a1a1a;
  1049. - color: #ddd;
  1050. -}
  1051. -.inline_edit h2 {
  1052. - color: #83A650;
  1053. -}
  1054. -.post_edit {
  1055. - margin-bottom: 2em;
  1056. -}
  1057. -
  1058. -div.pagination {
  1059. - margin: 0 0 2em 0;
  1060. -}
  1061. -
  1062. -.sub {
  1063. - font-size: .85em;
  1064. - color: #999;
  1065. - font-weight: normal;
  1066. -}
  1067. -
  1068. -button {
  1069. - background-color: #664761;
  1070. - border: 1px solid #795473;
  1071. - border-bottom: 1px solid #593E55;
  1072. - border-right: 1px solid #593E55;
  1073. - color: #ddd;
  1074. - font-size: 1em;
  1075. - font-weight: bold;
  1076. - padding: 5px 8px;
  1077. -}
  1078. -button:hover {
  1079. - color: #fff;
  1080. - cursor: pointer;
  1081. -}
  1082. -
  1083. -p.lost_pass {
  1084. - margin: 0 0 1em 0;
  1085. -}
  1086. -
  1087. -span.pages {
  1088. - color: #888;
  1089. - font-weight: bold;
  1090. - padding: 0 0.3em;
  1091. -}
  1092. -span.who,
  1093. -span.waiting {
  1094. - background-color: #e2e2e2;
  1095. - font-weight: bold;
  1096. - display: block;
  1097. - margin: 0 0 1em;
  1098. - padding: 4px 6px;
  1099. -}
  1100. -
  1101. -.clear {
  1102. - clear: both;
  1103. -}
  1104. -.right {
  1105. - float: right;
  1106. -}
  1107. -.left {
  1108. - float: left;
  1109. -}
  1110. -
  1111. -/* Miscellaneous */
  1112. - /* Emoticons module. */
  1113. - img.smiley {
  1114. - margin: 0 0 -.3em;
  1115. - }
  1116. -
  1117. - /* Tags module. */
  1118. - .tag {
  1119. - font-family: "palatino linotype", palatino, georgia, "times new roman", times, serif;
  1120. - }
  1121. - .tags_select {
  1122. - display: inline-block;
  1123. - margin-top: .5em;
  1124. - }
  1125. - .tags_select a {
  1126. - padding: .1em .4em;
  1127. - border: .1em solid #DDDDA8;
  1128. - background: #FFFFCA;
  1129. - text-decoration: none;
  1130. - border-top-width: 0;
  1131. - border-left-width: 0;
  1132. - color: #555;
  1133. - }
  1134. - .tags_select a.tag_added {
  1135. - background: #111;
  1136. - border-top-width: .1em;
  1137. - border-bottom: 0;
  1138. - border-left-width: .1em;
  1139. - border-right: 0;
  1140. - border-color: #000;
  1141. - }
  1142. +/*
  1143. + * Title: openSUSE.org stylesheet (Bento-Theme)
  1144. + * Author: Robert Lihm <rlihm@opensuse.org>
  1145. + * Copyright (c) 2009 AUTHORS.txt (http://www.opensuse.org)
  1146. + * Licensed under the MIT (MIT-LICENSE.txt) license.
  1147. + */
  1148. -/* Debugger */
  1149. -#debug {
  1150. - background: #ffffdd;
  1151. - color: #666;
  1152. - padding: .4em .75em .5em .75em;
  1153. - border-top: .1em solid #ddd;
  1154. - position: fixed;
  1155. - bottom: 0;
  1156. - left: 0;
  1157. - right: 0;
  1158. - max-height: 33%;
  1159. - overflow-y: auto;
  1160. - overflow-x: hidden;
  1161. -}
  1162. -#debug h5 {
  1163. - margin: 0;
  1164. - font-size: 1.1em;
  1165. - color: #a3a39a;
  1166. -}
  1167. -#debug h5 .sub {
  1168. - color: #b3b3aa;
  1169. -}
  1170. -#debug ol.queries li {
  1171. - margin: 0 0 1em;
  1172. -}
  1173. -#debug pre {
  1174. - background: #fff;
  1175. - border: 1px solid #ddd;
  1176. - padding: 0 .5em;
  1177. - word-wrap: break-word;
  1178. -}
  1179. -#debug .toggle {
  1180. - font-weight: bold;
  1181. - color: #666;
  1182. - float: right;
  1183. -}
  1184. +@import url("../../../../css/reset.css"); /* reset default browser settings */
  1185. +@import url("../../../../css/grid.css"); /* add fluid 960 Grid System */
  1186. +@import url("../../../../css/base.css"); /* Basic CSS - Common styles */
  1187. +@import url("../../../../css/base.fluid.fix.css"); /* Fixes for Bento with fluid 960gs */
  1188. +@import url("../../../../css/style.css");