Fix for pie chart on dashboard page.

daviddavis · Nov 16, 2011 · f8debfd · f8debfd
1 parent b50d1c4
commit f8debfd
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/src/app/stylesheets/katello.scss b/src/app/stylesheets/katello.scss
@@ -1339,16 +1339,4 @@ footer {
 
 /* classes to highlight or make "standout" inputs that require action from the user */
 .highlight_input { border: 3px solid $kselected_color; }
-.highlight_input_text { color: $kselected_color; font-weight: 600; font-size: 110%; padding-left: 10px;}
-
-
-.ui-widget-header {
-    font-family: $headlinefont;
-    border: 0 none;
-}
-.ui-widget-content {
-    border: 0 none;
-    table {
-         border: 1px solid $stroke_color !important;
-    }
-}
+.highlight_input_text { color: $kselected_color; font-weight: 600; font-size: 110%; padding-left: 10px;}
diff --git a/src/app/stylesheets/sections/contents.scss b/src/app/stylesheets/sections/contents.scss
@@ -426,4 +426,8 @@
 
 #upload_button {
     margin-top: 14px;
+}
+
+.ui-tabs-panel {
+    min-height: 300px;
 }
diff --git a/src/app/stylesheets/sections/dashboard.scss b/src/app/stylesheets/sections/dashboard.scss
@@ -63,7 +63,7 @@
         display: inline;
         font-size: 115%;
       }
-      .left {
+      .left_side {
         width: 300px;
         display: inline-block;
 
@@ -79,12 +79,13 @@
         .yellow_icon {background: $status_icons_yellow_small;}
         .green_icon {background: $status_icons_green_small;}
       }
-      .right {
+      .right_side {
         width: 150px;
         display: inline-block;
         position: relative;
         margin-right: 10px;
         margin-top: -20px;
+        float: right;
         #overlay {
             background: url("../../../images/chart_overlay.png") no-repeat;
             height: 130px;

diff --git a/src/app/stylesheets/sections/tabs.scss b/src/app/stylesheets/sections/tabs.scss
@@ -5,6 +5,18 @@
 @import "colors";
 @import "sprites";
 
+/* override some of the jQuery UI stuff */
+.ui-widget-header {
+    font-family: $headlinefont;
+    border: 0 none;
+}
+.ui-widget-content {
+    border: 0 none;
+    table {
+         border: 1px solid $stroke_color !important;
+    }
+}
+
 .ui-tabs {
   padding: 0px;
   .ui-tabs-nav {
@@ -16,6 +28,7 @@
       margin: 0px;
       width: 100%;
     }
+    border: 1px solid $border_color;
   }
   .ui-tabs-selected a {
     cursor: pointer;

diff --git a/src/app/views/dashboard/_subscriptions.haml b/src/app/views/dashboard/_subscriptions.haml
@@ -7,7 +7,7 @@
                           {data:2978, color:"#9ccc50"}]; //green
 
 #dashboard_subscriptions.big_widget
-  .left
+  .left_side
     .line
     .stats
       %hr
@@ -41,6 +41,6 @@
           #{_("Total Systems")}
 
 
-  .right
+  .right_side
     #overlay
     #sub_graph