<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][4698] trunk/bp-themes/bp-default/_inc/css/default.css: Reverse merge r4697:4696; the css change affected pages it wasn't meant to.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/4698">4698</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-07-18 18:07:58 +0000 (Mon, 18 Jul 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Reverse merge r4697:4696; the css change affected pages it wasn't meant to.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (4697 => 4698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css        2011-07-18 16:24:08 UTC (rev 4697)
+++ trunk/bp-themes/bp-default/_inc/css/default.css        2011-07-18 18:07:58 UTC (rev 4698)
</span><span class="lines">@@ -1281,6 +1281,9 @@
</span><span class="cx">         margin: 10px 0 15px;
</span><span class="cx">         clear: both;
</span><span class="cx"> }
</span><ins>+div.activity-meta a {
+        color: #999;
+}
</ins><span class="cx"> div.activity-meta a:hover {
</span><span class="cx">         color: inherit;
</span><span class="cx"> }
</span><span class="lines">@@ -1703,21 +1706,26 @@
</span><span class="cx"> input[type=reset],
</span><span class="cx"> ul.button-nav li a,
</span><span class="cx"> div.generic-button a {
</span><del>-        background: #ededed;
-        border: 1px solid #bbb;
</del><ins>+        border: 1px solid #ccc;
</ins><span class="cx">         -moz-border-radius: 3px;
</span><span class="cx">         -webkit-border-radius: 3px;
</span><span class="cx">         border-radius: 3px;
</span><span class="cx">         color: #777;
</span><span class="cx">         cursor: pointer;
</span><del>-        font: normal 11px/20px Arial, Tahoma, Verdana, sans-serif;
</del><ins>+        font-size: 12px;
+        font-weight: normal;
+        font-family: Arial, Tahoma, Verdana, sans-serif;
</ins><span class="cx">         text-decoration: none;
</span><span class="cx">         vertical-align: bottom;
</span><span class="cx">         outline: none;
</span><span class="cx">         cursor: pointer;
</span><span class="cx">         text-align: center;
</span><span class="cx">         text-decoration: none;
</span><del>-        padding: 4px 8px;
</del><ins>+        padding: 4px 10px;
+        background: #fff;
+        background: -webkit-gradient(linear, left top, left bottom, from(white), to(#ededed));
+        background: -moz-linear-gradient(top, white, #ededed);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ededed');
</ins><span class="cx"> }
</span><span class="cx"> button:hover,
</span><span class="cx"> a.button:hover,
</span><span class="lines">@@ -1728,16 +1736,16 @@
</span><span class="cx"> ul.button-nav li a:hover,
</span><span class="cx"> ul.button-nav li.current a,
</span><span class="cx"> div.generic-button a:hover {
</span><del>-        background-image: -webkit-linear-gradient(rgba(255, 255, 255, .5), rgba(255, 255, 255, 0));
-        background-image: -moz-linear-gradient(rgba(255, 255, 255, .5), rgba(255, 255, 255, 0));
-        background-image: -ms-linear-gradient(rgba(255, 255, 255, .5), rgba(255, 255, 255, 0));
-        background-image: -o-linear-gradient(rgba(255, 255, 255, .5), rgba(255, 255, 255, 0));
-        background-image: linear-gradient(rgba(255, 255, 255, .5), rgba(255, 255, 255, 0));
-        border: 1px solid #555;
</del><ins>+        border: 1px solid #bbb;
</ins><span class="cx">         color: #555;
</span><ins>+        outline: none;
+        text-decoration: none;
+        background: #ededed;
+        background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#e0e0e0));
+        background: -moz-linear-gradient(top,  #fff,  #e0e0e0);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#dcdcdc');
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-
</del><span class="cx"> /*--------------------------------------------------------------
</span><span class="cx"> 6.7 - Forums, Tables and Topics
</span><span class="cx"> --------------------------------------------------------------*/
</span><span class="lines">@@ -1926,12 +1934,6 @@
</span><span class="cx"> }
</span><span class="cx"> span.activity,
</span><span class="cx"> div#message p {
</span><del>-        background: #ffeaa6;
-        background-image: -webkit-linear-gradient(rgba(255, 255, 255, .5), rgba(255, 255, 255, 0));
-        background-image: -moz-linear-gradient(rgba(255, 255, 255, .5), rgba(255, 255, 255, 0));
-        background-image: -ms-linear-gradient(rgba(255, 255, 255, .5), rgba(255, 255, 255, 0));
-        background-image: -o-linear-gradient(rgba(255, 255, 255, .5), rgba(255, 255, 255, 0));
-        background-image: linear-gradient(rgba(255, 255, 255, .5), rgba(255, 255, 255, 0));
</del><span class="cx">         border: 1px solid #e1ca82;
</span><span class="cx">         -moz-border-radius: 3px;
</span><span class="cx">         -webkit-border-radius: 3px;
</span><span class="lines">@@ -1939,6 +1941,12 @@
</span><span class="cx">         font-weight: normal;
</span><span class="cx">         margin-top: 3px;
</span><span class="cx">         text-decoration: none;
</span><ins>+        background: #ffeaa6;
+        background-image: -webkit-linear-gradient(rgba(255, 255, 255, .5), rgba(255, 255, 255, 0));
+        background-image: -moz-linear-gradient(rgba(255, 255, 255, .5), rgba(255, 255, 255, 0));
+        background-image: -ms-linear-gradient(rgba(255, 255, 255, .5), rgba(255, 255, 255, 0));
+        background-image: -o-linear-gradient(rgba(255, 255, 255, .5), rgba(255, 255, 255, 0));
+        background-image: linear-gradient(rgba(255, 255, 255, .5), rgba(255, 255, 255, 0));
</ins><span class="cx">         opacity: 0.8;
</span><span class="cx"> }
</span><span class="cx"> div#item-header {
</span></span></pre>
</div>
</div>

</body>
</html>