fixing merge conflicts

1 files changed, 15 insertions, 5 deletions

diff --git a/static/css/ChatBubble-simple.css b/static/css/ChatBubble-simple.css
index 02ec152..0e3c319 100644
--- a/static/css/ChatBubble-simple.css
+++ b/static/css/ChatBubble-simple.css
@@ -4,6 +4,16 @@ ChatBubble is based on "Even more rounded corners with CSS":
 http://www.schillmania.com/content/projects/even-more-rounded-corners/
 */
 
+#questions{
+position:absolute;
+padding-left:300;
+}
+
+#table{
+position:fixed;
+top:20;
+left:20;
+}
 div.CBmsg {
                   display: table; 
             margin-bottom: 0.5em;
@@ -67,35 +77,35 @@ div.CBiconL > img {
 .CBblueR .CBt,
 .CBblueR .CBb,
 .CBblueR .CBb div {
- background:transparent url(/static/BubbleBlueR800x1600.png) no-repeat top right;
+ background:transparent url(/static/img/BubbleBlueR800x1600.png) no-repeat top right;
 }
 
 .CBpinkL .CBcontent,
 .CBpinkL .CBt,
 .CBpinkL .CBb,
 .CBpinkL .CBb div {
- background:transparent url(/static/BubblePinkL800x1600.png) no-repeat top right;
+ background:transparent url(/static/img/BubblePinkL800x1600.png) no-repeat top right;
 }
 
 .CBpinkR .CBcontent,
 .CBpinkR .CBt,
 .CBpinkR .CBb,
 .CBpinkR .CBb div {
- background:transparent url(/static/BubblePinkR800x1600.png) no-repeat top right;
+ background:transparent url(/static/img/BubblePinkR800x1600.png) no-repeat top right;
 }
 
 .CBltgreyL .CBcontent,
 .CBltgreyL .CBt,
 .CBltgreyL .CBb,
 .CBltgreyL .CBb div {
- background:transparent url(/static/BubbleLtGreyL800x1600.png) no-repeat top right;
+ background:transparent url(/static/img/BubbleLtGreyL800x1600.png) no-repeat top right;
 }
 
 .CBltgreyR .CBcontent,
 .CBltgreyR .CBt,
 .CBltgreyR .CBb,
 .CBltgreyR .CBb div {
- background:transparent url(/static/BubbleLtGreyR800x1600.png) no-repeat top right;
+ background:transparent url(/static/img/BubbleLtGreyR800x1600.png) no-repeat top right;
 }
 
 .CBtxt .CBcontent {