[dw-free] Misc. Styles & Themes: remove extra specificity from CSS
[commit: http://hg.dwscoalition.org/dw-free/rev/11b2b07f721f]
http://bugs.dwscoalition.org/show_bug.cgi?id=4143
Change div.CLASS to .CLASS in Compartmentalize, Dusty Foot, Five AM,
Brittle.
Patch by
ninetydegrees.
Files modified:
http://bugs.dwscoalition.org/show_bug.cgi?id=4143
Change div.CLASS to .CLASS in Compartmentalize, Dusty Foot, Five AM,
Brittle.
Patch by
Files modified:
- bin/upgrading/s2layers/brittle/layout.s2
- bin/upgrading/s2layers/brittle/themes.s2
- bin/upgrading/s2layers/compartmentalize/layout.s2
- bin/upgrading/s2layers/dustyfoot/layout.s2
- bin/upgrading/s2layers/fiveam/themes.s2
--------------------------------------------------------------------------------
diff -r 718436dc0a30 -r 11b2b07f721f bin/upgrading/s2layers/brittle/layout.s2
--- a/bin/upgrading/s2layers/brittle/layout.s2 Wed Dec 28 17:22:24 2011 +0800
+++ b/bin/upgrading/s2layers/brittle/layout.s2 Wed Dec 28 17:28:50 2011 +0800
@@ -339,30 +339,30 @@
var string entryicon_css = "";
if ($*entryicons_position == "opposite") {
$entryicon_css = """
- div.entry div.userpic,
- div.comment div.userpic {
+ .entry .userpic,
+ .comment .userpic {
float: $sidebar_position_opposite;
text-align: $sidebar_position;
}
- div.entry div.userpic {
+ .entry .userpic {
margin-$sidebar_position_opposite: -$entry_userpic_margin;
}
- div.comment div.userpic {
+ .comment .userpic {
margin-$sidebar_position_opposite: -$comment_userpic_margin;
}
""";
}
elseif ($*entryicons_position == "same") {
$entryicon_css = """
- div.entry div.userpic,
- div.comment div.userpic {
+ .entry .userpic,
+ .comment .userpic {
float: $sidebar_position;
text-align: $sidebar_position;
}
- div.entry div.userpic{
+ .entry .userpic{
margin-$sidebar_position: -$entry_userpic_margin;
}
- div.comment div.userpic {
+ .comment .userpic {
margin-$sidebar_position: -$comment_userpic_margin;
}
#secondary {
@@ -464,7 +464,7 @@
li.page-separator { display: none; }
-div.navigation ul {
+.navigation ul {
display: inline;
padding: 0;
margin: 0;
@@ -520,16 +520,16 @@
}
.datetime a { color: $*color_entry_title; }
-div.entry div.userpic {
+.entry .userpic {
display: block;
margin: 0;
}
-div.entry div.userpic img {
+.entry .userpic img {
border: 5px solid $*color_navigation_module_background;
}
-span.poster {
+.poster {
$date_time_font
text-transform: uppercase;
}
@@ -538,12 +538,12 @@
.metadata.top-metadata { margin: 10px 0 1.25em 0; }
-div.metadata ul {
+.metadata ul {
padding: 0;
margin: 0;
}
-div.metadata ul li {
+.metadata ul li {
list-style: none;
font-size: 60%;
font-weight: normal;
@@ -553,18 +553,18 @@
padding: 0;
}
-span.tag-text {
+.tag-text {
font-size: 60%;
text-transform: lowercase;
}
-div.tag ul {
+.tag ul {
padding: 0 0 0 13px;
margin: 0;
display: inline;
}
-div.tag ul li {
+.tag ul li {
display: inline;
list-style: none;
font-size: 60%;
@@ -768,12 +768,12 @@
text-align: left;
}
-div.comment div.userpic {
+.comment .userpic {
display: block;
margin: 0;
}
-div.comment div.userpic img {
+.comment .userpic img {
border: 5px solid $*color_navigation_module_background;
}
diff -r 718436dc0a30 -r 11b2b07f721f bin/upgrading/s2layers/brittle/themes.s2
--- a/bin/upgrading/s2layers/brittle/themes.s2 Wed Dec 28 17:22:24 2011 +0800
+++ b/bin/upgrading/s2layers/brittle/themes.s2 Wed Dec 28 17:28:50 2011 +0800
@@ -221,18 +221,18 @@
text-align: left;
}
- div.entry, div.entry .inner,
- div.comment, div.comment .inner {
+ .entry, .entry .inner,
+ .comment, .comment .inner {
line-height: 1.05em;
}
- span.tag-text,
- div.tag ul li,
- div.metadata ul li {
+ .tag-text,
+ .tag ul li,
+ .metadata ul li {
font-size: .9em;
}
- div.tag ul {
+ .tag ul {
padding: 0;
}
""";
@@ -636,19 +636,19 @@
text-align: left;
}
- div.entry, div.entry .inner,
- div.comment, div.comment .inner {
+ .entry, .entry .inner,
+ .comment, .comment .inner {
line-height: 1.05em;
}
- span.tag-text,
- div.tag ul li,
- div.metadata ul li {
+ .tag-text,
+ .tag ul li,
+ .metadata ul li {
font-family: $*font_entry_title;
font-size: .9em;
}
- div.tag ul {
+ .tag ul {
padding: 0;
}
""";
@@ -811,18 +811,18 @@
text-align: left;
}
- div.entry, div.entry .inner,
- div.comment, div.comment .inner {
+ .entry, .entry .inner,
+ .comment, .comment .inner {
line-height: 1.05em;
}
- span.tag-text,
- div.tag ul li,
- div.metadata ul li {
+ .tag-text,
+ .tag ul li,
+ .metadata ul li {
font-size: .9em;
}
- div.tag ul {
+ .tag ul {
padding: 0;
}
""";
@@ -1069,18 +1069,18 @@
text-align: left;
}
- div.entry, div.entry .inner,
- div.comment, div.comment .inner {
+ .entry, .entry .inner,
+ .comment, .comment .inner {
line-height: 1.05em;
}
- span.tag-text,
- div.tag ul li,
- div.metadata ul li {
+ .tag-text,
+ .tag ul li,
+ .metadata ul li {
font-size: .9em;
}
- div.tag ul {
+ .tag ul {
padding: 0;
}
""";
@@ -1290,18 +1290,18 @@
text-align: left;
}
- div.entry, div.entry .inner,
- div.comment, div.comment .inner {
+ .entry, .entry .inner,
+ .comment, .comment .inner {
line-height: 1.05em;
}
- span.tag-text,
- div.tag ul li,
- div.metadata ul li {
+ .tag-text,
+ .tag ul li,
+ .metadata ul li {
font-size: .9em;
}
- div.tag ul {
+ .tag ul {
padding: 0;
}
""";
diff -r 718436dc0a30 -r 11b2b07f721f bin/upgrading/s2layers/compartmentalize/layout.s2
--- a/bin/upgrading/s2layers/compartmentalize/layout.s2 Wed Dec 28 17:22:24 2011 +0800
+++ b/bin/upgrading/s2layers/compartmentalize/layout.s2 Wed Dec 28 17:28:50 2011 +0800
@@ -61,21 +61,21 @@
var string userpic_css = "";
if ($*userpics_position == "left") {
$userpic_css = """
- .has-userpic div.entry div.userpic {
+ .has-userpic .entry .userpic {
float: left;
margin: -4em 1em 1em 0;
}
- .has-userpic div.entry div.header,
- .has-userpic div.comment div.header {
+ .has-userpic .entry .header,
+ .has-userpic .comment .header {
text-align: right;
}
- .has-userpic div.entry div.header {
+ .has-userpic .entry .header {
margin-left: $entry_header_margin;
}
- .has-userpic div.comment div.header {
+ .has-userpic .comment .header {
margin-left: $comment_header_margin;
}
- .has-userpic div.comment div.userpic {
+ .has-userpic .comment .userpic {
float: left;
margin: -1em 1em 0 0;
}
@@ -83,17 +83,17 @@
}
elseif ($*userpics_position == "right") {
$userpic_css = """
- .has-userpic div.entry div.userpic {
+ .has-userpic .entry .userpic {
float: right;
margin: -4em 0 1em 1em;
}
- .has-userpic div.entry div.header {
+ .has-userpic .entry .header {
margin-right: $entry_header_margin;
}
- .has-userpic div.comment div.header {
+ .has-userpic .comment .header {
margin-right: $comment_header_margin;
}
- .has-userpic div.comment div.userpic {
+ .has-userpic .comment .userpic {
float: right;
margin: -1em 0 0 1em;
}
@@ -247,23 +247,23 @@
color: $*color_module_title;
}
-div.module-content div.userpic {
+.module-content .userpic {
text-align: center;
}
-div.module-content div.userpic img {
+.module-content .userpic img {
border: 1px solid $*color_module_border;
border-top: 10px solid $*color_module_border;
padding: .5em;
}
-div.journal-name {
+.journal-name {
text-transform: uppercase;
margin: .5em 0 0 0;
text-align: center;
}
-div.journal-website-name {
+.journal-website-name {
text-transform: uppercase;
text-align: center;
}
@@ -292,26 +292,26 @@
list-style: none;
}
-div.module-navlinks, div.module-navlinks a {
+.module-navlinks, .module-navlinks a {
color: $*color_module_title;
font-family: $*font_module_heading;
font-weight: bold;
text-align: right;
}
-div.module-navlinks ul.module-list {
+.module-navlinks ul.module-list {
color: $*color_module_title;
list-style: none;
text-transform: uppercase;
}
-div.manage-link {
+.manage-link {
margin: .5em 0 0;
text-align: right;
text-transform: uppercase;
}
-div.module-calendar th {
+.module-calendar th {
border: 1px solid $*color_module_border;
font-weight: lighter;
margin: 0 .2em;
@@ -319,23 +319,23 @@
text-transform: uppercase;
}
-div.module-calendar td.empty-day {
+.module-calendar td.empty-day {
border: 1px solid $*color_module_border;
margin: 0 .2em;
text-transform: uppercase;
}
-div.module-calendar td.entry-day {
+.module-calendar td.entry-day {
background: $*color_page_background;
border: 1px solid $*color_module_border;
margin: 0 .1em;
text-transform: uppercase;
}
-div.module-calendar td.entry-day a { color: $*color_page_link; }
-div.module-calendar td.entry-day a:visited { color: $*color_page_link_visited; }
-div.module-calendar td.entry-day a:hover { color: $*color_page_link_hover; }
-div.module-calendar td.entry-day a:active { color: $*color_page_link_active; }
+.module-calendar td.entry-day a { color: $*color_page_link; }
+.module-calendar td.entry-day a:visited { color: $*color_page_link_visited; }
+.module-calendar td.entry-day a:hover { color: $*color_page_link_hover; }
+.module-calendar td.entry-day a:active { color: $*color_page_link_active; }
/*--- Entries ---*/
@@ -345,11 +345,11 @@
padding: 1em;
}
-div.entry-content {
+.entry-content {
margin: 1em 0 0 0;
}
-div.entry div.header {
+.entry .header {
color: $*color_entry_title;
margin: 0 0 .5em 0;
padding: 0;
@@ -370,13 +370,13 @@
margin: 1em 0;
}
-div.entry div.userpic img {
+.entry .userpic img {
border: 1px solid $*color_entry_border;
border-top: 10px solid $*color_entry_border;
padding: 8px;
}
-div.entry div.footer {
+.entry .footer {
clear: both;
}
@@ -462,17 +462,17 @@
padding: .5em;
}
-div.comment div.userpic {
+.comment .userpic {
display: block;
}
-div.comment div.userpic img {
+.comment .userpic img {
border: 1px solid $*color_entry_border;
border-top: 10px solid $*color_entry_border;
padding: 8px;
}
-div.comment div.footer {
+.comment .footer {
clear: both;
}
diff -r 718436dc0a30 -r 11b2b07f721f bin/upgrading/s2layers/dustyfoot/layout.s2
--- a/bin/upgrading/s2layers/dustyfoot/layout.s2 Wed Dec 28 17:22:24 2011 +0800
+++ b/bin/upgrading/s2layers/dustyfoot/layout.s2 Wed Dec 28 17:28:50 2011 +0800
@@ -247,10 +247,10 @@
var string userpic_css = "";
if($*userpics_position == "left") {
$userpic_css = """
- .has-userpic div.entry div.header {
+ .has-userpic .entry .header {
margin-left: $entry_header_margin;
}
- .has-userpic div.comment div.header {
+ .has-userpic .comment .header {
margin-left: $comment_header_margin;
}
.has-userpic .entry .userpic,
@@ -263,10 +263,10 @@
}
elseif($*userpics_position == "right") {
$userpic_css = """
- .has-userpic div.entry div.header {
+ .has-userpic .entry .header {
margin-right: $entry_header_margin;
}
- .has-userpic div.comment div.header {
+ .has-userpic .comment .header {
margin-right: $comment_header_margin;
}
.has-userpic .entry .userpic,
diff -r 718436dc0a30 -r 11b2b07f721f bin/upgrading/s2layers/fiveam/themes.s2
--- a/bin/upgrading/s2layers/fiveam/themes.s2 Wed Dec 28 17:22:24 2011 +0800
+++ b/bin/upgrading/s2layers/fiveam/themes.s2 Wed Dec 28 17:28:50 2011 +0800
@@ -232,10 +232,10 @@
function Page::print_theme_stylesheet() {
"""
- div.entry,
- div.entry .inner,
- div.comment,
- div.comment .inner,
+ .entry,
+ .entry .inner,
+ .comment,
+ .comment .inner,
blockquote {
line-height: 1.2em;
}
@@ -836,10 +836,10 @@
function Page::print_theme_stylesheet() {
"""
- div.entry,
- div.entry .inner,
- div.comment,
- div.comment .inner,
+ .entry,
+ .entry .inner,
+ .comment,
+ .comment .inner,
blockquote {
line-height: 1.2em;
}
@@ -956,10 +956,10 @@
function Page::print_theme_stylesheet() {
"""
- div.entry,
- div.entry .inner,
- div.comment,
- div.comment .inner,
+ .entry,
+ .entry .inner,
+ .comment,
+ .comment .inner,
blockquote {
line-height: 1.2em;
}
@@ -1790,10 +1790,10 @@
function Page::print_theme_stylesheet() {
"""
- div.entry,
- div.entry .inner,
- div.comment,
- div.comment .inner,
+ .entry,
+ .entry .inner,
+ .comment,
+ .comment .inner,
blockquote {
line-height: 1.2em;
}
@@ -1978,10 +1978,10 @@
function Page::print_theme_stylesheet() {
"""
- div.entry,
- div.entry .inner,
- div.comment,
- div.comment .inner,
+ .entry,
+ .entry .inner,
+ .comment,
+ .comment .inner,
blockquote {
line-height: 1.2em;
}
@@ -2286,10 +2286,10 @@
function Page::print_theme_stylesheet() {
"""
- div.entry,
- div.entry .inner,
- div.comment,
- div.comment .inner,
+ .entry,
+ .entry .inner,
+ .comment,
+ .comment .inner,
blockquote {
line-height: 1.2em;
}
--------------------------------------------------------------------------------
