summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnika Henke <anika@selfthinker.org>2014-02-15 11:37:01 +0000
committerAnika Henke <anika@selfthinker.org>2014-02-15 11:37:01 +0000
commit3593102dfd174c90f99e841f66b60269bfb03be9 (patch)
tree9d6cfa85d3935eb82bde5a701f3d1884979992a1
parented5a0402d966ac5a4517ee4c6a6183d189b5fbe3 (diff)
downloadrpg-3593102dfd174c90f99e841f66b60269bfb03be9.tar.gz
rpg-3593102dfd174c90f99e841f66b60269bfb03be9.tar.bz2
included geshi styles per @import, removed from lib/exe/css
-rw-r--r--lib/exe/css.php3
-rw-r--r--lib/styles/screen.css2
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/exe/css.php b/lib/exe/css.php
index 537885c89..cab7384b2 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -70,9 +70,6 @@ function css_out(){
$files[$mediatype] = array();
// load core styles
$files[$mediatype][DOKU_INC.'lib/styles/'.$mediatype.'.css'] = DOKU_BASE.'lib/styles/';
- if($mediatype == 'screen') {
- $files[$mediatype][DOKU_INC.'lib/styles/geshi.less'] = DOKU_BASE.'lib/styles/';
- }
// load jQuery-UI theme
if ($mediatype == 'screen') {
diff --git a/lib/styles/screen.css b/lib/styles/screen.css
index 8822b698f..bbc1e86be 100644
--- a/lib/styles/screen.css
+++ b/lib/styles/screen.css
@@ -92,3 +92,5 @@ div.notify {
left: auto !important;
right: -99999em !important;
}
+
+@import "geshi.less";