From 7392c5e1f4d08081a1bc739e24d80ae745c93c03 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Sun, 30 Dec 2012 13:51:12 +0530 Subject: styling/style.css update -- added subtle border to div.code block --- styling/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/styling/style.css b/styling/style.css index d6a533a..9b6eaa2 100644 --- a/styling/style.css +++ b/styling/style.css @@ -6,7 +6,7 @@ */ article { - font-size:1.50em; + font-size:1.50em; /* 1.88 */ font-family:"Palatino Linotype","Book Antiqua",Palatino,"URW Palladio L",FreeSerif,serif; color:#787878; margin-left:auto; @@ -69,7 +69,7 @@ div.code { background-color:#fcfcfc; margin-left:auto; margin-right:auto; - border:1px; + border:1px solid #f0f0f0; padding:5px; width:70%; } -- cgit v1.2.3 From 8062dd66349524f1dfcdbc0ec0c5d585b1ce4b66 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Sun, 30 Dec 2012 13:54:16 +0530 Subject: [fix] stylesheet is updated, in all scruf aware directories, if the default scruf's stylesheet is updated. modified: conversion/ConvertDirectory.java --- conversion/ConvertDirectory.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/conversion/ConvertDirectory.java b/conversion/ConvertDirectory.java index 5a8cb17..9b002fe 100644 --- a/conversion/ConvertDirectory.java +++ b/conversion/ConvertDirectory.java @@ -50,6 +50,7 @@ public class ConvertDirectory { IndexCreator index = new IndexCreator(directory); // iterate through the directory. System.out.println("Current Directory: "+directory.getAbsolutePath()); + // the FileSieve parse for .scruffy files (except index.scruffy): for(File file:directory.listFiles(new FileSieve())) { if(file.isFile()) { can = canConvert.check(file); @@ -57,9 +58,6 @@ public class ConvertDirectory { System.out.println("Converting..."+file.getAbsolutePath()); html.convert(file); index.add(file); - // check for style sheet in the directory; create/update - // if needed. - styleSheet.check(directory); } } else if(file.isDirectory()) { @@ -77,6 +75,11 @@ public class ConvertDirectory { System.out.println("Converting..."+index.indexFile().getAbsolutePath()); html.convert(index.indexFile()); } + // check whether this directory has scruffy files: + if(index.indexFile().exists()) { + // create/update stylesheet if need. + styleSheet.check(directory); + } --DirectoryInfo.level; } -- cgit v1.2.3 From 67a2c215c1a3b5a4d0d6919fcf1e17814d755513 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Mon, 31 Dec 2012 23:32:30 +0530 Subject: stylesheet updated -- links are more prominent now. --- styling/style.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/styling/style.css b/styling/style.css index 9b6eaa2..1929ca3 100644 --- a/styling/style.css +++ b/styling/style.css @@ -69,6 +69,8 @@ div.code { background-color:#fcfcfc; margin-left:auto; margin-right:auto; + margin-top:5px; + margin-bottom:5px; border:1px solid #f0f0f0; padding:5px; width:70%; @@ -108,7 +110,7 @@ a:link,a:visited { -webkit-transition:border-bottom 0.3s, color 0.3s; -o-transition:border-bottom 0.3s, color 0.3s; color:#686868; - border-bottom:1px dotted #d9d9d9; + border-bottom:1px solid #d9d9d9; text-decoration:none; } a:hover,a:active { @@ -154,7 +156,7 @@ div.lastupdate { } div.source { - font-size:0.4em; + font-size:0.5em; font-family:monospace; text-align:center; color:#989898; -- cgit v1.2.3 From 5a612c683eb34d0878ec86491556cd8921d63e16 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Sun, 10 Mar 2013 22:04:40 +0530 Subject: modified: parsers/QuoteSpecialText.java (regex that recognizes special-text modified) now, HTML special codes/numbers are not quoted by this class. --- parsers/QuoteSpecialText.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parsers/QuoteSpecialText.java b/parsers/QuoteSpecialText.java index 76241cc..91e8760 100644 --- a/parsers/QuoteSpecialText.java +++ b/parsers/QuoteSpecialText.java @@ -33,7 +33,7 @@ public class QuoteSpecialText implements Parser { qmap.put(">",">"); } public String parse(String fileContent) { - Pattern pattern = Pattern.compile("(\\&\\#35\\;)|(\\&)|(\\<)|(\\>)"); + Pattern pattern = Pattern.compile("(\\&(\\w+|\\#\\d+)\\;)|(\\&)|(\\<)|(\\>)"); Matcher matcher = pattern.matcher(fileContent); StringBuffer sbuffer = new StringBuffer(); while(matcher.find() && matcher.group(1)==null) { -- cgit v1.2.3 From 5d7578f2181d0c370e51d6e169652fa5e8aa93c4 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Sat, 23 Mar 2013 18:34:43 +0530 Subject: modified: parsers/Images.java (Pattern for image recognition updated. Now scruf can detect images with png|jpg|jpeg extension)x -------------- This line and the following will be ignored -------------- === modified file 'parsers/Images.java' --- a/parsers/Images.java 2012-11-30 13:18:40 +0000 +++ b/parsers/Images.java 2013-03-23 13:00:50 +0000 @@ -28,7 +28,7 @@ private String openTag = "\" Date: Sat, 27 Apr 2013 19:34:52 +0530 Subject: modified: parsers/Images.java (now scruffy-markup accepts svg images) --- parsers/Images.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parsers/Images.java b/parsers/Images.java index 7969840..8e0c566 100644 --- a/parsers/Images.java +++ b/parsers/Images.java @@ -28,7 +28,7 @@ public class Images implements Parser { private String openTag = "\" Date: Wed, 26 Jun 2013 22:45:58 +0530 Subject: updated etc/TODO (the future of scruf) --- etc/TODO | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/etc/TODO b/etc/TODO index e5386b0..12671f6 100644 --- a/etc/TODO +++ b/etc/TODO @@ -1,16 +1,11 @@ SCRUF - TODO -*- mode: org; -*- * features - -** build system (GNU auto tools) - -** test suite - -** implement lists - introduce mark-up for lists. Weird that I have not implement - yet. - -** mark-up to center align text +** proper semantic +** use markdownj for text to html5 conversion + that necessarily means scruffy markup will be done away with. +** page format options -- stream, singleton, +** build system (ant system) * distribution related ** NEWS file -- cgit v1.2.3 From d2b2ea4d6fd8d8b2529d8df37ef151982c596e44 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Wed, 26 Jun 2013 22:46:49 +0530 Subject: modified: parsers/Images.java (`alt' attribute constructs itself nicely now) --- parsers/Images.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parsers/Images.java b/parsers/Images.java index 8e0c566..f38ef46 100644 --- a/parsers/Images.java +++ b/parsers/Images.java @@ -25,7 +25,7 @@ import java.util.regex.*; public class Images implements Parser { // set of strings to build the img tag - private String openTag = "\" Date: Wed, 26 Jun 2013 22:48:31 +0530 Subject: modified: parsers/CodeBlocks.java ( code blocks are wrapped around 
 element)

---
 parsers/CodeBlocks.java | 4 ++--
 styling/style.css       | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/parsers/CodeBlocks.java b/parsers/CodeBlocks.java
index 75efa27..a783951 100644
--- a/parsers/CodeBlocks.java
+++ b/parsers/CodeBlocks.java
@@ -35,9 +35,9 @@ public class CodeBlocks implements Parser {
 	StringBuilder replacement = new StringBuilder();
 	while(matcher.find()) {
 	    replacement.delete(0,replacement.length());
-	    replacement.append("
");
+	    replacement.append("
");
 		replacement.append(lbreak.parse(symbolMap.quote(matcher.group(3))));
-	    replacement.append("
");
+	    replacement.append("
"); matcher.appendReplacement(sbuffer,replacement.toString()); } matcher.appendTail(sbuffer); diff --git a/styling/style.css b/styling/style.css index 1929ca3..13dd629 100644 --- a/styling/style.css +++ b/styling/style.css @@ -63,9 +63,13 @@ span.monospace { font-family:monospace; } -div.code { +pre { + display:block; font-family:monospace; - font-size:0.625em; + font-size:0.6em; + word-break:break-all; + word-wrap:break-word; + white-space:pre-wrap; background-color:#fcfcfc; margin-left:auto; margin-right:auto; -- cgit v1.2.3 From 83e1bf5f0e299b9d99c8e2b01aacd5cda9a37d1c Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Sat, 29 Jun 2013 19:33:58 +0530 Subject: modified: styling/style.css (insignificant items' opacity is set to 0.3, opacity becomes 1.0 when hovered) --- styling/style.css | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/styling/style.css b/styling/style.css index 13dd629..dbeabf0 100644 --- a/styling/style.css +++ b/styling/style.css @@ -14,7 +14,7 @@ article { border:1px; padding:5px; width:97%; - box-shadow: 1px 1.5px 3px 0.5px #bababa; + box-shadow: 1px 1.5px 3px 0.5px #bababa; } h1, h2, h3, h4, h5 { @@ -66,7 +66,7 @@ span.monospace { pre { display:block; font-family:monospace; - font-size:0.6em; + font-size:0.625em; word-break:break-all; word-wrap:break-word; white-space:pre-wrap; @@ -127,6 +127,9 @@ div.back { font-size:0.7em; font-family:junicode,"Palatino Linotype","Book Antiqua",Palatino,"URW Palladio L",FreeSerif,serif; text-align:center; + transition: opacity 1s; + -webkit-transition: opacity 1s; + opacity: 0.3; color:#989898; margin-left:auto; margin-right:auto; @@ -134,6 +137,9 @@ div.back { padding:5px; width:7%; } +div.back:hover { + opacity: 1.0; +} footer { font-size:0.8em; @@ -151,6 +157,9 @@ div.lastupdate { font-size:0.6em; font-family:"Palatino Linotype","Book Antiqua",Palatino,"URW Palladio L",FreeSerif,serif; text-align:center; + transition: opacity 1s; + -webkit-transition: opacity 1s; + opacity:0.3; color:#989898; margin-left:auto; margin-right:auto; @@ -159,10 +168,17 @@ div.lastupdate { width:40%; } +div.lastupdate:hover { + opacity: 1.0; +} + div.source { font-size:0.5em; font-family:monospace; text-align:center; + transition: opacity 1s; + -webkit-transition: opacity 1s; + opacity: 0.3; color:#989898; margin-left:auto; margin-right:auto; @@ -170,17 +186,26 @@ div.source { padding:5px; width:40%; } +div.source:hover { + opacity: 1.0; +} div.scruf { font-size:0.9em; font-family:"Palatino Linotype","Book Antiqua",Palatino,"URW Palladio L",FreeSerif,serif; text-align:center; + transition: opacity 1s; + -webkit-transition: opacity 1s; + opacity: 0.3; color:#bcbcbc; margin-left:auto; margin-right:auto; border:1px; padding:5px; width:40%; +} +div.scruf:hover { + opacity: 1.0; } -- cgit v1.2.3