fixup tooltip styles.

Matt Swanson · Matt Swanson · commit ad907b052901 · 2013-05-12T00:46:35.000-04:00
diff --git a/app/public/css/flat-ui-no-icons.css b/app/public/css/flat-ui-no-icons.css
@@ -1396,47 +1396,6 @@ textarea,
   padding-top: 5px;
   width: 50%; }
 
-.tooltip {
-  font-size: 13px; }
-  .tooltip.in {
-    opacity: 1;
-    filter: alpha(opacity=100);
-    zoom: 1; }
-  .tooltip.top {
-    padding-bottom: 9px; }
-    .tooltip.top .tooltip-arrow {
-      border-top-color: #34495e;
-      border-width: 9px 9px 0;
-      bottom: 0;
-      margin-left: -9px; }
-  .tooltip.right .tooltip-arrow {
-    border-right-color: #34495e;
-    border-width: 9px 9px 9px 0;
-    margin-top: -9px;
-    left: -3px; }
-  .tooltip.bottom {
-    padding-top: 8px; }
-    .tooltip.bottom .tooltip-arrow {
-      border-bottom-color: #34495e;
-      border-width: 0 9px 9px;
-      margin-left: -9px;
-      top: -1px; }
-  .tooltip.left .tooltip-arrow {
-    border-right-color: #34495e;
-    border-width: 9px 9px 9px 0;
-    margin-top: -3px;
-    top: -3px; }
-
-.tooltip-inner {
-  background-color: #34495e;
-  line-height: 18px;
-  padding: 12px 12px;
-  text-align: center;
-  width: 183px;
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
-  border-radius: 6px; }
-
 .palette {
   color: white;
   margin: 0;
diff --git a/app/public/css/styles.css b/app/public/css/styles.css
@@ -148,8 +148,8 @@ li.story.open .story-preview {
   white-space: nowrap;
 }
 
-.story-preview div, .feed-line div {
-  height: 30px;
+.tooltip {
+  white-space: pre-wrap;
 }
 
 .blog-title, .feed-title {
@@ -250,18 +250,13 @@ p.story-details {
   color: #7F8281;
 }
 
-li.feed .status {
-  margin-right: 5px;
-  color: #ddd;
-}
-
 li.feed .feed-line {
   cursor: default;
 }
 
 li.feed .feed-title {
   display: inline-block;
-  margin-left: 5px;
+  margin-left: 0px;
 }
 
 li.feed .feed-title a {
@@ -279,6 +274,12 @@ li.feed .feed-title-container {
   white-space: nowrap;
 }
 
+li.feed .status {
+  padding: 8px;
+  width: 14px;
+  color: #ddd;
+}
+
 li.feed .status.green {
   color: #2ECC71;
 }
diff --git a/app/views/feeds/index.erb b/app/views/feeds/index.erb
@@ -18,6 +18,6 @@
 
 <script type="text/javascript">
   $(document).ready(function () {
-    $(".tooltip-js").tooltip();
+    $(".status").tooltip();
   });
 </script>
diff --git a/app/views/partials/_feed.erb b/app/views/partials/_feed.erb
@@ -2,7 +2,7 @@
   <div class="row-fluid feed-line">
     <div class="span7 feed-title-container">
       <p class="feed-title">
-        <i class="icon-circle status <%= feed.status_bubble %> tooltip-js" title="<%= t("partials.feed.status_bubble.#{feed.status_bubble}") %>" data-placement="left"></i>
+        <i class="icon-circle status <%= feed.status_bubble %>" data-toggle="tooltip" title="<%= t("partials.feed.status_bubble.#{feed.status_bubble}") %>" data-placement="left"></i>
         <a href="<%= feed.url %>"><%= feed.name %></a>
       </p>
     </div>

Original file line number	Diff line number	Diff line change
`@@ -148,8 +148,8 @@ li.story.open .story-preview {`
`148`	`148`	`white-space: nowrap;`
`149`	`149`	`}`
`150`	`150`
`151`		`-.story-preview div, .feed-line div {`
`152`		`- height: 30px;`
	`151`	`+.tooltip {`
	`152`	`+ white-space: pre-wrap;`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`.blog-title, .feed-title {`
`@@ -250,18 +250,13 @@ p.story-details {`
`250`	`250`	`color: #7F8281;`
`251`	`251`	`}`
`252`	`252`
`253`		`-li.feed .status {`
`254`		`- margin-right: 5px;`
`255`		`- color: #ddd;`
`256`		`-}`
`257`		`-`
`258`	`253`	`li.feed .feed-line {`
`259`	`254`	`cursor: default;`
`260`	`255`	`}`
`261`	`256`
`262`	`257`	`li.feed .feed-title {`
`263`	`258`	`display: inline-block;`
`264`		`- margin-left: 5px;`
	`259`	`+ margin-left: 0px;`
`265`	`260`	`}`
`266`	`261`
`267`	`262`	`li.feed .feed-title a {`
`@@ -279,6 +274,12 @@ li.feed .feed-title-container {`
`279`	`274`	`white-space: nowrap;`
`280`	`275`	`}`
`281`	`276`
	`277`	`+li.feed .status {`
	`278`	`+ padding: 8px;`
	`279`	`+ width: 14px;`
	`280`	`+ color: #ddd;`
	`281`	`+}`
	`282`	`+`
`282`	`283`	`li.feed .status.green {`
`283`	`284`	`color: #2ECC71;`
`284`	`285`	`}`