From 0ba273871204f1fbd9191f16baf5aff721c29643 Mon Sep 17 00:00:00 2001
From: Diana Whitten <hurgleburgler@gmail.com>
Date: Sun, 6 Mar 2016 16:44:51 -0700
Subject: [PATCH] Launch Instance: Metadata should inherit from theme

The new launch instance's select flavor metadata should inherit from
theme.  Also removing the unneccessary variables from
dashboard/_variables.scss

Closes-bug: #1553828
partial-bug: #1551492

Change-Id: I5a6f6950068e266ccb6b5c265a794393d1220414
---
 .../widgets/metadata/display/display.scss     | 27 +++++++------------
 .../static/dashboard/scss/_variables.scss     |  6 -----
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/horizon/static/framework/widgets/metadata/display/display.scss b/horizon/static/framework/widgets/metadata/display/display.scss
index b52191791b..7f9dcbff2c 100644
--- a/horizon/static/framework/widgets/metadata/display/display.scss
+++ b/horizon/static/framework/widgets/metadata/display/display.scss
@@ -1,34 +1,25 @@
 .metadata-display {
   .selector {
     .selector-item {
-      border-top: 1px solid $metadata-display-separator-color;
-      padding: 10px;
-      color: $metadata-display-selector-color;
+      padding: $padding-base-vertical $padding-base-horizontal;
+      color: $link-color;
       cursor: pointer;
-
-      &:first-child {
-        border-top: none;
-      }
-
-      &:hover {
-        color: $metadata-display-selector-hover-color;
-      }
+      border-radius: $nav-pills-border-radius;
 
       &.active {
-        color: $metadata-display-selector-active-color;
+        background: $nav-pills-active-link-hover-bg;
+        color: $nav-pills-active-link-hover-color;
       }
     }
   }
 
+  &,
+  .description,
   .selected-details {
-    padding-top: 9px;
-  }
-
-  .description {
-    margin-top: 20px;
+    padding-top: $padding-base-horizontal;
   }
 
   .auto-width {
     width: auto;
   }
-}
\ No newline at end of file
+}
diff --git a/openstack_dashboard/static/dashboard/scss/_variables.scss b/openstack_dashboard/static/dashboard/scss/_variables.scss
index 7a00c72295..e87ba33617 100644
--- a/openstack_dashboard/static/dashboard/scss/_variables.scss
+++ b/openstack_dashboard/static/dashboard/scss/_variables.scss
@@ -54,12 +54,6 @@ $table-padding: 0.5em !default;
 /* Tooltip */
 $tooltip-padding: 0.3em 0.8em !default;
 
-/* Metadata Display */
-$metadata-display-selector-color: $link-color !default;
-$metadata-display-selector-hover-color: $link-hover-color !default;
-$metadata-display-selector-active-color: #666 !default;
-$metadata-display-separator-color: #ccc !default;
-
 /* Magic Search */
 $magic-search-min-width: 40em !default;
 $magic-search-border-color: #cccccc !default;