From 32fd8f3908bc8632e2d8ab4d872f6e4362fe031b Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 12 Oct 2014 10:52:35 -0400
Subject: v5: merge v6: remove defaults.rb & some relics related to sisu skins

---
 lib/sisu/v5/css.rb | 78 ++++++++++++++++++++++++++----------------------------
 1 file changed, 38 insertions(+), 40 deletions(-)

(limited to 'lib/sisu/v5/css.rb')

diff --git a/lib/sisu/v5/css.rb b/lib/sisu/v5/css.rb
index 09f5a435..b70d3edd 100644
--- a/lib/sisu/v5/css.rb
+++ b/lib/sisu/v5/css.rb
@@ -59,7 +59,7 @@
 =end
 module SiSU_Style
   require_relative 'se'                                 # se.rb
-  require_relative 'defaults'                           # defaults.rb
+  require_relative 'html_parts'                         # html_parts.rb
   class CSS_HeadInfo
     def initialize(md,ft='html')
       @md,@ft=md,ft
@@ -159,40 +159,38 @@ module SiSU_Style
     end
   end
   class CSS
-    def initialize
-      @vz=SiSU_Viz::Defaults.new
-    end
+    include SiSU_Parts_HTML
     def fonts
-      @vz.font_fonts
+      the_font.set_fonts
     end
     def html_tables                               #stylesheet for css table_pages
 <<WOK
 /* SiSU table output stylesheet */
   body {
     color: black;
-    background: #{@vz.color_white};
+    background: #{the_color.white};
   }
   p {
     display: block;
     line-height: 1.5;
-    font-family: #{fonts};
+    font-family: #{the_font.set_fonts};
   }
   a:link {
-    color: #{@vz.color_blue_ink};
+    color: #{the_color.blue_ink};
     text-decoration: none;
   }
   a:visited {
-    color: #{@vz.color_blue_ink};
+    color: #{the_color.blue_ink};
     text-decoration: none;
-    /* background-color: #{@vz.color_blue_tinge}; */
+    /* background-color: #{the_color.blue_tinge}; */
   }
   a:hover {
-    color: #{@vz.color_black};
+    color: #{the_color.black};
     text-decoration: underline;
-    background-color: #{@vz.color_yellow_light};
+    background-color: #{the_color.yellow_light};
   }
   a:active {
-    color: #{@vz.color_blue_ink};
+    color: #{the_color.blue_ink};
     text-decoration: underline;
   }
 WOK
@@ -1679,14 +1677,14 @@ WOK
     end
     def homepage                                  #stylesheet for index, home page
 <<WOK
-  body {color: black; background: #{@vz.color_white}; margin:10px 10px 0px 10px; padding:0px;}
+  body {color: black; background: #{the_color.white}; margin:10px 10px 0px 10px; padding:0px;}
   p { line-height: 1.5 }
-  a:link      {color: #{@vz.color_blue_ink};   text-decoration: none; }
-  a:visited       {color: #{@vz.color_blue_ink};   text-decoration: none; }
-  a:hover {color: #{@vz.color_black}; text-decoration: underline; background-color: #{@vz.color_yellow_light};}
-  a:active {color: #{@vz.color_blue_ink}; text-decoration: underline;}
+  a:link      {color: #{the_color.blue_ink};   text-decoration: none; }
+  a:visited       {color: #{the_color.blue_ink};   text-decoration: none; }
+  a:hover {color: #{the_color.black}; text-decoration: underline; background-color: #{the_color.yellow_light};}
+  a:active {color: #{the_color.blue_ink}; text-decoration: underline;}
   #banner {
-    background:#{@vz.color_white};
+    background:#{the_color.white};
   }
   #column_left {
     width:25%;
@@ -1697,7 +1695,7 @@ WOK
   #column_center {
     width:55%;
     float:left;
-    background:#{@vz.color_white};
+    background:#{the_color.white};
     padding-bottom:10px;
   }
   #column_right {
@@ -1707,7 +1705,7 @@ WOK
     padding-bottom:10px;
   }
   p,h1,pre {
-    font-family: #{fonts};
+    font-family: #{the_font.set_fonts};
     margin:0px 10px 10px 10px;
   }
   h1 {
@@ -1757,7 +1755,7 @@ WOK
     }
     dc {
       display: block;
-      font-family: #{fonts};
+      font-family: #{the_font.set_fonts};
       color: blue;
       background-color: #dddddd;
       font-weight: normal;
@@ -1775,7 +1773,7 @@ WOK
     }
     keywords,copyright {
       display: block;
-      font-family: #{fonts};
+      font-family: #{the_font.set_fonts};
       color: red;
       background-color: #dddddd;
       font-weight: normal;
@@ -1831,7 +1829,7 @@ WOK
     }
     text,text[class|="norm"] {
       display: block;
-      font-family: #{fonts};
+      font-family: #{the_font.set_fonts};
       text-align: justify;
       font-weight: normal;
       font-size: 100%;
@@ -2377,7 +2375,7 @@ WOK
     endnote {
       display: block;
       font-size: small;
-      font-family: #{fonts};
+      font-family: #{the_font.set_fonts};
       font-weight: normal;
       line-height: 150%;
       text-align: justify;
@@ -2389,7 +2387,7 @@ WOK
     endnote_indent {
       display: block;
       font-size: small;
-      font-family: #{fonts};
+      font-family: #{the_font.set_fonts};
       font-weight: normal;
       line-height: 150%;
       text-align: justify;
@@ -2499,7 +2497,7 @@ WOK
     }
     dc {
       display: block;
-      font-family: #{fonts};
+      font-family: #{the_font.set_fonts};
       color: blue;
       background-color: #dddddd;
       font-weight: normal;
@@ -2517,7 +2515,7 @@ WOK
     }
     keywords,copyright {
       display: block;
-      font-family: #{fonts};
+      font-family: #{the_font.set_fonts};
       color: red;
       background-color: #dddddd;
       font-weight: normal;
@@ -2569,7 +2567,7 @@ WOK
     }
     text {
       display: block;
-      font-family: #{fonts};
+      font-family: #{the_font.set_fonts};
       text-align: justify;
       font-size: 100%;
       line-height: 150%;
@@ -3128,7 +3126,7 @@ WOK
     endnote {
       display: block;
       font-size: small;
-      font-family: #{fonts};
+      font-family: #{the_font.set_fonts};
       font-weight: normal;
       line-height: 150%;
       text-align: justify;
@@ -3140,7 +3138,7 @@ WOK
     endnote_indent {
       display: block;
       font-size: small;
-      font-family: #{fonts};
+      font-family: #{the_font.set_fonts};
       font-weight: normal;
       line-height: 150%;
       text-align: justify;
@@ -3177,7 +3175,7 @@ WOK
     }
     dc,sc {
       display: block;
-      font-family: #{fonts};
+      font-family: #{the_font.set_fonts};
       color: blue;
       background-color: #dddddd;
       font-weight: normal;
@@ -3194,7 +3192,7 @@ WOK
     }
     keywords,copyright {
       display: block;
-      font-family: #{fonts};
+      font-family: #{the_font.set_fonts};
       color: red;
       background-color: #dddddd;
       font-weight: normal;
@@ -3247,7 +3245,7 @@ WOK
     }
     para {
       display: block;
-      font-family: #{fonts};
+      font-family: #{the_font.set_fonts};
       /* font-weight: normal; */
       text-align: justify;
       font-size: 100%;
@@ -3261,12 +3259,12 @@ WOK
       text-align: left;
     }
     para.norm {
-      font-family: #{fonts};
+      font-family: #{the_font.set_fonts};
       font-weight: normal;
     }
     para.h1, title {
       display: block;
-      font-family: #{fonts};
+      font-family: #{the_font.set_fonts};
       font-size: 120%;
       font-weight: bold;
       text-align: left;
@@ -3336,7 +3334,7 @@ WOK
     endnote {
       display: block;
       font-size: small;
-      font-family: #{fonts};
+      font-family: #{the_font.set_fonts};
       font-weight: normal;
       line-height: 150%;
       text-align: justify;
@@ -3348,7 +3346,7 @@ WOK
     endnote_indent {
       display: block;
       font-size: small;
-      font-family: #{fonts};
+      font-family: #{the_font.set_fonts};
       font-weight: normal;
       line-height: 150%;
       text-align: justify;
@@ -3402,7 +3400,7 @@ WOK
     }
     p {
       display: block;
-      font-family: #{fonts};
+      font-family: #{the_font.set_fonts};
       font-size: 100%;
       font-weight: normal;
       line-height: 150%;
@@ -3424,7 +3422,7 @@ WOK
       text-indent: 5%
     }
     p.h1 {
-      font-family: #{fonts};
+      font-family: #{the_font.set_fonts};
       font-weight: bold;
       line-height: 120%;
       margin-left: 10mm;
-- 
cgit v1.2.3