https://www.mediawiki.org/wiki/Special:Code/MediaWiki/103391
Revision: 103391
Author: seanheavey
Date: 2011-11-16 21:35:45 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
trying to get styles to show up.
Modified Paths:
--------------
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
Modified:
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
===================================================================
---
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
2011-11-16 21:28:58 UTC (rev 103390)
+++
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
2011-11-16 21:35:45 UTC (rev 103391)
@@ -414,6 +414,7 @@
width: 100%;
}
/* tooltip styling. by default the element to be styled is .tooltip */
+<<<<<<< .mine
.articleFeedbackv5-panel .title-wrap {
position: relative;
}
@@ -421,18 +422,44 @@
display:none;
position: absolute;
z-index: 15;
+ top: -185px;
+ right: -105px;
+=======
+.articleFeedbackv5-panel .title-wrap {
+ position: relative;
+}
+.articleFeedbackv5-panel .articleFeedbackv5-tooltip {
+ display:none;
+ position: absolute;
+ z-index: 15;
top: -175px;
right: -105px;
+>>>>>>> .r103389
font-size:12px;
width:234px;
color:#000;
}
+<<<<<<< .mine
.articleFeedbackv5-panel .articleFeedbackv5-tooltip .tooltip-top {
background: url(images/bg-tooltip-top.png);
height: 11px;
}
.articleFeedbackv5-panel .articleFeedbackv5-tooltip .tooltip-repeat {
background: url(images/bg-tooltip.png) repeat-y;
+ padding: 0 20px 1px;
+ margin: 0;
+}
+.articleFeedbackv5-panel .articleFeedbackv5-tooltip .tooltip-bottom {
+ background: url(images/bg-tooltip-bottom.png);
+ height: 26px;
+}
+=======
+.articleFeedbackv5-panel .articleFeedbackv5-tooltip .tooltip-top {
+ background: url(images/bg-tooltip-top.png);
+ height: 11px;
+}
+.articleFeedbackv5-panel .articleFeedbackv5-tooltip .tooltip-repeat {
+ background: url(images/bg-tooltip.png) repeat-y;
padding: 0 20px 10px;
margin: 0;
}
@@ -443,6 +470,7 @@
background: url(images/bg-tooltip-bottom.png);
height: 26px;
}
+>>>>>>> .r103389
.articleFeedbackv5-panel {
width: 598px;
background: #f5faff;
@@ -521,7 +549,7 @@
}
.articleFeedbackv5-panel .articleFeedbackv5-disclosure {
float: left;
- width: 235px;
+ width: 280px;
margin: 0 0 0 10px;
}
.articleFeedbackv5-panel .articleFeedbackv5-submit {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
