Removed criterion colorset; will be submitted to s9y-bulletproof instead.

diff --git a/templates/bulletproof/criterion_fluid_license.txt b/templates/bulletproof/criterion_fluid_license.txt
deleted file mode 100644 (file)
index 0048dbe..0000000
--- a/templates/bulletproof/criterion_fluid_license.txt
+++ /dev/null
@@ -1 +0,0 @@
-criterion <a href="http://creativecommons.org/licenses/by/2.5/">CC BY</a> <a href="http://freecsstemplates.org/">Free CSS Templates</a>

diff --git a/templates/bulletproof/criterion_fluid_style.css b/templates/bulletproof/criterion_fluid_style.css
deleted file mode 100644 (file)
index 08763f8..0000000
--- a/templates/bulletproof/criterion_fluid_style.css
+++ /dev/null
@@ -1,211 +0,0 @@
-/*\r
-Design by Free CSS Templates\r
-http://www.freecsstemplates.org\r
-Released for free under a Creative Commons Attribution 2.5 License\r
-\r
-Adapted for Serendipity BulletProof Template as a colorset by Judebert\r
-http://judebert.com/\r
-*/\r
-\r
-* {\r
-margin: 0pt;\r
-padding: 0pt;\r
-}\r
-\r
-#wrapper {\r
-  font-size: 100%;\r
-}\r
-\r
-body {\r
-  background: #FFFFFF url(img/criterion_body.png) repeat-x;\r
-  /*--JAM: (I don't like this) font: normal small "Trebuchet MS", Arial, Helvetica, sans-serif; */\r
-  font: normal small "Trebuchet MS", Arial, Helvetica, sans-serif;\r
-  color: #666666;\r
-}\r
-\r
-h1, h2, h3 {\r
-  color: #586BAA;\r
-}\r
-\r
-blockquote {\r
-  margin-left: 3em;\r
-}\r
-\r
-/* This is not really needed; if used, fix {#sitenav ul}, {#sbsitenav ul}, {#skiplinks ul}, {ul.archivesrow}, and {ul.staticpage_navigation}, along with their <li>s\r
-ul {\r
-  margin-left: 3em;\r
-}\r
-\r
-ul li {\r
-}\r
-\r
-ol {\r
-  margin-left: 3em;\r
-}\r
-\r
-ol li {\r
-}\r
-*/\r
-\r
-.serendipity_entry_body ul,\r
-.serendipity_entry_body ol {\r
-       margin-left: 3em;\r
-}\r
-\r
-\r
-a {\r
-  color: #586BAA;\r
-}\r
-\r
-a:hover {\r
-  text-decoration: none;\r
-}\r
-\r
-/* Sidebar items (criterion Boxed Style) */\r
-.serendipitySideBarItem {\r
-  margin-bottom: 20px;\r
-}\r
-\r
-.serendipitySideBarItem .serendipitySideBarTitle {\r
-  height: 31px;\r
-  padding: 9px 0 0 20px;\r
-  background: #6FBE6E url(img/criterion_sbtitle.png) repeat-x;\r
-  font-size: 1.2em;\r
-  color: #CC0000;\r
-}\r
-\r
-.serendipitySideBarItem .serendipitySideBarContent {\r
-  padding: 20px 20px 40px 20px;\r
-  background: url(img/criterion_sbcontent.png) repeat-x;\r
-}\r
-\r
-/* entries (criterion Post) */\r
-.serendipity_title {\r
-  padding: 5px 0 0 20px;\r
-  font-size: 2em;\r
-  font-weight: normal;\r
-}\r
-\r
-.serendipity_title a {\r
-  text-decoration: none;\r
-}\r
-\r
-.serendipity_entry {\r
-  padding: 20px 20px 10px 20px;\r
-  background: url(img/criterion_entry.png) repeat-x;\r
-}\r
-\r
-.serendipity_entry_body p, \r
-.serendipity_entry_body blockquote, \r
-.serendipity_entry_body ul, \r
-.serendipity_entry_body ol {\r
-  margin-bottom: 1.5em;\r
-  line-height: 180%;\r
-}\r
-\r
-/* Sitenav tabs (criterion Menu) */\r
-#sitenav {\r
-  width: auto;\r
-  height: 90px;\r
-  margin: 0 auto;\r
-  padding: 0;\r
-  float: none;\r
-}\r
-\r
-#sitenav ul {\r
-  display: block;\r
-  margin: 0;\r
-  padding-top: 25px;\r
-}\r
-\r
-/* Already handled by BP\r
-#sitenav li {\r
-  display: inline;\r
-}\r
-*/\r
-\r
-#sitenav ul li {\r
-  /* Override index.php */\r
-  padding: 0;\r
-}\r
-\r
-#sitenav a {\r
-  display: block;\r
-  float: left;\r
-  height: 32px;\r
-  margin-left: 1px;\r
-  padding: 13px 25px 0 25px;\r
-  background: #FFFFFF url(img/criterion_tab.png) repeat-x;\r
-  text-align: center;\r
-  text-decoration: none;\r
-  font-weight: bold;\r
-  color: #586BAA;\r
-}\r
-\r
-#sitenav a:hover {\r
-  background-image: url(img/criterion_tabhover.png);\r
-  border-color: #FEDA8D;\r
-  color: #CC0000;\r
-}\r
-\r
-#sitenav .currentpage a {\r
-  height: 36px;\r
-  margin-top: -4px;\r
-  background-image: url(img/criterion_tabactive.png);\r
-  border: 1px solid #479AC6;\r
-  border-bottom: none;\r
-  font-weight: bold;\r
-  color: #479AC6;\r
-}\r
-\r
-/* Banner (criterion Logo */\r
-#serendipity_banner {\r
-  height: 60px;\r
-  margin: 0 auto;\r
-}\r
-\r
-#serendipity_banner h1 {\r
-  float: left;\r
-  letter-spacing: -2px;\r
-  font-size: 36px;\r
-  font-weight: normal;\r
-}\r
-\r
-#serendipity_banner h2 {\r
-  float: left;\r
-  font-size: 14px;\r
-  font-weight: normal;\r
-}\r
-\r
-#serendipity_banner a {\r
-  text-decoration: none;\r
-  text-transform: lowercase;\r
-  font-style: italic;\r
-  color: #479AC6;\r
-}\r
-\r
-/* criterion Content */\r
-/* Nothing in BP exactly matches this.  As it sets the width of the page, \r
- * it's closest to #wrapper; however, criterion uses #content to wrap the \r
- * entries and sidebar, leaving #logo and #menu outside.  BP puts everything\r
- * in #wrapper, and only the entries in #content.\r
- */\r
-#wrapper {\r
-  width: 95%;\r
-  margin: 0 auto;\r
-}\r
-\r
-/* Footer (criterion Footer) (Imagine that!) */\r
-#footer {\r
-  clear: both;\r
-  width: 740px;\r
-  margin: 0 auto;\r
-  padding: 30px 0;\r
-  background: url(img/criterion_pagefooter.png) repeat-x;\r
-}\r
-\r
-#footer p {\r
-  margin: 0;\r
-  text-align: center;\r
-  font-size: x-small;\r
-}\r

diff --git a/templates/bulletproof/criterion_license.txt b/templates/bulletproof/criterion_license.txt
deleted file mode 100644 (file)
index 0048dbe..0000000
--- a/templates/bulletproof/criterion_license.txt
+++ /dev/null
@@ -1 +0,0 @@
-criterion <a href="http://creativecommons.org/licenses/by/2.5/">CC BY</a> <a href="http://freecsstemplates.org/">Free CSS Templates</a>

diff --git a/templates/bulletproof/criterion_style.css b/templates/bulletproof/criterion_style.css
deleted file mode 100644 (file)
index bfe46f2..0000000
--- a/templates/bulletproof/criterion_style.css
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
-Design by Free CSS Templates
-http://www.freecsstemplates.org
-Released for free under a Creative Commons Attribution 2.5 License
-
-Adapted for Serendipity BulletProof Template as a colorset by Judebert
-http://judebert.com/
-*/
-
-* {
-margin: 0pt;
-padding: 0pt;
-}
-
-#wrapper {
-  font-size: 100%;
-  /*
-  width: 100%;
-  */
-}
-
-body {
-  background: #FFFFFF url(img/criterion_body.png) repeat-x;
-  /*--JAM: (I don't like this) font: normal small "Trebuchet MS", Arial, Helvetica, sans-serif; */
-  font: normal small "Trebuchet MS", Arial, Helvetica, sans-serif;
-  color: #666666;
-}
-
-h1, h2, h3 {
-  color: #586BAA;
-}
-
-blockquote {
-  margin-left: 3em;
-}
-
-/* This is not really needed; if used, fix {#sitenav ul}, {#sbsitenav ul}, {#skiplinks ul}, {ul.archivesrow}, and {ul.staticpage_navigation}, along with their <li>s
-ul {
-  margin-left: 3em;
-}
-
-ul li {
-}
-
-ol {
-  margin-left: 3em;
-}
-
-ol li {
-}
-*/
-
-.serendipity_entry_body ul,
-.serendipity_entry_body ol {
-       margin-left: 3em;
-}
-
-a {
-  color: #586BAA;
-}
-
-a:hover {
-  text-decoration: none;
-}
-
-/* Sidebar items (criterion Boxed Style) */
-.serendipitySideBarItem {
-  margin-bottom: 20px;
-}
-
-.serendipitySideBarItem .serendipitySideBarTitle {
-  height: 31px;
-  padding: 9px 0 0 20px;
-  background: #6FBE6E url(img/criterion_sbtitle.png) repeat-x;
-  font-size: 1.2em;
-  color: #CC0000;
-}
-
-.serendipitySideBarItem .serendipitySideBarContent {
-  padding: 20px 20px 40px 20px;
-  background: url(img/criterion_sbcontent.png) repeat-x;
-}
-
-/* entries (criterion Post) */
-.serendipity_title {
-  padding: 5px 0 0 20px;
-  font-size: 2em;
-  font-weight: normal;
-}
-
-.serendipity_title a {
-  text-decoration: none;
-}
-
-.serendipity_entry {
-  padding: 20px 20px 10px 20px;
-  background: url(img/criterion_entry.png) repeat-x;
-}
-
-.serendipity_entry_body p, 
-.serendipity_entry_body blockquote, 
-.serendipity_entry_body ul, 
-.serendipity_entry_body ol {
-  margin-bottom: 1.5em;
-  line-height: 180%;
-}
-
-/* Oddly, criterion doesn't have any Header 
- * The closest thing is div#logo, which contains an h1 and h2.
-#header {
-  width: 740px;
-  height: 150px;
-  margin: 0 auto;
-}
-*/
-
-/* Sitenav tabs (criterion Menu) */
-#sitenav {
-  width: 740px;
-  height: 90px;
-  margin: 0 auto;
-  padding: 0;
-  float: none;
-}
-
-#sitenav ul {
-  display: block;
-  margin: 0;
-  padding-top: 25px;
-}
-
-/* Already handled by BP
-#sitenav li {
-  display: inline;
-}
-*/
-
-#sitenav ul li {
-  /* Override index.php */
-  padding: 0;
-}
-
-#sitenav a {
-  display: block;
-  float: left;
-  height: 32px;
-  margin-left: 1px;
-  padding: 13px 25px 0 25px;
-  background: #FFFFFF url(img/criterion_tab.png) repeat-x;
-  text-align: center;
-  text-decoration: none;
-  font-weight: bold;
-  color: #586BAA;
-}
-
-#sitenav a:hover {
-  background-image: url(img/criterion_tabhover.png);
-  border-color: #FEDA8D;
-  color: #CC0000;
-}
-
-#sitenav .currentpage a {
-  height: 36px;
-  margin-top: -4px;
-  background-image: url(img/criterion_tabactive.png);
-  border: 1px solid #479AC6;
-  border-bottom: none;
-  font-weight: bold;
-  color: #479AC6;
-}
-
-/* Banner (criterion Logo */
-#serendipity_banner {
-  width: 740px;
-  height: 60px;
-  margin: 0 auto;
-}
-
-#serendipity_banner h1 {
-  float: left;
-  letter-spacing: -2px;
-  font-size: 36px;
-  font-weight: normal;
-}
-
-#serendipity_banner h2 {
-  float: left;
-  font-size: 14px;
-  font-weight: normal;
-}
-
-#serendipity_banner a {
-  text-decoration: none;
-  text-transform: lowercase;
-  font-style: italic;
-  color: #479AC6;
-}
-
-/* criterion Content */
-/* Nothing in BP exactly matches this.  As it sets the width of the page, 
- * it's closest to #wrapper; however, criterion uses #content to wrap the 
- * entries and sidebar, leaving #logo and #menu outside.  BP puts everything
- * in #wrapper, and only the entries in #content.
- */
-#wrapper {
-  width: 740px;
-  margin: 0 auto;
-}
-
-/* criterion Content > Main */
-/* This doesn't fit well in BP.  As #main contains only entries, the idea
- * appears to be to float the entries in a right "column".  BP takes care
- * of column placement on its own.  But we can still take care of the width.
- */
-/* Two columns, main and sidebar, just like criterion */
-.twomain {
-  width: 505px;
-}
-/* Three columns, main and two equal sidebars */
-.threemain {
-  width: 400px;
-}
-
-/* criterion Content > Sidebar */
-/* Again, this doesn't fit well in BP. #sidebar contains, predictably; the
- * sidebar, which criterion floats left.  BP still handles column placement
- * with no intervention from me (which allows multiple layouts).  Note that
- * #login is a sidebar box, which doesn't apply to s9y.
- * 
- * However, Serendipity does have sidebars, and in a fixed-width template,
- * it's important to get the size right.
- */
-/* Two columns, main and sidebar, just like criterion */
-.twoside {
-  width: 220px;
-}
-/* Three columns, main and two equal sidebars */
-.threeside {
-  width: 160px;
-}
-/* Bottom sidebars, 5 items at a time */
-.onefull .serendipitySideBarItem {
-  width: 18%
-}
-
-/* These are the specific sidebar items in the original criterion
-#login fieldset {
-  border: none;
-}
-
-#login legend {
-  display: none;
-}
-
-#login label {
-  font-size: x-small;
-  font-weight: bold;
-}
-
-#login input {
-  margin-bottom: 5px;
-}
-
-#inputtext1, #inputtext2 {
-  width: 170px;
-  padding: 2px;
-  font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-  color: #666666;
-}
-
-#inputsubmit1 {
-}
-
-/* criterion Content > Sidebar > Updates*/
-/* This might be useful in the s9y recent plugin.
-#updates {
-}
-
-#updates ul {
-  margin: 0;
-  list-style: none;
-}
-
-#updates h3 {
-  margin: 0;
-  font: bold x-small Verdana, Arial, Helvetica, sans-serif;
-}
-
-#updates p {
-  margin-bottom: 1.4em;
-  font-size: smaller;
-  line-height: normal;
-}
-*/
-
-/* Footer (criterion Footer) (Imagine that!) */
-#footer {
-  clear: both;
-  width: 740px;
-  margin: 0 auto;
-  padding: 30px 0;
-  background: url(img/criterion_pagefooter.png) repeat-x;
-}
-
-#footer p {
-  margin: 0;
-  text-align: center;
-  font-size: x-small;
-}

diff --git a/templates/bulletproof/img/criterion_back.png b/templates/bulletproof/img/criterion_back.png
deleted file mode 100644 (file)
index b6ca30c..0000000
Binary files a/templates/bulletproof/img/criterion_back.png and /dev/null differ

diff --git a/templates/bulletproof/img/criterion_body.png b/templates/bulletproof/img/criterion_body.png
deleted file mode 100644 (file)
index 4e2cb35..0000000
Binary files a/templates/bulletproof/img/criterion_body.png and /dev/null differ

diff --git a/templates/bulletproof/img/criterion_entry.png b/templates/bulletproof/img/criterion_entry.png
deleted file mode 100644 (file)
index 2101de3..0000000
Binary files a/templates/bulletproof/img/criterion_entry.png and /dev/null differ

diff --git a/templates/bulletproof/img/criterion_fluid_back.png b/templates/bulletproof/img/criterion_fluid_back.png
deleted file mode 100644 (file)
index b6ca30c..0000000
Binary files a/templates/bulletproof/img/criterion_fluid_back.png and /dev/null differ

diff --git a/templates/bulletproof/img/criterion_fluid_forward.png b/templates/bulletproof/img/criterion_fluid_forward.png
deleted file mode 100644 (file)
index 60804ee..0000000
Binary files a/templates/bulletproof/img/criterion_fluid_forward.png and /dev/null differ

diff --git a/templates/bulletproof/img/criterion_fluid_graph_bar.png b/templates/bulletproof/img/criterion_fluid_graph_bar.png
deleted file mode 100644 (file)
index 9c48022..0000000
Binary files a/templates/bulletproof/img/criterion_fluid_graph_bar.png and /dev/null differ

diff --git a/templates/bulletproof/img/criterion_forward.png b/templates/bulletproof/img/criterion_forward.png
deleted file mode 100644 (file)
index 60804ee..0000000
Binary files a/templates/bulletproof/img/criterion_forward.png and /dev/null differ

diff --git a/templates/bulletproof/img/criterion_graph_bar.png b/templates/bulletproof/img/criterion_graph_bar.png
deleted file mode 100644 (file)
index 9c48022..0000000
Binary files a/templates/bulletproof/img/criterion_graph_bar.png and /dev/null differ

diff --git a/templates/bulletproof/img/criterion_pagefooter.png b/templates/bulletproof/img/criterion_pagefooter.png
deleted file mode 100644 (file)
index 665409f..0000000
Binary files a/templates/bulletproof/img/criterion_pagefooter.png and /dev/null differ

diff --git a/templates/bulletproof/img/criterion_sbcontent.png b/templates/bulletproof/img/criterion_sbcontent.png
deleted file mode 100644 (file)
index 257f9e4..0000000
Binary files a/templates/bulletproof/img/criterion_sbcontent.png and /dev/null differ

diff --git a/templates/bulletproof/img/criterion_sbtitle.png b/templates/bulletproof/img/criterion_sbtitle.png
deleted file mode 100644 (file)
index d83718e..0000000
Binary files a/templates/bulletproof/img/criterion_sbtitle.png and /dev/null differ

diff --git a/templates/bulletproof/img/criterion_tab.png b/templates/bulletproof/img/criterion_tab.png
deleted file mode 100644 (file)
index db0c246..0000000
Binary files a/templates/bulletproof/img/criterion_tab.png and /dev/null differ

diff --git a/templates/bulletproof/img/criterion_tabactive.png b/templates/bulletproof/img/criterion_tabactive.png
deleted file mode 100644 (file)
index 714d255..0000000
Binary files a/templates/bulletproof/img/criterion_tabactive.png and /dev/null differ

diff --git a/templates/bulletproof/img/criterion_tabhover.png b/templates/bulletproof/img/criterion_tabhover.png
deleted file mode 100644 (file)
index 229072c..0000000
Binary files a/templates/bulletproof/img/criterion_tabhover.png and /dev/null differ