only use lesscss when local

added Makefile to generate css

css file is tracked by git to easy publishing with "git push"

diff --git a/.htaccess b/.htaccess
index e2570ae..69c8641 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -7,6 +7,7 @@ DirectorySlash Off
 AddDefaultCharset UTF-8
 RewriteEngine  on
 RewriteRule    ^[^/.]*$  /run.php [L]
+RewriteRule    ^style_[0-9]*.css$  /style.css [L]
 RewriteRule    ^style_[0-9]*.less$  /style.less [L]
 
 <FilesMatch "\.(css|jpg|png)$">

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..9eeb0f4
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,8 @@
+
+all: style.css tags
+
+tags: *.php code/*.php code/wfpl/*.php
+       exuberant-ctags *.php code/*.php code/wfpl/*.php
+
+style.css: style.less
+       lessc $< $@

diff --git a/admin_pages.html b/admin_pages.html
index 2181eef..9f769b3 100644 (file)
--- a/admin_pages.html
+++ b/admin_pages.html
@@ -9,7 +9,7 @@
        <script type="text/javascript">
                function make_wysiwyg(name) {
                        CKEDITOR.replace(name, {
-                               'contentsCss': 'style.css',
+                               'contentsCss': 'style_01.css',
                                'uiColor': '#ccccff',
                                'removePlugins': 'forms,templates,smiley,pagebreak,save,newpage,preview,print',
                                'height': '300px',

diff --git a/style.css b/style.css
new file mode 100644 (file)
index 0000000..0b1fab4
--- /dev/null
+++ b/style.css
@@ -0,0 +1,144 @@
+header,
+hgroup,
+section,
+footer,
+aside,
+nav,
+article,
+figure,
+img {
+  display: block;
+}
+body {
+  margin: 0;
+  padding: 0;
+  color: #000;
+  background: #eeeeee;
+  font: 14px "Verdana", sans-serif;
+}
+#centerer {
+  position: relative;
+  background: #ddffff;
+  margin: 15px auto;
+  width: 940px;
+  -moz-box-shadow: 2px 2px 15px #777;
+  -webkit-box-shadow: 2px 2px 15px #777;
+  box-shadow: 2px 2px 13px #777;
+}
+header {
+  width: 940px;
+  height: 100px;
+  background: #ddddff;
+}
+nav {
+  float: left;
+  width: 180px;
+  padding: 10px;
+  background: #ddffff;
+}
+nav a {
+  display: block;
+}
+#main-body {
+  float: left;
+  width: 704px;
+  padding: 18px 18px 18px 18px;
+  background: #ffffff;
+}
+footer {
+  clear: both;
+  width: 940px;
+  height: 50px;
+  background: #ddddff;
+}
+#wfpl_messages {
+  border: 2px solid red;
+  background: #fbb;
+  padding: 5px;
+  margin: 20px 0px;
+}
+#wfpl_messages p {
+  font-size: 120%;
+  padding: 5px;
+  margin: 0px;
+}
+#wfpl_messages hr {
+  height: 1px;
+}
+#admin_links {
+  background: #fdd;
+  padding: 3px;
+  margin-bottom: 15px;
+}
+.caption {
+  margin-top: 15px;
+  font-weight: bold;
+}
+.field {
+  margin-bottom: 15px;
+}
+div.field_notes {
+  font-size: 12px;
+  line-height: 16px;
+}
+fieldset {
+  border: 1px dotted black;
+  padding: 0 15px 15px 15px;
+  margin: 15px 0;
+  position: relative;
+}
+legend {
+  padding: 0 6px;
+  font-weight: bold;
+}
+div.error {
+  border: 2px solid red;
+  padding: 13px;
+  margin: 20px;
+  background: #fdd;
+}
+span.wfpl_ifl {
+  display: block;
+  float: left;
+  font-size: 10px;
+  text-align: right;
+  background-repeat: no-repeat;
+  background-position: left top;
+  margin: 0 10px 2px 0;
+}
+span.wfpl_ifr {
+  display: block;
+  float: right;
+  font-size: 10px;
+  text-align: right;
+  background-repeat: no-repeat;
+  background-position: left top;
+  margin: 0 0 10px 2px;
+}
+div.wfpl_ic {
+  margin: 15px auto;
+  font-size: 10px;
+  text-align: right;
+  background-repeat: no-repeat;
+  background-position: center top;
+}
+td > :first-child,
+th > :first-child,
+legend + *,
+article > :first-child,
+section > :first-child,
+nav > :first-child,
+div > :first-child,
+.first {
+  margin-top: 0px;
+}
+td > :last-child,
+th > :last-child,
+fieldset > :last-child,
+article > :last-child,
+section > :last-child,
+nav > :last-child,
+div > :last-child,
+.last {
+  margin-bottom: 0px;
+}

diff --git a/template.html b/template.html
index 081144e..ca427f8 100644 (file)
--- a/template.html
+++ b/template.html
@@ -9,10 +9,7 @@
                ~$running_locally {~<script src="/javascript/html5.js"></script>~}~
                ~$running_locally unset {~<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>~}~
        <![endif]-->
-       <script>less = {env:'development'};</script>
-       <link rel="stylesheet/less" href="style_01.less" />
-       <!--~$running_locally {~--><script src="/javascript/less/less.min.js"></script><!--~}~-->
-       <!--~$running_locally unset {~--><script src="http://lesscss.googlecode.com/files/less-1.0.41.min.js"></script><!--~}~-->
+       <link rel="stylesheet~$running_locally {~/less~}~" href="style_01.~$running_locally {~less~}~~$running_locally unset {~css~}~" /><!--~$running_locally {~--><script>less = {env:'development'};</script><script src="/javascript/less/less.min.js"></script><!--~}~-->
        <!--~$head~-->
 </head>