Cleaned up Crossroads layout code.
Patch by 900degrees.
diffs (200 lines):
diff -r dfa48144a833 -r 6ab0cc062a2f bin/upgrading/s2layers/crossroads/layout.s2
--- a/bin/upgrading/s2layers/crossroads/layout.s2 Tue Mar 09 11:32:02
2010 -0600
+++ b/bin/upgrading/s2layers/crossroads/layout.s2 Tue Mar 09 14:53:33
2010 -0600
@@ -6,44 +6,6 @@ layerinfo lang = "en";
set layout_type = "two-columns-left";
set layout_authors = [ { "name" => "branchandroot", "type" => "user" } ];
-
-##===============================
-## Page Colors
-##===============================
-
-set color_page_background = "";
-set color_page_text = "";
-set color_page_link = "";
-set color_page_link_visited = "";
-set color_page_link_hover = "";
-set color_page_link_active = "";
-set color_page_title = "";
-set color_header_background = "";
-set color_footer_background = "";
-
-##===============================
-## Entry Colors
-##===============================
-
-set color_entry_background = "";
-set color_entry_border = "";
-set color_entry_title = "";
-set color_entry_title_background = "";
-set color_entry_interaction_links = "";
-
-
-##===============================
-## Module Colors
-##===============================
-
-set color_module_background = "";
-set color_module_title = "";
-set color_module_text = "";
-set color_module_link = "";
-set color_module_link_visited = "";
-set color_module_link_hover = "";
-set color_module_link_active = "";
-
##===============================
##Text
@@ -60,6 +22,16 @@ set text_tell_friend = "Share";
set text_tell_friend = "Share";
set text_post_comment = "Reply";
set text_post_comment_friends = "Reply";
+
+##===============================
+##Fonts
+##===============================
+
+set font_base = "";
+set font_fallback = "Verdana, Helvetica, sans-serif";
+set font_base_size = "100";
+set font_base_units = "%";
+set font_journal_title = "Century Gothic, Verdana, sans-serif";
##===============================
##Layout
@@ -98,7 +70,7 @@ dl dt { font-weight: bold; }
dl dt { font-weight: bold; }
h1, h2, h3, h4,
-.comment-title { font-family: Century Gothic, Verdana, sans-serif;
+.comment-title { font-family: $*font_journal_title;
font-weight: normal;
padding-left: .25em;
padding-right: .25em; }
@@ -106,23 +78,16 @@ h1, h2, h3, h4,
.entry-title a,
.comment-title a { text-decoration: none; }
-a { color: $*color_page_link; }
-a:visited { color: $*color_page_link_visited; }
-a:hover {text-decoration: none;
- color: $*color_page_link_hover; }
-a:active { color: $*color_page_link_active; }
+a:hover {text-decoration: none;}
-body { margin: 0;
- font-family: $*font_base, Verdana, Helvetica, sans-serif; }
+body { margin: 0; }
#canvas { position: relative;
padding-top: 1px; }
/* header */
#header { margin: 2em 0;
- padding: 3em 2% 0 2%;
- background-color: $*color_header_background;
- color: $*color_page_title; }
+ padding: 3em 2% 0 2%; }
.two-columns-left #header .inner {padding-left: $*sidebar_width;}
.three-columns-left #header .inner { padding-left: $*sidebar_width_doubled; }
@@ -134,20 +99,13 @@ body { margin: 0;
.three-columns-left #header,
.three-columns-sides #header { text-align: right; }
-#title { }
-#subtitle { }
-#pagetitle { }
-
#content { margin: 0 2%; }
/* main column */
-#primary > .inner:first-child { }
.navigation { text-align: right; }
.navigation ul { margin: 0 0 1em 0;
padding: .25em; }
-.navigation a { color: ;}
-.navigation a:visited { color: ; }
.page-day .navigation .page-back { float: left; }
@@ -184,11 +142,10 @@ body { margin: 0;
.entry .datetime { font-size: small; }
-.entry-content { padding: .5em;
- }
+.entry-content { padding: .5em; }
.entry-content li { margin-left: 1em; }
.entry-content hr { display: block;
- margin: 1em 10%; }
+ margin: 1em 10%; }
.metadata { margin: 1em 0 0 .5em;
font-size: small; }
@@ -211,14 +168,13 @@ margin-bottom: 0; padding-bottom: 0; }
.entry .tag-text { font-weight: bold; }
ul.entry-management-links { float: left;
- margin-top: .5em;
- margin-bottom: .5em; }
+ margin-top: .5em;
+ margin-bottom: .5em; }
ul.entry-interaction-links { text-align: right;
- margin-right: .5em;
- margin-top: .5em;
- margin-bottom: .5em; }
+ margin-right: .5em;
+ margin-top: .5em;
+ margin-bottom: .5em; }
-.entry-management-links a { color: $*color_entry_interaction_links; }
.entry-management-links a:visited,
.entry-interaction-links a:visited { color: $*color_entry_interaction_links; }
@@ -263,9 +219,9 @@ ul.entry-interaction-links { text-align:
font-style: italic; }
.comment .multiform-checkbox { display: block;
- text-align: right;
- font-size: small;
- font-style: italic;
+ text-align: right;
+ font-size: small;
+ font-style: italic;
background-color: $*color_page_background;
margin: -1px;}
@@ -276,11 +232,11 @@ ul.entry-interaction-links { text-align:
.comment-management-links { float: right;
margin-top: .5em;
- margin-bottom: .5em; }
+ margin-bottom: .5em; }
.comment-interaction-links { text-align: left;
margin-right: .5em;
- margin-top: .5em;
- margin-bottom: .5em; }
+ margin-top: .5em;
+ margin-bottom: .5em; }
.bottomcomment { padding: .5em;
margin: 2em 0;
@@ -346,15 +302,6 @@ text-align: center; }
.two-columns-left #tertiary,
.two-columns-right #tertiary { margin-left: -1.5em; }
-
-#secondary a,
-#tertiary a { color: $*color_module_link; }
-#secondary a:visited,
-#tertiary a:visited { color: $*color_module_link_visited; }
-#secondary a:hover,
-#tertiary a:hover { color: $*color_module_link_hover; }
-#secondary a:active,
-#tertiary a:active { color: $*color_module_link_active; }
.two-columns-left #secondary,
.two-columns-right #secondary,
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
