summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nbproject/project.properties7
-rw-r--r--nbproject/project.xml9
-rw-r--r--user_guide_src/source/conf.py16
-rw-r--r--user_guide_src/source/images/ci-icon.icobin0 -> 5430 bytes
4 files changed, 29 insertions, 3 deletions
diff --git a/nbproject/project.properties b/nbproject/project.properties
new file mode 100644
index 000000000..d37ef9563
--- /dev/null
+++ b/nbproject/project.properties
@@ -0,0 +1,7 @@
+include.path=${php.global.include.path}
+php.version=PHP_54
+source.encoding=UTF-8
+src.dir=.
+tags.asp=false
+tags.short=false
+web.root=.
diff --git a/nbproject/project.xml b/nbproject/project.xml
new file mode 100644
index 000000000..f22df53c2
--- /dev/null
+++ b/nbproject/project.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+ <type>org.netbeans.modules.php.project</type>
+ <configuration>
+ <data xmlns="http://www.netbeans.org/ns/php-project/1">
+ <name>CodeIgniter</name>
+ </data>
+ </configuration>
+</project>
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 118b2fb87..5089cf5a2 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -92,12 +92,22 @@ highlight_language = 'ci'
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
-html_theme = 'eldocs'
+#
+# Reverting to default sphinx theme, to remove dependency on EllisLab corporate style
+#html_theme = 'eldocs'
+html_theme = 'default'
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.
-#html_theme_options = {}
+#
+# Specifying a few options; just a starting point & we can play with it.
+html_theme_options = {
+ "collapsiblesidebar" : "true",
+ "sidebarbgcolor" : "#4b7eb0",
+ "codebgcolor": "#fffded",
+ "headbgcolor": "#ffeebd"
+}
# Add any paths that contain custom themes here, relative to this directory.
html_theme_path = ["./_themes"]
@@ -116,7 +126,7 @@ html_theme_path = ["./_themes"]
# The name of an image file (within the static path) to use as favicon of the
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large.
-#html_favicon = None
+html_favicon = 'images/ci-icon.ico'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
diff --git a/user_guide_src/source/images/ci-icon.ico b/user_guide_src/source/images/ci-icon.ico
new file mode 100644
index 000000000..7ecfce214
--- /dev/null
+++ b/user_guide_src/source/images/ci-icon.ico
Binary files differ