xtras/mathuaerknedam 478:926f515825f1: Stockholm: reduce right m...
commits at adium.im
commits at adium.im
Sun May 9 21:04:34 UTC 2010
details: http://hg.adium.im/xtras/mathuaerknedam/rev/926f515825f1
revision: 478:926f515825f1
author: mathuaerknedam
date: Fri May 07 16:07:54 2010 -0500
Stockholm: reduce right margin on timestamps when the chat has focus. This re-centers the sender and initial timestamp, but means that the 'normal' timestamps no longer align with focus timestamps (which are always visible in status messages but only visible on hover for chat messages).
Subject: xtras/mathuaerknedam 479:30884b111012: Stockholm: tweak message alignment so that ranging numbers are vertically centered.
details: http://hg.adium.im/xtras/mathuaerknedam/rev/30884b111012
revision: 479:30884b111012
author: mathuaerknedam
date: Fri May 07 16:11:23 2010 -0500
Stockholm: tweak message alignment so that ranging numbers are vertically centered.
Subject: xtras/mathuaerknedam 480:a69f8f5d2477: Stockholm: In addition to the consecutive messages showing the timestamp on hover, now the first message shows a timestamp on hover. (Yes, the timestamp for the first message appears in two places...) This necessitated a surprising amount of HTML tweaking.)
details: http://hg.adium.im/xtras/mathuaerknedam/rev/a69f8f5d2477
revision: 480:a69f8f5d2477
author: mathuaerknedam
date: Sat May 08 21:08:49 2010 -0500
Stockholm: In addition to the consecutive messages showing the timestamp on hover, now the first message shows a timestamp on hover. (Yes, the timestamp for the first message appears in two places...) This necessitated a surprising amount of HTML tweaking.)
Subject: xtras/mathuaerknedam 481:06070d6c42cd: Stockholm: make the outer dark edge of the icon overlay get a little lighter at the bottom.
details: http://hg.adium.im/xtras/mathuaerknedam/rev/06070d6c42cd
revision: 481:06070d6c42cd
author: mathuaerknedam
date: Sun May 09 16:03:38 2010 -0500
Stockholm: make the outer dark edge of the icon overlay get a little lighter at the bottom.
diffs (396 lines):
diff -r f0e87cbf5a98 -r 06070d6c42cd Stockholm ☿.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Incoming/Content.html Thu May 06 17:45:35 2010 -0500
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Incoming/Content.html Sun May 09 16:03:38 2010 -0500
@@ -7,7 +7,8 @@
<div class="x-sender">%sender%</div>
</div>
<div class="x-message">
+ <div class="x-time" title="%time{dd MMM yyyy}%">%time%</div>
<div class="x-text">%message%</div>
- <div id="insert"></div>
</div>
+ <div id="insert"></div>
</div>
diff -r f0e87cbf5a98 -r 06070d6c42cd Stockholm ☿.AdiumMessageStyle/Contents/Resources/Incoming/FileTransferRequest.html
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Incoming/FileTransferRequest.html Thu May 06 17:45:35 2010 -0500
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Incoming/FileTransferRequest.html Sun May 09 16:03:38 2010 -0500
@@ -1,23 +1,18 @@
-<div class="x-container %messageClasses% %service% %userIcons%">
- <div class="x-iconsubstitute" background="%userIconPath%">
- <img class="x-buddyicon" src="%userIconPath%" />
- <div class="x-iconoverlay"></div>
+<div class="x-container %messageClasses% %service% %userIcons%" background="%userIconPath%">
+ <img class="x-buddyicon" src="%userIconPath%" />
+ <div class="x-iconoverlay"></div>
+ <div class="x-mentionicon" title="Mentioned!"></div>
+ <div class="x-header">
+ <div class="x-time" title="%time{dd MMM yyyy}%">%time%</div>
+ <div class="x-sender">%sender%</div>
</div>
- <div class="x-right" background="%userIconPath%">
- <div class="x-header">
- <div class="x-sender">%sender%</div>
- <div class="x-time" title="%time{dd MMM yyyy}%">%time%</div>
- </div>
- <div class="x-message">
- <div class="x-filetext">
- <div class="x-fileicon"><img src="%fileIconPath%" onclick="%saveFileHandler%" /></div>
- <div class="x-fileincoming">Incoming file:</div>
- <div class="x-filename" onclick="%saveFileHandler%"><a href="#">%fileName%</a></div>
- <div class="x-filemessage">%message%</div>
- <input type="button" value="Save As..." onclick="%saveFileAsHandler%"></button>
- <input type="button" value="Cancel" onclick="%cancelRequestHandler%"></button>
- <div id="insert" border="1"></div>
- </div>
- </div>
+ <div class="x-message x-filetext">
+ <div class="x-fileicon"><img src="%fileIconPath%" onclick="%saveFileHandler%" /></div>
+ <div class="x-fileincoming">Incoming file:</div>
+ <div class="x-filename" onclick="%saveFileHandler%"><a href="#">%fileName%</a></div>
+ <div class="x-filemessage">%message%</div>
+ <input type="button" value="Save As..." onclick="%saveFileAsHandler%"></button>
+ <input type="button" value="Cancel" onclick="%cancelRequestHandler%"></button>
</div>
+ <div id="insert"></div>
</div>
diff -r f0e87cbf5a98 -r 06070d6c42cd Stockholm ☿.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html Thu May 06 17:45:35 2010 -0500
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html Sun May 09 16:03:38 2010 -0500
@@ -1,4 +1,4 @@
-<div class="x-combine %messageClasses% %service% %userIcons%">
+<div class="x-message %messageClasses% %service% %userIcons%">
<div class="x-time" title="%time{dd MMM yyyy}%">%time%</div>
<div class="x-text">%message%</div>
</div>
diff -r f0e87cbf5a98 -r 06070d6c42cd Stockholm ☿.AdiumMessageStyle/Contents/Resources/Mockup.html
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Mockup.html Thu May 06 17:45:35 2010 -0500
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Mockup.html Sun May 09 16:03:38 2010 -0500
@@ -5,7 +5,7 @@
<title>Stockholm</title>
<style type="text/css">
- @import url( "./Variants/blue - red.css" );
+ @import url( "./Variants/alt blue - red.css" );
body
{
@@ -45,6 +45,7 @@
<div class="x-sender">yhn | ujm</div>
</div>
<div class="x-message">
+ <div class="x-time">12:22 PM</div>
<div class="x-text"><a href=http://>1</a></div>
</div>
</div>
@@ -60,15 +61,16 @@
<div class="x-sender">yhn | ujm</div>
</div>
<div class="x-message">
+ <div class="x-time">12:22 PM</div>
<div class="x-text"><a href=http://>1</a></div>
- <div class="consecutive incoming message history AIM showIcons">
- <div class="x-time">12:22 PM</div>
- <div class="x-text">2</div>
- </div>
- <div class="consecutive incoming message history AIM showIcons">
- <div class="x-time">12:22 PM</div>
- <div class="x-text">3</div>
- </div>
+ </div>
+ <div class="x-message consecutive incoming message history AIM showIcons">
+ <div class="x-time">12:22 PM</div>
+ <div class="x-text">2</div>
+ </div>
+ <div class="x-message consecutive incoming message history AIM showIcons">
+ <div class="x-time">12:22 PM</div>
+ <div class="x-text">3</div>
</div>
</div>
<HR>
@@ -86,6 +88,7 @@
<div class="x-sender">yhn | ujm</div>
</div>
<div class="x-message">
+ <div class="x-time">12:22 PM</div>
<div class="x-text"><a href=http://>1</a></div>
</div>
</div>
@@ -105,6 +108,7 @@
<div class="x-sender">yhn | ujm</div>
</div>
<div class="x-message">
+ <div class="x-time">12:22 PM</div>
<div class="x-text"><a href=http://>1</a></div>
</div>
</div>
@@ -121,10 +125,11 @@
<div class="x-mentionicon" title="Mentioned!"></div>
<div class="x-header">
<div class="x-time">12:22 PM</div>
- <div class="x-sender">yhn | ujm</div>
+ <div class="x-sender">|yhn | ujm</div>
</div>
<div class="x-message">
- <div class="x-text"><a href=http://>1</a></div>
+ <div class="x-time">12:22 PM</div>
+ <div class="x-text">|<a href=http://>1</a></div>
</div>
</div>
@@ -139,15 +144,16 @@
<div class="x-sender">yhn | ujm</div>
</div>
<div class="x-message">
+ <div class="x-time">12:22 PM</div>
<div class="x-text"><a href=http://>1</a></div>
- <div class="mention consecutive incoming message focus AIM showIcons">
- <div class="x-time">12:22 PM</div>
- <div class="x-text">3.141592653589793238462643383279502884197169399375105820974944592307816406286208998628034825342117067982148086513282306647093844609550582231725359408128481117450284102701938521105559644622948954930381964428810975665933446128475648233786783165271201909145648566923460348610454326648213393607260249141273724587006606315588174881520920962829254091715364367892590360011330530548820466521384146951941511609É</div>
- </div>
- <div class="mention consecutive incoming message focus AIM showIcons">
- <div class="x-time">12:22 PM</div>
- <div class="x-text">3</div>
- </div>
+ </div>
+ <div class="x-message mention consecutive incoming message focus AIM showIcons">
+ <div class="x-time">12:22 PM</div>
+ <div class="x-text">3.141592653589793238462643383279502884197169399375105820974944592307816406286208998628034825342117067982148086513282306647093844609550582231725359408128481117450284102701938521105559644622948954930381964428810975665933446128475648233786783165271201909145648566923460348610454326648213393607260249141273724587006606315588174881520920962829254091715364367892590360011330530548820466521384146951941511609É</div>
+ </div>
+ <div class="x-message mention consecutive incoming message focus AIM showIcons">
+ <div class="x-time">12:22 PM</div>
+ <div class="x-text">3</div>
</div>
</div>
@@ -166,15 +172,16 @@
<div class="x-sender">yhn | ujm</div>
</div>
<div class="x-message">
+ <div class="x-time">12:22 PM</div>
<div class="x-text"><a href=http://>1</a></div>
- <div class="focus consecutive incoming message AIM showIcons">
- <div class="x-time">12:22 PM</div>
- <div class="x-text">2</div>
- </div>
- <div class="consecutive incoming message AIM showIcons">
- <div class="x-time">12:22 PM</div>
- <div class="x-text">3</div>
- </div>
+ </div>
+ <div class="x-message focus consecutive incoming message AIM showIcons">
+ <div class="x-time">12:22 PM</div>
+ <div class="x-text">2</div>
+ </div>
+ <div class="x-message consecutive incoming message AIM showIcons">
+ <div class="x-time">12:22 PM</div>
+ <div class="x-text">3</div>
</div>
</div>
@@ -193,6 +200,7 @@
<div class="x-sender">yhn | ujm</div>
</div>
<div class="x-message">
+ <div class="x-time">12:22 PM</div>
<div class="x-text"><a href=http://>1</a></div>
</div>
</div>
@@ -208,15 +216,16 @@
<div class="x-sender">yhn | ujm</div>
</div>
<div class="x-message">
+ <div class="x-time">12:22 PM</div>
<div class="x-text"><a href=http://>1</a></div>
- <div class="consecutive incoming message AIM showIcons">
- <div class="x-time">12:22 PM</div>
- <div class="x-text">2</div>
- </div>
- <div class="consecutive incoming message AIM showIcons">
- <div class="x-time">12:22 PM</div>
- <div class="x-text">3</div>
- </div>
+ </div>
+ <div class="x-message consecutive incoming message AIM showIcons">
+ <div class="x-time">12:22 PM</div>
+ <div class="x-text">2</div>
+ </div>
+ <div class="x-message consecutive incoming message AIM showIcons">
+ <div class="x-time">12:22 PM</div>
+ <div class="x-text">3</div>
</div>
</div>
diff -r f0e87cbf5a98 -r 06070d6c42cd Stockholm ☿.AdiumMessageStyle/Contents/Resources/Styles/alternating.css
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Styles/alternating.css Thu May 06 17:45:35 2010 -0500
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Styles/alternating.css Sun May 09 16:03:38 2010 -0500
@@ -75,7 +75,7 @@
/*top dark border*/
-webkit-gradient(linear, left top, right top, from(hsla(0, 0%, 58%, 1)), to(hsla(0, 0%, 48%, 1))) left top no-repeat,
/*left dark gradient*/
- -webkit-gradient(linear, left top, left bottom, from(hsla(0, 0%, 48%, 1)), color-stop(.3, hsla(0, 0%, 48%, 1)), to(hsla(0, 0%, 58%, 1))) left top no-repeat,
+ -webkit-gradient(linear, left top, left bottom, from(hsla(0, 0%, 48%, 1)), to(hsla(0, 0%, 73%, 1))) left top no-repeat,
/*left light gradient*/
-webkit-gradient(linear, left top, left bottom, from(hsla(0, 0%, 90%, .3)), to(hsla(0, 0%, 100%, .7))) left top no-repeat,
/*right dark gradient*/
@@ -105,7 +105,7 @@
/*left light gradient*/
-webkit-gradient(linear, left top, left bottom, from(hsla(0, 0%, 90%, .3)), to(hsla(0, 0%, 100%, .7))) left top no-repeat,
/*right dark gradient*/
- -webkit-gradient(linear, left top, left bottom, from(hsla(0, 0%, 48%, 1)), color-stop(.3, hsla(0, 0%, 48%, 1)), to(hsla(0, 0%, 58%, 1))) right bottom no-repeat,
+ -webkit-gradient(linear, left top, left bottom, from(hsla(0, 0%, 48%, 1)), to(hsla(0, 0%, 73%, 1))) right bottom no-repeat,
/*right light gradient*/
-webkit-gradient(linear, left top, left bottom, from(hsla(0, 0%, 90%, .3)), to(hsla(0, 0%, 100%, .7))) right bottom no-repeat,
/*top light edge*/
@@ -127,7 +127,7 @@
/*top dark border*/
-webkit-gradient(linear, left top, right top, from(hsla(0, 0%, 58%, 1)), to(hsla(0, 0%, 48%, 1))) left top no-repeat,
/*left dark gradient*/
- -webkit-gradient(linear, left top, left bottom, from(hsla(0, 0%, 48%, 1)), color-stop(.3, hsla(0, 0%, 48%, 1)), to(hsla(0, 0%, 58%, 1))) left top no-repeat,
+ -webkit-gradient(linear, left top, left bottom, from(hsla(0, 0%, 48%, 1)), to(hsla(0, 0%, 73%, 1))) left top no-repeat,
/*left light gradient*/
-webkit-gradient(linear, left top, left bottom, from(hsla(0, 0%, 90%, .3)), to(hsla(0, 0%, 100%, .7))) left top no-repeat,
/*right dark gradient*/
diff -r f0e87cbf5a98 -r 06070d6c42cd Stockholm ☿.AdiumMessageStyle/Contents/Resources/Styles/main.css
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Styles/main.css Thu May 06 17:45:35 2010 -0500
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Styles/main.css Sun May 09 16:03:38 2010 -0500
@@ -195,7 +195,8 @@
.x-container .x-header .x-time
{
float: right;
- margin-right: 11px;
+ //margin-right: 11px;
+ margin-right: 8px;
margin-left: 6px;
margin-top: 3px;
}
@@ -204,27 +205,31 @@
.x-container .x-message
{
- padding-top: 3px;
- padding-left: 8px;
- padding-right: 11px;
+ padding-top: 2px;
+ padding-bottom: 1px;
+ margin-left: 6px;
+ margin-right: 8px;
+ padding-right: 1px;
margin-bottom: -1px;
}
-.message.consecutive
+.x-message.consecutive
{
- padding-bottom: 0px;
- padding-top: 2px;
+ padding-bottom: 1px;
+ padding-top: 1px;
border-top: 1px solid #DDDDDD;
+ margin-top: 1px;
+
}
-.message .x-text
+.x-message .x-text
{
line-height: 1.3em;
overflow: auto;
padding-bottom: 1px;
}
-.message.consecutive .x-time
+.x-message .x-time
{
visibility: hidden;
font-weight: bold;
@@ -237,22 +242,24 @@
font-weight: bold;
padding-top: 0px;
padding-bottom: 1px;
- margin-top: -1px;
+ margin-top: 0px;
}
-.message.consecutive:not(.focus) .x-time
+.message:not(.focus) .x-message .x-time,
+.message .x-message:not(.focus) .x-time
{
- right: 6px;
- padding-right: 4px;
+ right: 1px;
+ padding-right: 5px;
}
-.message.consecutive.focus .x-time
+.message.focus .x-message .x-time,
+.message .x-message.focus .x-time
{
right: 1px;
padding-right: 9px;
}
-.message.consecutive:hover .x-time
+.x-message:hover .x-time
{
visibility: visible;
}
@@ -270,20 +277,22 @@
opacity: .96;
margin-top: 11px;
margin-bottom: -2px;
- -webkit-border-top-left-radius: 3px;
- -webkit-border-top-right-radius: 3px;
- -webkit-border-bottom-left-radius: 3px;
- -webkit-border-bottom-right-radius: 3px;
+ background: -webkit-gradient(linear, left top, left bottom, from(rgba(241, 241, 241, 1)), to(rgba(241, 241, 241, 1))) no-repeat;
+ -webkit-border-radius: 3px;
-webkit-box-shadow: 0px 1px 0px rgba(255, 255, 255, .9), 0px -1px 0px rgba(0, 0, 0, .2), 0px 0px 2px rgba(0, 0, 0, .2);
padding-top: 1px;
- padding-right: 12px;
padding-bottom: 1px;
padding-left: 7px;
}
-.x-status_container
+.x-status_container:not(.focus)
{
- background: -webkit-gradient(linear, left top, left bottom, from(rgba(241, 241, 241, 1)), to(rgba(241, 241, 241, 1))) no-repeat;
+ padding-right: 7px;
+}
+
+.x-status_container.focus
+{
+ padding-right: 12px;
}
.x-status_container .x-text
@@ -346,7 +355,7 @@
padding-right: 2px;
-webkit-border-radius: 3px;
position: absolute;
- margin-top: 2px;
+ margin-top: 3px;
right: 3px;
line-height: .8em;
}
diff -r f0e87cbf5a98 -r 06070d6c42cd Stockholm ☿.AdiumMessageStyle/Contents/Resources/Styles/regular.css
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Styles/regular.css Thu May 06 17:45:35 2010 -0500
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Styles/regular.css Sun May 09 16:03:38 2010 -0500
@@ -48,7 +48,7 @@
/*top dark border*/
-webkit-gradient(linear, left top, right top, from(hsla(0, 0%, 58%, 1)), to(hsla(0, 0%, 48%, 1))) left top no-repeat,
/*left dark gradient*/
- -webkit-gradient(linear, left top, left bottom, from(hsla(0, 0%, 48%, 1)), color-stop(.3, hsla(0, 0%, 48%, 1)), to(hsla(0, 0%, 58%, 1))) left top no-repeat,
+ -webkit-gradient(linear, left top, left bottom, from(hsla(0, 0%, 48%, 1)), to(hsla(0, 0%, 73%, 1))) left top no-repeat,
/*left light gradient*/
-webkit-gradient(linear, left top, left bottom, from(hsla(0, 0%, 90%, .3)), to(hsla(0, 0%, 100%, .7))) left top no-repeat,
/*right dark gradient*/
@@ -74,7 +74,7 @@
/*top dark border*/
-webkit-gradient(linear, left top, right top, from(hsla(0, 0%, 58%, 1)), to(hsla(0, 0%, 48%, 1))) left top no-repeat,
/*left dark gradient*/
- -webkit-gradient(linear, left top, left bottom, from(hsla(0, 0%, 48%, 1)), color-stop(.3, hsla(0, 0%, 48%, 1)), to(hsla(0, 0%, 58%, 1))) left top no-repeat,
+ -webkit-gradient(linear, left top, left bottom, from(hsla(0, 0%, 48%, 1)), to(hsla(0, 0%, 73%, 1))) left top no-repeat,
/*left light gradient*/
-webkit-gradient(linear, left top, left bottom, from(hsla(0, 0%, 90%, .3)), to(hsla(0, 0%, 100%, .7))) left top no-repeat,
/*right dark gradient*/
More information about the commits
mailing list