xtras/mathuaerknedam 436:eb1ba1726a39: yMous: color fixes.
commits at adium.im
commits at adium.im
Tue Mar 16 04:50:13 UTC 2010
details: http://hg.adium.im/xtras/mathuaerknedam/rev/eb1ba1726a39
revision: 436:eb1ba1726a39
author: mathuaerknedam
date: Mon Mar 15 23:06:34 2010 -0500
yMous: color fixes.
Subject: xtras/mathuaerknedam 437:eb2ad910a1b2: minimal_mod: Remove unused images, tweak focus.
details: http://hg.adium.im/xtras/mathuaerknedam/rev/eb2ad910a1b2
revision: 437:eb2ad910a1b2
author: mathuaerknedam
date: Mon Mar 15 23:50:05 2010 -0500
minimal_mod: Remove unused images, tweak focus.
diffs (503 lines):
diff -r 8ee0da2b465f -r eb2ad910a1b2 minimal_mod ☿.AdiumMessageStyle/Contents/Resources/FileTransferRequest.html
--- a/minimal_mod ☿.AdiumMessageStyle/Contents/Resources/FileTransferRequest.html Mon Mar 15 00:01:26 2010 -0500
+++ b/minimal_mod ☿.AdiumMessageStyle/Contents/Resources/FileTransferRequest.html Mon Mar 15 23:50:05 2010 -0500
@@ -1,9 +1,8 @@
<div class="x-container %messageClasses%">
- <span class="x-message x-status">
+ <span class="x-message">
<b>%sender%</b> is attempting to send you <b>%fileName%</b><br /><br />
<input type="button" onclick="%saveFileHandler%" value="Accept File"></input>
<input type="button" onclick="%cancelRequestHandler%" value="Cancel File"></input>
</span>
- <span class="x-clear"></span>
</div>
<span id="insert"></span>
diff -r 8ee0da2b465f -r eb2ad910a1b2 minimal_mod ☿.AdiumMessageStyle/Contents/Resources/images/back_l+.png
Binary file minimal_mod ☿.AdiumMessageStyle/Contents/Resources/images/back_l+.png has changed
diff -r 8ee0da2b465f -r eb2ad910a1b2 minimal_mod ☿.AdiumMessageStyle/Contents/Resources/images/diag.png
Binary file minimal_mod ☿.AdiumMessageStyle/Contents/Resources/images/diag.png has changed
diff -r 8ee0da2b465f -r eb2ad910a1b2 minimal_mod ☿.AdiumMessageStyle/Contents/Resources/main.css
--- a/minimal_mod ☿.AdiumMessageStyle/Contents/Resources/main.css Mon Mar 15 00:01:26 2010 -0500
+++ b/minimal_mod ☿.AdiumMessageStyle/Contents/Resources/main.css Mon Mar 15 23:50:05 2010 -0500
@@ -222,19 +222,21 @@
.mention
{
background:
- -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 1)), to(rgba(0, 0, 0, 1))) 0px 0px no-repeat;
+ -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, .75)), to(rgba(0, 0, 0, .75))) 0px 0px no-repeat;
-webkit-background-size: 10px 100%;
}
-.focus
+.incoming
{
background: url("./images/vert.png") repeat;
- border-top: 1px solid white !important;
+ border-top: none !important;
+ margin-top: 1px;
}
.focus + :not(.focus)
{
- border-top: 1px solid white !important;
+ border-top: none !important;
+ margin-top: 1px;
}
.focus .x-time
diff -r 8ee0da2b465f -r eb2ad910a1b2 yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseM.css
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseM.css Mon Mar 15 00:01:26 2010 -0500
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseM.css Mon Mar 15 23:50:05 2010 -0500
@@ -83,12 +83,14 @@
.mention:hover:not(.focus) > .x-focus,
.mention:hover > .x-icon,
-.mention:hover > .x-sender,
+.mention:not(.consecutive):hover > .x-sender,
+.mention.consecutive:hover > .x-sender:after,
.mention:hover > .x-message,
.mention:hover > .x-time,
.mention.x-hover:not(.focus) > .x-focus,
.mention.x-hover > .x-icon,
-.mention.x-hover > .x-sender,
+.mention:not(.consecutive).x-hover > .x-sender,
+.mention.consecutive.x-hover > .x-sender:after,
.mention.x-hover > .x-message,
.mention.x-hover > .x-time
{
@@ -98,6 +100,13 @@
text-shadow: none;
}
+.mention.consecutive:hover > .x-sender,
+.mention.consecutive.x-hover > .x-sender
+{
+ color: transparent !important;
+ text-shadow: none;
+}
+
.mention:hover > .x-mark,
.mention.x-hover > .x-mark
{
@@ -116,12 +125,23 @@
.x-icon,
.x-sender,
.x-time,
-.history .x-mark,
.history .x-message
{
background-color: hsla(0, 0%, 90%, 1);
}
+.status .x-mark,
+.event .x-mark
+{
+ background-color: hsla(0, 0%, 98%, 1) !important;
+}
+
+.history.status .x-mark,
+.history.event .x-mark
+{
+ background-color: hsla(0, 0%, 90%, 1) !important;
+}
+
.history .x-focus,
.history .x-icon,
.history .x-sender,
@@ -174,16 +194,21 @@
/*----------*/
+#x-topic
+{
+ color: hsla(0, 0%, 18%, .8);
+}
+
#x-topic #x-wrap
{
background-color: hsla(0, 0%, 80%, .85);
border-bottom: 1px solid hsla(0, 0%, 63%, 1) !important;
- -webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, .2);
+ -webkit-box-shadow: 0px 1px 2px hsl(0, 0%, 0%, .2);
}
#x-topic .x-toggle
{
- -webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, .2), 0px 0px 2px rgba(0, 0, 0, .2);
+ -webkit-box-shadow: 0px 1px 2px hsla(0, 0%, 0%, .2), 0px 0px 2px hsla(0, 0%, 0%, .2);
}
#x-topic .x-toggle#x-hide,
diff -r 8ee0da2b465f -r eb2ad910a1b2 yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseS.css
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseS.css Mon Mar 15 00:01:26 2010 -0500
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseS.css Mon Mar 15 23:50:05 2010 -0500
@@ -83,12 +83,14 @@
.mention:hover:not(.focus) > .x-focus,
.mention:hover > .x-icon,
-.mention:hover > .x-sender,
+.mention:not(.consecutive):hover > .x-sender,
+.mention.consecutive:hover > .x-sender:after,
.mention:hover > .x-message,
.mention:hover > .x-time,
.mention.x-hover:not(.focus) > .x-focus,
.mention.x-hover > .x-icon,
-.mention.x-hover > .x-sender,
+.mention:not(.consecutive).x-hover > .x-sender,
+.mention.consecutive.x-hover > .x-sender:after,
.mention.x-hover > .x-message,
.mention.x-hover > .x-time
{
@@ -98,6 +100,13 @@
text-shadow: none;
}
+.mention.consecutive:hover > .x-sender,
+.mention.consecutive.x-hover > .x-sender
+{
+ color: transparent !important;
+ text-shadow: none;
+}
+
.mention:hover > .x-mark,
.mention.x-hover > .x-mark
{
@@ -116,12 +125,23 @@
.x-icon,
.x-sender,
.x-time,
-.history .x-mark,
.history .x-message
{
background-color: hsla(0, 0%, 22%, 1);
}
+.status .x-mark,
+.event .x-mark
+{
+ background-color: hsla(0, 0%, 12.5%, 1) !important;
+}
+
+.history.status .x-mark,
+.history.event .x-mark
+{
+ background-color: hsla(0, 0%, 22%, 1) !important;
+}
+
.history .x-focus,
.history .x-icon,
.history .x-sender,
diff -r 8ee0da2b465f -r eb2ad910a1b2 yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_FixedColorM.css
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_FixedColorM.css Mon Mar 15 00:01:26 2010 -0500
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_FixedColorM.css Mon Mar 15 23:50:05 2010 -0500
@@ -36,11 +36,11 @@
.outgoing:hover,
.outgoing:hover .x-mark,
.outgoing:hover .x-message,
-.outgoing:hover.consecutive.message .x-sender:after,
+.outgoing:hover.consecutive.message:not(.mention) .x-sender:after,
.outgoing.x-hover,
.outgoing.x-hover .x-mark,
.outgoing.x-hover .x-message,
-.outgoing.x-hover.consecutive.message .x-sender:after
+.outgoing.x-hover.consecutive.message:not(.mention) .x-sender:after
{
color: hsla(120, 42%, 24%, 1) !important;
}
@@ -48,7 +48,7 @@
/*----------*/
.incoming,
-.incoming.consecutive.message .x-sender:after
+.incoming.consecutive.message:not(.mention) .x-sender:after
{
color: hsla(240, 92%, 56%, 1) !important;
}
@@ -61,11 +61,11 @@
.incoming:hover,
.incoming:hover .x-mark,
.incoming:not(.mention):hover .x-message,
-.incoming:hover.consecutive.message .x-sender:after,
+.incoming:hover.consecutive.message:not(.mention) .x-sender:after,
.incoming.x-hover,
.incoming.x-hover .x-mark,
.incoming:not(.mention).x-hover .x-message,
-.incoming.x-hover.consecutive.message .x-sender:after
+.incoming.x-hover.consecutive.message:not(.mention) .x-sender:after
{
color: hsla(240, 92%, 54%, 1) !important;
}
@@ -99,4 +99,3 @@
{
color: hsla(0, 0%, 30%, 1) !important;
}
-
diff -r 8ee0da2b465f -r eb2ad910a1b2 yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_FixedColorS.css
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_FixedColorS.css Mon Mar 15 00:01:26 2010 -0500
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_FixedColorS.css Mon Mar 15 23:50:05 2010 -0500
@@ -7,7 +7,7 @@
.history .x-mark
{
- background-color: hsla(0, 0%, 20%, 1) !important;
+ background-color: hsla(0, 0%, 22%, 1) !important;
}
.mention:not(:hover):not(.x-hover) .x-mark
@@ -17,7 +17,7 @@
.history.mention:not(:hover):not(.x-hover) .x-mark
{
- background-color: hsla(0, 0%, 17.5%, 1) !important;
+ background-color: hsla(0, 0%, 22%, 1) !important;
}
/*----------*/
@@ -36,11 +36,11 @@
.outgoing:hover,
.outgoing:hover .x-mark,
.outgoing:hover .x-message,
-.outgoing:hover.consecutive.message .x-sender:after,
+.outgoing:hover.consecutive.message:not(.mention) .x-sender:after,
.outgoing.x-hover,
.outgoing.x-hover .x-mark,
.outgoing.x-hover .x-message,
-.outgoing.x-hover.consecutive.message .x-sender:after
+.outgoing.x-hover.consecutive.message:not(.mention) .x-sender:after
{
color: hsla(120, 42%, 56%, 1) !important;
}
@@ -48,7 +48,7 @@
/*----------*/
.incoming,
-.incoming.consecutive.message .x-sender:after
+.incoming.consecutive.message:not(.mention) .x-sender:after
{
color: hsla(240, 92%, 79%, 1) !important;
}
@@ -61,11 +61,11 @@
.incoming:hover,
.incoming:hover .x-mark,
.incoming:not(.mention):hover .x-message,
-.incoming:hover.consecutive.message .x-sender:after,
+.incoming:hover.consecutive.message:not(.mention) .x-sender:after,
.incoming.x-hover,
.incoming.x-hover .x-mark,
.incoming:not(.mention).x-hover .x-message,
-.incoming.x-hover.consecutive.message .x-sender:after
+.incoming.x-hover.consecutive.message:not(.mention) .x-sender:after
{
color: hsla(240, 92%, 81%, 1) !important;
}
@@ -99,4 +99,3 @@
{
color: hsla(0, 0%, 67%, 1) !important;
}
-
diff -r 8ee0da2b465f -r eb2ad910a1b2 yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorM.css
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorM.css Mon Mar 15 00:01:26 2010 -0500
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorM.css Mon Mar 15 23:50:05 2010 -0500
@@ -37,18 +37,18 @@
color: hsla(0, 0%, 0%, 1) !important;
}
-.status:not(:hover) .x-mark,
-.event:not(:hover) .x-mark
-{
- background-color: hsla(0, 0%, 98%, 1) !important;
-}
-
.status .x-mark,
.event .x-mark
{
color: hsla(0, 0%, 98%, 1) !important;
}
+.status.history .x-mark,
+.event.history .x-mark
+{
+ color: hsla(0, 0%, 90%, 1) !important;
+}
+
.status:hover,
.status:hover .x-mark,
.status:hover .x-message,
@@ -65,18 +65,6 @@
color: hsla(0, 0%, 30%, 1) !important;
}
-.status.history:not(:hover) .x-mark,
-.event.history:not(:hover) .x-mark
-{
- background-color: hsla(0, 0%, 90%, 1) !important;
-}
-
-.status.history .x-mark,
-.event.history .x-mark
-{
- color: hsla(0, 0%, 90%, 1) !important;
-}
-
.status.history:hover .x-mark,
.event.history:hover .x-mark,
.status.history.x-hover .x-mark,
@@ -95,6 +83,11 @@
border-top: 1px solid hsla(0, 0%, 90%, 1);
}
+.mention.message.history:not(.consecutive) .x-mark
+{
+ border-top: 1px solid hsla(0, 0%, 94%, 1);
+}
+
.message:hover:not(.history):not(.consecutive) .x-mark,
.message:hover.history:not(.consecutive) .x-mark,
.message.x-hover:not(.history):not(.consecutive) .x-mark,
@@ -102,43 +95,3 @@
{
border-top: 1px solid transparent;
}
-
-#Chat > div:first-of-type .x-mark,
-#Chat > div:first-of-type .x-message
-{
- border-top: 4px solid hsla(0, 0%, 98%, 1) !important;
-}
-
-#insert .x-mark,
-#insert .x-message
-{
- border-bottom: 4px solid hsla(0, 0%, 98%, 1) !important;
-}
-
-#Chat > div:first-of-type .x-icon,
-#Chat > div:first-of-type .x-sender,
-#Chat > div:first-of-type .x-time
-{
- border-top: 4px solid hsla(0, 0%, 90%, 1) !important;
-}
-
-#insert .x-icon,
-#insert .x-sender,
-#insert .x-time
-{
- border-bottom: 4px solid hsla(0, 0%, 90%, 1) !important;
-}
-
-.history + :not(.history) .x-mark,
-.history + :not(.history) .x-message
-{
- border-top: 16px solid hsla(0, 0%, 98%, 1) !important;
-}
-
-.history + :not(.history) .x-icon,
-.history + :not(.history) .x-sender,
-.history + :not(.history) .x-time
-{
- border-top: 16px solid hsla(0, 0%, 90%, 1) !important;
-}
-
diff -r 8ee0da2b465f -r eb2ad910a1b2 yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorS.css
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorS.css Mon Mar 15 00:01:26 2010 -0500
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorS.css Mon Mar 15 23:50:05 2010 -0500
@@ -37,18 +37,18 @@
color: hsla(0, 0%, 100%, 1) !important;
}
-.status:not(:hover) .x-mark,
-.event:not(:hover) .x-mark
-{
- background-color: hsla(0, 0%, 12.5%, 1) !important;
-}
-
.status .x-mark,
.event .x-mark
{
color: hsla(0, 0%, 12.5%, 1) !important;
}
+.status.history .x-mark,
+.event.history .x-mark
+{
+ color: hsla(0, 0%, 22%, 1) !important;
+}
+
.status:hover,
.status:hover .x-mark,
.status:hover .x-message,
@@ -65,18 +65,6 @@
color: hsla(0, 0%, 67%, 1) !important;
}
-.status.history:not(:hover) .x-mark,
-.event.history:not(:hover) .x-mark
-{
- background-color: hsla(0, 0%, 20%, 1) !important;
-}
-
-.status.history .x-mark,
-.event.history .x-mark
-{
- color: hsla(0, 0%, 20%, 1) !important;
-}
-
.status.history:hover .x-mark,
.event.history:hover .x-mark,
.status.history.x-hover .x-mark,
@@ -95,6 +83,11 @@
border-top: 1px solid hsla(0, 0%, 20%, 1);
}
+.mention.message.history:not(.consecutive) .x-mark
+{
+ border-top: 1px solid hsla(0, 0%, 17.5%, 1);
+}
+
.message:hover:not(.history):not(.consecutive) .x-mark,
.message:hover.history:not(.consecutive) .x-mark,
.message.x-hover:not(.history):not(.consecutive) .x-mark,
@@ -102,43 +95,3 @@
{
border-top: 1px solid transparent;
}
-
-#Chat > div:first-of-type .x-mark,
-#Chat > div:first-of-type .x-message
-{
- border-top: 4px solid hsla(0, 0%, 12.5%, 1) !important;
-}
-
-#insert .x-mark,
-#insert .x-message
-{
- border-bottom: 4px solid hsla(0, 0%, 12.5%, 1) !important;
-}
-
-#Chat > div:first-of-type .x-icon,
-#Chat > div:first-of-type .x-sender,
-#Chat > div:first-of-type .x-time
-{
- border-top: 4px solid hsla(0, 0%, 20%, 1) !important;
-}
-
-#insert .x-icon,
-#insert .x-sender,
-#insert .x-time
-{
- border-bottom: 4px solid hsla(0, 0%, 20%, 1) !important;
-}
-
-.history + :not(.history) .x-mark,
-.history + :not(.history) .x-message
-{
- border-top: 16px solid hsla(0, 0%, 12.5%, 1) !important;
-}
-
-.history + :not(.history) .x-icon,
-.history + :not(.history) .x-sender,
-.history + :not(.history) .x-time
-{
- border-top: 16px solid hsla(0, 0%, 20%, 1) !important;
-}
-
More information about the commits
mailing list