xtras/mathuaerknedam 212:6c1f1c42e340: yMous: I missed a few inv...
commits at adium.im
commits at adium.im
Tue Nov 10 16:33:19 UTC 2009
details: http://hg.adium.im/xtras/mathuaerknedam/rev/6c1f1c42e340
revision: 212:6c1f1c42e340
author: mathuaerknedam
date: Tue Nov 10 10:31:39 2009 -0600
yMous: I missed a few invalid comments, now fixed.
Subject: xtras/mathuaerknedam 213:aa51ba0a60ce: SO3: Remove a ton of old (invalid) comments and replace remaining (invalid) comments with valid ones.
details: http://hg.adium.im/xtras/mathuaerknedam/rev/aa51ba0a60ce
revision: 213:aa51ba0a60ce
author: mathuaerknedam
date: Tue Nov 10 10:33:03 2009 -0600
SO3: Remove a ton of old (invalid) comments and replace remaining (invalid) comments with valid ones.
diffs (842 lines):
diff -r 9ca679c0bbb8 -r aa51ba0a60ce Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Header.css
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Header.css Tue Nov 10 10:07:47 2009 -0600
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Header.css Tue Nov 10 10:33:03 2009 -0600
@@ -1,10 +1,5 @@
@charset "utf-8";
-#Chat
-{
- //padding-top: 84px;
-}
-
#header
{
}
@@ -65,9 +60,7 @@
min-height: 56px;
max-width: none;
max-height: none;
- //padding: 0;
top: 0px;
- //background: rgba(240, 240, 240, 1);
}
#x-header .x-icon.x-incoming,
diff -r 9ca679c0bbb8 -r aa51ba0a60ce Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Topic.css
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Topic.css Tue Nov 10 10:07:47 2009 -0600
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Topic.css Tue Nov 10 10:33:03 2009 -0600
@@ -1,12 +1,5 @@
@charset "utf-8";
-/* Extra padding on top if the header is included to push the messages out from under it. */
-
-#Chat
-{
- //padding-top: 66px;
-}
-
#x-topic
{
}
@@ -43,9 +36,6 @@
display: block;
min-height: 1.2em;
- //max-height: 40px;
- //text-overflow: ellipsis;
- //overflow: hidden;
word-wrap: break-word;
word-break: break-word;
}
@@ -53,7 +43,6 @@
#x-topic .serviceIcon
{
position: relative;
- //top: 4px;
right: 4px;
float: right;
margin-left: 10px;
diff -r 9ca679c0bbb8 -r aa51ba0a60ce Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Alternating.css
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Alternating.css Tue Nov 10 10:07:47 2009 -0600
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Alternating.css Tue Nov 10 10:33:03 2009 -0600
@@ -1,10 +1,12 @@
@charset "utf-8";
+/*
*
{
- //border: 1px lime solid;
- //text-decoration: line-through !important;
+ border: 1px lime solid;
+ text-decoration: line-through !important;
}
+*/
body
{
@@ -298,7 +300,6 @@
.x-iconmask[style*="buddy_icon.png"]
{
display: none !important;
- //visibility: hidden;
}
.message .x-wrap
@@ -309,7 +310,6 @@
padding-right: 10px;
padding-top: 1px;
padding-bottom: 2px;
- //border-left: 1px solid rgba(216, 216, 216, 1);
}
.status .x-wrap,
@@ -319,9 +319,7 @@
margin-left: 48px;
padding-left: 8px;
padding-right: 10px;
- //padding-top: 0px;
padding-bottom: 1px;
- //border-left: 1px solid rgba(112, 112, 112, 1);
}
.x-sender
@@ -411,28 +409,25 @@
vertical-align: top;
}
-.history img.emoticon
+/*.history img.emoticon
{
- //opacity: .4;
-}
+ opacity: .4;
+}*/
a,
a:link
{
color: inherit;
- //border-bottom: 1px solid;
text-decoration: underline;
}
a:hover
{
- //border-bottom: 2px solid;
border-bottom: 1px solid;
}
a:active
{
- //border-bottom: 3px double;
border-bottom: 2px solid;
}
@@ -450,10 +445,10 @@
max-height: 10px;
}
-.history + :not(.history):not(#insert)
+/*.history + :not(.history):not(#insert)
{
- //margin-top: 16px;
-}
+ margin-top: 16px;
+}*/
/* history */
@@ -475,7 +470,6 @@
border-right: 1px solid rgba(128, 128, 128, 1);
padding-top: 2px;
padding-bottom: 2px;
- //margin-right: -1px;
margin-left: -1px;
}
@@ -536,12 +530,6 @@
text-shadow: 0px 1px 4px rgba(64, 64, 64, .5);
}
-.history.event .x-wrap
-{
- //padding-top: 2px;
- //padding-bottom: 3px;
-}
-
.history .x-sender
{
display: inline;
diff -r 9ca679c0bbb8 -r aa51ba0a60ce Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Classic.css
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Classic.css Tue Nov 10 10:07:47 2009 -0600
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Classic.css Tue Nov 10 10:33:03 2009 -0600
@@ -1,10 +1,12 @@
@charset "utf-8";
+/*
*
{
- //border: 1px lime solid;
- //text-decoration: line-through !important;
+ border: 1px lime solid;
+ text-decoration: line-through !important;
}
+*/
body
{
@@ -103,7 +105,6 @@
.message .x-iconmask
{
display: none !important;
- //visibility: hidden;
}
.message .x-wrap
@@ -272,10 +273,10 @@
color: rgba(136, 136, 136, 1);
}
-.history + :not(.history):not(#insert)
+/*.history + :not(.history):not(#insert)
{
- //margin-top: 32px;
-}
+ margin-top: 32px;
+}*/
img.emoticon
{
@@ -291,19 +292,16 @@
a:link
{
color: inherit;
- //border-bottom: 1px solid;
text-decoration: underline;
}
a:hover
{
- //border-bottom: 2px solid;
border-bottom: 1px solid;
}
a:active
{
- //border-bottom: 3px double;
border-bottom: 2px solid;
}
@@ -344,7 +342,6 @@
font-size: 12px;
content: "\2605";
color: rgba(64, 64, 64, 1);
- //color: rgba(0, 0, 255, 1);
text-shadow: 0px 1px 1px rgba(255, 255, 255, 1);
opacity: .5;
}
diff -r 9ca679c0bbb8 -r aa51ba0a60ce Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Compact.css
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Compact.css Tue Nov 10 10:07:47 2009 -0600
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Compact.css Tue Nov 10 10:33:03 2009 -0600
@@ -1,10 +1,12 @@
@charset "utf-8";
+/*
*
{
- //border: 1px lime solid;
- //text-decoration: line-through !important;
+ border: 1px lime solid;
+ text-decoration: line-through !important;
}
+*/
body
{
@@ -241,34 +243,25 @@
vertical-align: top;
}
-img.emoticon:before
+/*.history img.emoticon
{
- //content: attr(alt);
- content: "\2665";
-}
-
-.history img.emoticon
-{
- //opacity: .4;
-}
+ opacity: .4;
+}*/
a,
a:link
{
color: inherit;
- //border-bottom: 1px solid;
text-decoration: underline;
}
a:hover
{
- //border-bottom: 2px solid;
border-bottom: 1px solid;
}
a:active
{
- //border-bottom: 3px double;
border-bottom: 2px solid;
}
@@ -286,10 +279,10 @@
max-height: 10px;
}
-.history + :not(.history):not(#insert)
+/*.history + :not(.history):not(#insert)
{
- //margin-top: 16px;
-}
+ margin-top: 16px;
+}*/
/* history */
@@ -367,7 +360,6 @@
.history.event .x-message
{
- //font-size: .9em;
text-shadow: 0px 1px 4px rgba(64, 64, 64, .5);
}
@@ -378,7 +370,6 @@
{
text-align: left !important;
padding: 8px;
- //top: 8px !important;
right: inherit !important;
height: 20px !important;
background: -webkit-gradient(linear, left top, left bottom, from(rgba(255, 255, 255, 1)), to(rgba(240, 240, 240, 1))) !important;
diff -r 9ca679c0bbb8 -r aa51ba0a60ce Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Icon-Time1.css
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Icon-Time1.css Tue Nov 10 10:07:47 2009 -0600
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Icon-Time1.css Tue Nov 10 10:33:03 2009 -0600
@@ -1,10 +1,12 @@
@charset "utf-8";
+/*
*
{
- //border: 1px lime solid;
- //text-decoration: line-through !important;
+ border: 1px lime solid;
+ text-decoration: line-through !important;
}
+*/
body
{
@@ -72,9 +74,6 @@
.message:not(.consecutive):not(.history)
{
- //-webkit-border-bottom-right-radius: 5px;
- //-webkit-border-top-right-radius: 5px;
- //-webkit-border-top-left-radius: 5px;
min-height: 28px;
}
@@ -84,8 +83,6 @@
padding-top: 1px;
padding-bottom: 0px;
padding-right: 0px;
- //-webkit-border-bottom-right-radius: 0px;
- //-webkit-border-top-right-radius: 0px;
}
.message:not(.autoreply):not(.consecutive)
@@ -216,15 +213,6 @@
margin-top: 2px;
}
-.message.hideIcons.consecutive,
-.history.message.hideIcons,
-.status.hideIcons,
-.event.hideIcons,
-.IRC
-{
- //margin-left: 0px;
-}
-
.x-color
{
display: none;
@@ -280,7 +268,6 @@
.x-iconmask[style*="buddy_icon.png"]
{
display: none !important;
- //visibility: hidden;
}
.message .x-wrap
@@ -290,7 +277,6 @@
padding-left: 3px;
padding-right: 5px;
padding-bottom: 1px;
- //border-left: 1px solid rgba(216, 216, 216, 1);
}
.status .x-wrap,
@@ -301,7 +287,6 @@
padding-left: 3px;
padding-right: 5px;
padding-bottom: 1px;
- //border-left: 1px solid rgba(216, 216, 216, 1);
}
.x-sender
@@ -338,18 +323,6 @@
color: rgba(184, 184, 184, 1);
}
-.message .x-rtime
-{
- //color: rgba(184, 184, 184, 1);
-}
-
-.autoreply .x-rtime,
-.status .x-rtime,
-.event .x-rtime
-{
- //color: rgba(168, 168, 168, 1);
-}
-
.x-mark
{
position: absolute;
@@ -389,28 +362,25 @@
vertical-align: top;
}
-.history img.emoticon
+/*.history img.emoticon
{
- //opacity: .4;
-}
+ opacity: .4;
+}*/
a,
a:link
{
color: inherit;
- //border-bottom: 1px solid;
text-decoration: underline;
}
a:hover
{
- //border-bottom: 2px solid;
border-bottom: 1px solid;
}
a:active
{
- //border-bottom: 3px double;
border-bottom: 2px solid;
}
@@ -428,10 +398,10 @@
max-height: 10px;
}
-.history + :not(.history):not(#insert)
+/*.history + :not(.history):not(#insert)
{
- //margin-top: 16px;
-}
+ margin-top: 16px;
+}*/
/* History stuff */
@@ -455,14 +425,6 @@
background: -webkit-gradient(linear, left top, left bottom, from(rgba(112, 112, 112, 1)), to(rgba(112, 112, 112, 1))) 0px 0px no-repeat;
}
-.history.event
-{
- //text-align: right !important;
- //border-right: 1px solid rgba(128, 128, 128, 1);
- //border-left: 1px solid rgba(128, 128, 128, 1);
- //margin-right: 9px;
-}
-
.history.event:first-child
{
-webkit-border-top-left-radius: 5px;
@@ -500,8 +462,6 @@
margin-top: 0px;
margin-bottom: 0px;
padding-top: 1px;
- //padding-left: 3px;
- //border-left: none;
}
.history.message .x-wrap .x-sender,
@@ -546,14 +506,8 @@
color: rgba(216, 216, 216, 1);
}
-.history.event .x-mark
-{
- //display: none;
-}
-
.history.event .x-message
{
- //font-size: .9em;
text-shadow: 0px 1px 4px rgba(64, 64, 64, .5);
padding-right: 4px;
}
diff -r 9ca679c0bbb8 -r aa51ba0a60ce Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Icon-Time2.css
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Icon-Time2.css Tue Nov 10 10:07:47 2009 -0600
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Icon-Time2.css Tue Nov 10 10:33:03 2009 -0600
@@ -1,10 +1,12 @@
@charset "utf-8";
+/*
*
{
- //border: 1px lime solid;
- //text-decoration: line-through !important;
+ border: 1px lime solid;
+ text-decoration: line-through !important;
}
+*/
body
{
@@ -72,9 +74,6 @@
.message:not(.consecutive):not(.history)
{
- //-webkit-border-bottom-right-radius: 5px;
- //-webkit-border-top-right-radius: 5px;
- //-webkit-border-top-left-radius: 5px;
min-height: 28px;
}
@@ -84,8 +83,6 @@
padding-top: 1px;
padding-bottom: 0px;
padding-right: 0px;
- //-webkit-border-bottom-right-radius: 0px;
- //-webkit-border-top-right-radius: 0px;
}
.message:not(.autoreply):not(.consecutive):not(.x-hover)
@@ -265,7 +262,6 @@
.x-iconmask[style*="buddy_icon.png"]
{
display: none !important;
- //visibility: hidden;
}
.message .x-wrap
@@ -295,7 +291,6 @@
padding-left: 2px;
padding-right: 5px;
padding-bottom: 1px;
- //border-left: 1px solid rgba(216, 216, 216, 1);
}
.status.hideIcons .x-wrap,
@@ -340,22 +335,10 @@
color: rgba(184, 184, 184, 1);
}
-.message .x-rtime
-{
- //color: rgba(184, 184, 184, 1);
-}
-
-.autoreply .x-rtime,
-.status .x-rtime,
-.event .x-rtime
-{
- //color: rgba(168, 168, 168, 1);
-}
-
.x-mark
{
- //position: absolute;
- //left: 45px;
+ /*position: absolute;*/
+ /*left: 45px;*/
margin-left: -.03em;
font-family: Lucida Grande;
}
@@ -401,28 +384,25 @@
vertical-align: top;
}
-.history img.emoticon
+/*.history img.emoticon
{
- //opacity: .4;
-}
+ opacity: .4;
+}*/
a,
a:link
{
color: inherit;
- //border-bottom: 1px solid;
text-decoration: underline;
}
a:hover
{
- //border-bottom: 2px solid;
border-bottom: 1px solid;
}
a:active
{
- //border-bottom: 3px double;
border-bottom: 2px solid;
}
@@ -442,7 +422,6 @@
.history + :not(.history):not(#insert)
{
- //margin-top: 16px;
}
@@ -523,7 +502,6 @@
.history.event .x-wrap
{
- //padding-top: 1px;
padding-bottom: 2px;
}
diff -r 9ca679c0bbb8 -r aa51ba0a60ce Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Time-Icon.css
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Time-Icon.css Tue Nov 10 10:07:47 2009 -0600
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Time-Icon.css Tue Nov 10 10:33:03 2009 -0600
@@ -1,10 +1,12 @@
@charset "utf-8";
+/*
*
{
- //border: 1px lime solid;
- //text-decoration: line-through !important;
+ border: 1px lime solid;
+ text-decoration: line-through !important;
}
+*/
body
{
@@ -72,9 +74,6 @@
.message:not(.consecutive):not(.history)
{
- //-webkit-border-bottom-right-radius: 5px;
- //-webkit-border-top-right-radius: 5px;
- //-webkit-border-top-left-radius: 5px;
min-height: 28px;
}
@@ -84,8 +83,6 @@
padding-top: 1px;
padding-bottom: 0px;
padding-right: 0px;
- //-webkit-border-bottom-right-radius: 0px;
- //-webkit-border-top-right-radius: 0px;
}
.message:not(.consecutive)
@@ -216,7 +213,6 @@
.x-iconmask[style*="buddy_icon.png"]
{
display: none !important;
- //visibility: hidden;
}
.message .x-wrap
@@ -226,7 +222,6 @@
padding-left: 8px;
padding-right: 10px;
padding-bottom: 1px;
- //border-left: 1px solid rgba(216, 216, 216, 1);
}
.status .x-wrap,
@@ -237,12 +232,6 @@
padding-left: 8px;
padding-right: 10px;
padding-bottom: 1px;
- //border-left: 1px solid rgba(112, 112, 112, 1);
-}
-
-.x-hover.message .x-wrap
-{
- //border-left: 1px solid rgba(168, 168, 168, 1);
}
.x-sender
@@ -320,28 +309,25 @@
vertical-align: top;
}
-.history img.emoticon
+/*.history img.emoticon
{
- //opacity: .4;
-}
+ opacity: .4;
+}*/
a,
a:link
{
color: inherit;
- //border-bottom: 1px solid;
text-decoration: underline;
}
a:hover
{
- //border-bottom: 2px solid;
border-bottom: 1px solid;
}
a:active
{
- //border-bottom: 3px double;
border-bottom: 2px solid;
}
@@ -359,10 +345,10 @@
max-height: 10px;
}
-.history + :not(.history):not(#insert)
+/*.history + :not(.history):not(#insert)
{
- //margin-top: 16px;
-}
+ margin-top: 16px;
+}*/
/* history */
@@ -373,7 +359,6 @@
{
display: block;
margin-top: 0px;
- //margin-left: 32px;
margin-bottom: 0px;
-webkit-border-radius: 0px;
-webkit-box-shadow: 0px 3px 3px rgba(0, 0, 0, .3);
@@ -407,9 +392,7 @@
.history.event .x-message
{
- //font-size: .9em;
text-shadow: 0px 1px 4px rgba(64, 64, 64, .5);
- //padding-right: 4px;
}
.history.message:not(.consecutive)
@@ -441,12 +424,9 @@
.history.message .x-wrap
{
- //margin-left: 5px;
margin-top: 0px;
margin-bottom: 0px;
padding-top: 1px;
- //padding-left: 3px;
- //border-left: none;
}
.history.message .x-wrap .x-sender,
diff -r 9ca679c0bbb8 -r aa51ba0a60ce Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/todo.txt
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/todo.txt Tue Nov 10 10:07:47 2009 -0600
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/todo.txt Tue Nov 10 10:33:03 2009 -0600
@@ -6,8 +6,9 @@
# modularize the css?
# Robby's problem with topic text flowing outside of bubble. Is also didn't maintain it's right margin.
# The min-width for indented bubbles should be less than non-indented ones. Ideally, everything would be min-width some em value, but the indentations are by px. I can't calculate indents for em+px. Last I checked, indent by em didn't work because icons are a fixed size and scaling them didn't work well. using px for min-width wouldn't scale well for larger font sizes, but maybe people with large fonts dont' have small windows?
-
-
+ # Can the left margin (and focus/mention indicators) use em rather than px?
+ # the per-message triangles in icon-time2 can flow funny when the window is narrow
+ # places that specify only event should also specify status
Future Versions
diff -r 9ca679c0bbb8 -r aa51ba0a60ce yMous ☿.AdiumMessageStyle/Contents/Resources/Mockup.html
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Mockup.html Tue Nov 10 10:07:47 2009 -0600
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Mockup.html Tue Nov 10 10:33:03 2009 -0600
@@ -15,20 +15,20 @@
border-bottom: 1px solid yellow !important;
}
- img.x-icon
+ /*img.x-icon
{
- //display: none;
- }
+ display: none;
+ }*/
- .x-sender
+ /*.x-sender
{
- //font-size: 7pt !important;
- }
+ font-size: 7pt !important;
+ }*/
- .x-time
+ /*.x-time
{
- //font-size: 6.5pt !important;
- }
+ font-size: 6.5pt !important;
+ }*/
</style>
</head>
diff -r 9ca679c0bbb8 -r aa51ba0a60ce yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseS.css
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseS.css Tue Nov 10 10:07:47 2009 -0600
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseS.css Tue Nov 10 10:33:03 2009 -0600
@@ -131,7 +131,6 @@
.focus .x-focus
{
- //border-left: 1px solid hsla(0, 0%, 37%, 1) !important;
background: hsla(0, 0%, 83%, 1);
}
diff -r 9ca679c0bbb8 -r aa51ba0a60ce yMous ☿.AdiumMessageStyle/Contents/Resources/todo.txt
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/todo.txt Tue Nov 10 10:07:47 2009 -0600
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/todo.txt Tue Nov 10 10:33:03 2009 -0600
@@ -1,4 +1,5 @@
-# test action handling in nonBoth variants
+!# test action handling in nonBoth variants
+!# migrate header improvements from SO3
# Are emoticons a pixel too big? Only at 9pt and 12pt, but not 10pt and 11pt. and only for messages containing only an emoticon.
More information about the commits
mailing list