xtras/mathuaerknedam 149:6b620cd224ba: Hide buddy chat header, a...
commits at adium.im
commits at adium.im
Sat Oct 31 04:06:22 UTC 2009
details: http://hg.adium.im/xtras/mathuaerknedam/rev/6b620cd224ba
revision: 149:6b620cd224ba
author: mathuaerknedam
date: Fri Oct 30 22:52:34 2009 -0500
Hide buddy chat header, add spiffy fade to topic toggle.
Subject: xtras/mathuaerknedam 150:7eac54e53e1e: Make focus/mention indicators in Alternating variant work just like every other variant.
details: http://hg.adium.im/xtras/mathuaerknedam/rev/7eac54e53e1e
revision: 150:7eac54e53e1e
author: mathuaerknedam
date: Fri Oct 30 23:06:16 2009 -0500
Make focus/mention indicators in Alternating variant work just like every other variant.
diffs (389 lines):
diff -r 132847d18f35 -r 7eac54e53e1e Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Mockup-SpecialCases.html
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Mockup-SpecialCases.html Fri Oct 30 14:39:42 2009 -0400
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Mockup-SpecialCases.html Fri Oct 30 23:06:16 2009 -0500
@@ -356,7 +356,7 @@
</div>
-<hr id="focus" style="position: absolute; top: 824px;">
+<hr id="focus" style="position: absolute; top: 424px;">
<script type="text/javascript">
diff -r 132847d18f35 -r 7eac54e53e1e Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Alternating.css
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Alternating.css Fri Oct 30 14:39:42 2009 -0400
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Alternating.css Fri Oct 30 23:06:16 2009 -0500
@@ -33,10 +33,26 @@
hr#focus
{
width: inherit;
- //left: 52px;
- //right: 52px;
+ //left: 8px;
+ //right: 18px;
left: 0px;
right: 0px;
+ border: 0px !important;
+ border-bottom: none;
+ //width: 18px;
+}
+
+hr#focus:before
+{
+ position: absolute;
+ font-family: AppleGothic;
+ margin-top: -17px;
+ right: 5px;
+ font-size: 9px;
+ content: "\2b07";
+ //color: rgba(64, 64, 64, 1);
+ color: rgba(96, 0, 0, 1);
+ text-shadow: 0px 1px 1px rgba(255, 255, 255, 1);
}
.message:not(.consecutive),
@@ -50,7 +66,7 @@
.status:not(.consecutive):not(.IRC).showIcons,
.event:not(.consecutive):not(.IRC).showIcons
{
- margin-right: 42px;
+ margin-right: 52px;
margin-left: 42px;
}
@@ -68,9 +84,11 @@
.message.mention .x-message:before
{
position: absolute;
- right: 36px;
- margin-left: -.73em;
- margin-top: -.1em;
+ margin-top: -1px;
+ font-family: AppleGothic;
+ content: "\23af";
+ right: 4px;
+ font-size: 12px;
content: "\2605";
//color: rgba(64, 64, 64, 1);
color: rgba(0, 0, 128, 1);
@@ -244,7 +262,7 @@
.outgoing.message img.x-icon
{
- right: 8px;
+ right: 18px;
-webkit-border-top-left-radius: 0px;
}
@@ -274,7 +292,7 @@
.outgoing.message .x-iconmask
{
- right: 11px;
+ right: 21px;
}
.incoming.message .x-iconmask
@@ -490,7 +508,7 @@
.history.event:not(.consecutive):not(.IRC).showIcons
{
- margin-right: 41px;
+ margin-right: 51px;
}
.history.event:not(.consecutive).IRC,
@@ -575,7 +593,7 @@
#x-header
{
- right: 72px !important;
+ right: 82px !important;
left: 72px !important;
}
@@ -613,14 +631,14 @@
#x-header .x-icon.outgoing
{
- right: 8px !important;
+ right: 18px !important;
-webkit-border-top-left-radius: 0px !important;
-webkit-border-bottom-left-radius: 5px !important;
}
#x-header .x-iconmask.outgoing
{
- right: 12px !important;
+ right: 22px !important;
}
#x-header .x-iconmask.incoming
@@ -647,6 +665,6 @@
#x-header .x-sender.outgoing
{
- right: 9px !important;
+ right: 19px !important;
}
diff -r 132847d18f35 -r 7eac54e53e1e yMous ☿.AdiumMessageStyle/Contents/Resources/Footer.html
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Footer.html Fri Oct 30 14:39:42 2009 -0400
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Footer.html Fri Oct 30 23:06:16 2009 -0500
@@ -37,13 +37,13 @@
}
function show_header () {
- document.getElementById('x-topic').style.display = '';
+ document.getElementById('x-header').style.opacity = '1';
document.getElementById('toggle_show').style.display = 'none';
document.getElementById('toggle_hide').style.display = '';
}
function hide_header () {
- document.getElementById('x-topic').style.display = 'none';
+ document.getElementById('x-header').style.opacity = '0';
document.getElementById('toggle_hide').style.display = 'none';
document.getElementById('toggle_show').style.display = '';
}
diff -r 132847d18f35 -r 7eac54e53e1e yMous ☿.AdiumMessageStyle/Contents/Resources/Header.css
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Header.css Fri Oct 30 14:39:42 2009 -0400
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Header.css Fri Oct 30 23:06:16 2009 -0500
@@ -4,13 +4,14 @@
cursor: default;
position: fixed;
top: 0px;
- right: 0px;
+ left: 0px;
z-index: 5;
//width: 100%;
//height: 65px;
+ display: none;
}
-#header_bar {
+#x-header {
-webkit-transition: opacity .4s linear;
}
@@ -20,7 +21,7 @@
{
position: fixed;
top: 2px;
- right: 3px;
+ left: 3px;
padding: 2px;
z-index: 10;
cursor: default;
diff -r 132847d18f35 -r 7eac54e53e1e yMous ☿.AdiumMessageStyle/Contents/Resources/Header.html
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Header.html Fri Oct 30 14:39:42 2009 -0400
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Header.html Fri Oct 30 23:06:16 2009 -0500
@@ -1,24 +1,11 @@
-<script type="text/javascript" charset="utf-8">
- function show_header () {
- document.getElementById('header_bar').style.opacity = '1';
- document.getElementById('toggle_show').style.display = 'none';
- document.getElementById('toggle_hide').style.display = '';
- }
- function hide_header () {
- document.getElementById('header_bar').style.opacity = '0';
- document.getElementById('toggle_hide').style.display = 'none';
- document.getElementById('toggle_show').style.display = '';
- }
-</script>
-
-<style type="text/css">
+<style type="text/css">
@import url( "./Header.css" );
</style>
<div id="header">
<div id="toggle_hide" class="toggle" onClick="hide_header();"></div>
<div id="toggle_show" class="toggle" onClick="show_header();" style="display: none"></div>
- <div id="header_bar">
+ <div id="x-header">
<img class="picture co" src="%incomingIconPath%" />
</div>
</div>
diff -r 132847d18f35 -r 7eac54e53e1e yMous ☿.AdiumMessageStyle/Contents/Resources/Mockup.html
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Mockup.html Fri Oct 30 14:39:42 2009 -0400
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Mockup.html Fri Oct 30 23:06:16 2009 -0500
@@ -210,6 +210,18 @@
highlightActive = false;
}
+ function show_header () {
+ document.getElementById('x-header').style.opacity = '1';
+ document.getElementById('toggle_show').style.display = 'none';
+ document.getElementById('toggle_hide').style.display = '';
+ }
+
+ function hide_header () {
+ document.getElementById('x-header').style.opacity = '0';
+ document.getElementById('toggle_hide').style.display = 'none';
+ document.getElementById('toggle_show').style.display = '';
+ }
+
document.body.addEventListener("mousedown", selectSender, false);
document.body.addEventListener("mouseup", deselectAll, false);
var htmlElm = document.getElementsByTagName("html")[0];
diff -r 132847d18f35 -r 7eac54e53e1e yMous ☿.AdiumMessageStyle/Contents/Resources/Status-old.html
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Status-old.html Fri Oct 30 14:39:42 2009 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<div class="xxxwrapper %service% %messageClasses%">
- <span class="xxxiconsmall"><img src="%userIconPath%" /></span>
- <span class="xxxsender"><!></span>
- <span class="xxxmark">‣</span>
- <span class="xxxmessage" title="%time%">%message%</span>
- <span class="xxxtime">%time%</span>
-</div>
-<xxxinsert id="insert"></xxxinsert>
diff -r 132847d18f35 -r 7eac54e53e1e yMous ☿.AdiumMessageStyle/Contents/Resources/Topic.css
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Topic.css Fri Oct 30 14:39:42 2009 -0400
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Topic.css Fri Oct 30 23:06:16 2009 -0500
@@ -4,17 +4,18 @@
{
}
-#x-topic
+#x-header
{
position: fixed;
left: 0px;
right: 0px;
padding: 4px;
- padding-right: 19px;
+ padding-left: 19px;
z-index: 99;
background: rgba(208, 208, 208, .85);
-webkit-background-size: auto auto;
-webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, .2);
+ -webkit-transition: opacity .4s linear;
}
#topicEdit
@@ -25,7 +26,7 @@
{
position: fixed;
top: 2px;
- right: 3px;
+ left: 3px;
padding: 2px;
z-index: 10;
cursor: default;
diff -r 132847d18f35 -r 7eac54e53e1e yMous ☿.AdiumMessageStyle/Contents/Resources/Topic.html
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Topic.html Fri Oct 30 14:39:42 2009 -0400
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Topic.html Fri Oct 30 23:06:16 2009 -0500
@@ -4,6 +4,6 @@
<div id="toggle_hide" class="toggle" onClick="hide_header();"></div>
<div id="toggle_show" class="toggle" onClick="show_header();" style="display: none"></div>
- <div id="x-topic">
+ <div id="x-header">
%topic%
</div>
diff -r 132847d18f35 -r 7eac54e53e1e yMous ☿.AdiumMessageStyle/Contents/Resources/alignchat.js
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/alignchat.js Fri Oct 30 14:39:42 2009 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-//Align our chat to the bottom of the window. If true is passed, view will also be scrolled down
-function alignChat(shouldScroll) {
- var windowHeight = window.innerHeight;
-
- if (windowHeight > 0) {
- var contentElement = document.body;
- var diffHeight = (windowHeight - document.documentElement.offsetHeight);
- if (diffHeight > 0) {
- contentElement.style.position = 'relative';
- contentElement.style.top = diffHeight + 'px';
- } else {
- contentElement.style.position = 'static';
- }
- }
-
- if (shouldScroll) scrollToBottom();
-}
-
-function scrollToBottom() {
- window.scrollTo(0,document.body.scrollHeight);
-}
diff -r 132847d18f35 -r 7eac54e53e1e yMous ☿.AdiumMessageStyle/Contents/Resources/roomTopicBanner.js
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/roomTopicBanner.js Fri Oct 30 14:39:42 2009 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-var topicSize = 0;
-var topicToggled = false;
-
-function toggleTopic( event ) {
- if( event && event.altKey ) {
- topicSize++;
- if( topicSize > 6 ) topicSize = 0;
- topicAreaSize = ( ! topicSize ? 17 : ( topicSize == 1 ? 32 : ( topicSize == 2 ? 47 : ( topicSize == 3 ? 62 : ( topicSize == 4 ? 77 : ( topicSize == 5 ? 92 : 107 ) ) ) ) ) );
- if( topicSize == 6 ) document.getElementById( 'toggleButton' ).className = "up";
- else document.getElementById( 'toggleButton' ).className = "";
- } else {
- if( ! topicToggled && topicSize < 6 ) {
- topicAreaSize = document.getElementById( 'topicEdit' ).clientHeight + 2;
- if( topicAreaSize > 107 ) topicAreaSize = 107;
- else if( topicAreaSize < 17 ) topicAreaSize = 17;
- document.getElementById( 'toggleButton' ).className = "up";
- topicToggled = true;
- } else {
- if( topicSize == 6 ) topicSize = 0;
- topicAreaSize = ( ! topicSize ? 17 : ( topicSize == 1 ? 32 : ( topicSize == 2 ? 47 : ( topicSize == 3 ? 62 : ( topicSize == 4 ? 77 : ( topicSize == 5 ? 92 : 107 ) ) ) ) ) );
- document.getElementById( 'toggleButton' ).className = "";
- topicToggled = false;
- }
- }
-
- document.getElementById( 'topic' ).style.setProperty( 'height', topicAreaSize + 'px', null );
-}
-
-function changeTopic( topic, author, empty ) {
- topicMessage = document.getElementById( 'topicEdit' );
- topicMessage.innerHTML = topic;
- topicMessage.title = topicMessage.innerText + ( author ? ' set by ' + author : '' );
- refreshTopicSize();
-}
-
-function refreshTopicSize( event ) {
- topicMessage = document.getElementById( 'topicEdit' );
- if( topicMessage.clientHeight > 17 )
- document.getElementById( 'toggleButton' ).style.setProperty( 'display', 'block', null );
- else document.getElementById( 'toggleButton' ).style.setProperty( 'display', 'none', null );
- if( topicToggled ) {
- topicAreaSize = topicMessage.clientHeight + 2;
- if( topicAreaSize > 107 ) topicAreaSize = 107;
- else if( topicAreaSize < 17 ) topicAreaSize = 17;
- document.getElementById( 'topic' ).style.setProperty( 'height', topicAreaSize + 'px', null );
- }
-}
-
-window.addEventListener( 'resize', refreshTopicSize, false );
diff -r 132847d18f35 -r 7eac54e53e1e yMous ☿.AdiumMessageStyle/Contents/Resources/todo.txt
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/todo.txt Fri Oct 30 14:39:42 2009 -0400
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/todo.txt Fri Oct 30 23:06:16 2009 -0500
@@ -1,20 +1,10 @@
-
-needs new features like service and showIcons from so3
-contrast enhancements
-
-
-changing between consecutive messages causes background flashing, probably due to js iteration lag and animation.
-
-js iteration lag is a problem when scrollback gets huge. can it be limited to the viewport or to X messaages before/after?
-
-Are emoticons a pixel too big? Only at 9pt and 12pt, but not 10pt and 11pt. and only for messages containging only an emoticon.
+# Are emoticons a pixel too big? Only at 9pt and 12pt, but not 10pt and 11pt. and only for messages containging only an emoticon.
# resolve issue with scaled emoticons.
# enable icons in twitter history?
-# provide header minimization button.
- # can topic changes maximize the topic?
+# can topic changes maximize a minimized topic?
CHANGES:
More information about the commits
mailing list