Эх сурвалжийг харах

HUE-7368 [frontend] Upgrade the Cloudera UI css to the latest version

Enrico Berti 8 жил өмнө
parent
commit
0d997664ae

+ 183 - 67
desktop/core/src/desktop/static/desktop/ext/css/cui/cui.css

@@ -143,17 +143,11 @@
   margin-bottom: 0;
 }
 .cui-add-remove-list .add-remove-controls {
-  display: inline-block;
-  min-width: 64px;
-  vertical-align: top;
-}
-.cui-add-remove-list .add-remove-controls .cui-btn-circle {
-  float: left;
-  margin-top: 4px;
-  margin-right: 8px;
-}
-.cui-add-remove-list .add-remove-controls .cui-btn-circle:last-child {
-  margin-right: 0;
+  padding-left: 0;
+  color: #0B7FAD;
+  font-size: 20px;
+  width: 64px;
+  line-height: 32px;
 }
 .cui-btn-circle {
   border-radius: 50%;
@@ -202,13 +196,15 @@
   box-shadow: 0 -6px #D0021B;
 }
 .cui-message {
+  position: relative;
   margin-bottom: 12px;
   background-color: #FFFFFF;
   border: 1px solid #DCDCDC;
 }
 .cui-message .close {
-  top: -3px;
-  right: -12px;
+  position: absolute;
+  top: 9px;
+  right: 9px;
 }
 .cui-message > :first-child {
   margin-top: 0;
@@ -220,47 +216,68 @@
 .cui-message-info,
 .cui-message-warning,
 .cui-message-danger {
-  border-left-width: 0;
-  position: relative;
-  left: 6px;
-  padding: 19px 23px 19px 17px;
+  padding: 19px 28px 19px 43px;
 }
-.cui-message-success {
-  box-shadow: -6px 0 #69AC13;
+.cui-message-success:before,
+.cui-message-info:before,
+.cui-message-warning:before,
+.cui-message-danger:before {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  position: absolute;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  top: -1px;
+  left: 0;
+  bottom: -1px;
+  width: 24px;
+  color: #FFFFFF;
 }
-.cui-message-info {
-  box-shadow: -6px 0 #29A7DE;
+.cui-message-success:before {
+  content: "\f00c";
+  background-color: #69AC13;
 }
-.cui-message-warning {
-  box-shadow: -6px 0 #E99F01;
+.cui-message-info:before {
+  content: "\f129";
+  background-color: #29A7DE;
 }
-.cui-message-danger {
-  box-shadow: -6px 0 #D0021B;
+.cui-message-warning:before {
+  content: "\f12a";
+  background-color: #E99F01;
+}
+.cui-message-danger:before {
+  content: "\f12a";
+  background-color: #D0021B;
 }
 cui-collapsible .collapsible-section-header {
   position: relative;
 }
 .cui-chevron {
-  font-size: inherit;
-  line-height: 1;
-  margin-right: 12px;
-  width: 1em;
-  height: 1em;
   cursor: pointer;
-}
-.cui-chevron::before {
-  content: "";
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
   display: inline-block;
-  width: 0.5em;
-  height: 0.5em;
-  border: 0.15em solid #29A7DE;
-  border-left: none;
-  border-bottom: none;
-  transition: transform 0.3s ease;
-  transform: translate(0.125em, -0.125em) rotate(0.125turn);
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+.cui-chevron:before {
+  content: "\f054";
+  color: #29A7DE;
+}
+.cui-chevron-white:before {
+  color: #FFFFFF;
 }
 .cui-chevron-down:before {
-  transform: translate(0.24em, -0.24em) rotate(0.375turn);
+  content: "\f078";
 }
 .cui-copy-to-clipboard + .copyMessage {
   display: inline-block;
@@ -276,17 +293,31 @@ textarea + .cui-copy-to-clipboard {
   margin-left: 8px;
   margin-top: -4px;
 }
+.input-group-btn > cui-copy-to-clipboard > button {
+  border-left: 0;
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+textarea + cui-copy-to-clipboard {
+  position: absolute;
+  right: 12px;
+  top: 0px;
+}
+textarea + cui-copy-to-clipboard button.btn {
+  border-radius: 0;
+  border-top-right-radius: 4px;
+}
 .cui-dashboard {
   margin-left: 24px;
   margin-right: 24px;
   margin-bottom: 24px;
   margin-top: 24px;
 }
-cui-file-text-chooser .file-controls {
+.cui-file-text-chooser .file-controls {
   position: relative;
   /* hack to get File inputs to be hidden, but clickable */
 }
-cui-file-text-chooser .file-controls input[type="file"] {
+.cui-file-text-chooser .file-controls input[type="file"] {
   height: 100%;
   width: 100%;
   cursor: pointer;
@@ -301,7 +332,7 @@ cui-file-text-chooser .file-controls input[type="file"] {
   -khtml-opacity: 0.0;
   -moz-opacity: 0.0;
 }
-cui-file-text-chooser .file-controls input[type="text"] {
+.cui-file-text-chooser .file-controls input[type="text"] {
   margin-right: 8px;
 }
 .cui-flex {
@@ -380,7 +411,6 @@ cui-file-text-chooser .file-controls input[type="text"] {
   outline: none;
 }
 .cui-help-icon {
-  cursor: pointer;
   font-weight: bold;
   border-radius: 50%;
   padding: 0;
@@ -391,6 +421,32 @@ label + .cui-help-icon,
 span + .cui-help-icon {
   margin-left: 12px;
 }
+.cui-help-panel {
+  margin-top: 32px;
+  border: solid 1px #DCDCDC;
+  border-radius: 2px;
+  box-shadow: 0 1px 2px 0 #E7E7E7;
+}
+.cui-help-panel .collapsible-section-header {
+  border-bottom: solid 1px #DCDCDC;
+  border-top: solid 1px #DCDCDC;
+  border-radius: 2px 2px 0 0;
+  padding: 8px 16px;
+  display: block;
+}
+.cui-help-panel .collapsible-section-header.collapsed {
+  border-bottom-color: transparent;
+}
+.cui-help-panel .cui-help-panel-section {
+  background-color: #F8F8F8;
+}
+.cui-help-panel .cui-help-panel-section:first-child .collapsible-section-header {
+  border-top: none;
+}
+.cui-help-panel .cui-help-panel-section .cui-help-panel-content {
+  background-color: #FFFFFF;
+  padding: 16px;
+}
 /* Copyright (c) 2017 Cloudera, Inc. All rights reserved. */
 .cui-name-value-list {
   list-style: none;
@@ -491,6 +547,8 @@ span + .cui-help-icon {
   margin-top: -12px;
 }
 .cui-pagination > .pagination {
+  padding-left: 0;
+  list-style: none;
   margin: 0;
 }
 .cui-paper {
@@ -514,10 +572,21 @@ span + .cui-help-icon {
 .cui-paper.cui-paper--attach-top {
   margin-top: 0;
 }
+.popover {
+  word-wrap: break-word;
+}
 .popover.cui-popover-lg {
   max-width: 400px;
   width: 400px;
 }
+.cui-popover-modal .cui-popover-modal-footer {
+  padding: 12px;
+  background-color: #F1EFEF;
+  height: 56px;
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+  margin: 0px -15px -10px -15px;
+}
 .cui-spinner {
   /* the 'strokes' of the arc */
   border-style: solid;
@@ -649,12 +718,41 @@ span + .cui-help-icon {
 }
 .cui-system-feedback {
   position: fixed;
-  top: 48px;
+  top: 72px;
   right: 24px;
   z-index: 200;
 }
 .cui-system-feedback .cui-message {
   width: 424px;
+  box-shadow: 1px 1px 5px 0px rgba(0, 0, 0, 0.5);
+  margin-bottom: 20px;
+  opacity: 1;
+  -webkit-transform: translate(0, 0);
+  -ms-transform: translate(0, 0);
+  -o-transform: translate(0, 0);
+  transform: translate(0, 0);
+  transition: all .5s ease;
+}
+.cui-system-feedback .cui-message.invisible {
+  opacity: 0;
+}
+.cui-system-feedback .cui-message.offset {
+  -webkit-transform: translate(100%, 0);
+  -ms-transform: translate(100%, 0);
+  -o-transform: translate(100%, 0);
+  transform: translate(100%, 0);
+}
+.cui-system-feedback .cui-message-success {
+  border: 1px solid #69AC13;
+}
+.cui-system-feedback .cui-message-info {
+  border: 1px solid #29A7DE;
+}
+.cui-system-feedback .cui-message-warning {
+  border: 1px solid #E99F01;
+}
+.cui-system-feedback .cui-message-danger {
+  border: 1px solid #D0021B;
 }
 table.cui-table-scrollable {
   border-top: 0;
@@ -680,15 +778,15 @@ th.cui-sortable {
   font-weight: bold;
   cursor: pointer;
 }
-.cui-sortable.cui-sort-up,
-th.cui-sortable.cui-sort-up,
-.cui-sortable.cui-sort-down,
-th.cui-sortable.cui-sort-down {
-  background-color: #DCDCDC;
+th.cui-sortable:hover,
+th.cui-sort-up,
+th.cui-sort-down {
+  color: #424242;
 }
 /* This class goes on an inline-block element to the right of the sorting header text */
 .cui-sort-icon {
-  color: #DCDCDC;
+  padding-left: 4px;
+  color: #C8C8C8;
   display: inline-block;
   font: normal normal normal 14px/1 FontAwesome;
   font-size: inherit;
@@ -707,10 +805,14 @@ th.cui-sortable.cui-sort-down {
   content: "\f0dd";
   margin-left: -8px;
 }
-/* These classes highlight either the up arrow or the down arrow */
+.cui-sortable:not(.cui-sort-up):hover .cui-sort-icon:before,
+.cui-sortable.cui-sort-up:hover .cui-sort-icon:after,
+.cui-sortable.cui-sort-down:hover .cui-sort-icon:before {
+  color: #A0A0A0;
+}
 .cui-sort-up .cui-sort-icon:before,
 .cui-sort-down .cui-sort-icon:after {
-  color: #186485;
+  color: #0B7FAD;
 }
 .cui-title-bar {
   padding: 0 24px;
@@ -726,8 +828,19 @@ th.cui-sortable.cui-sort-down {
   bottom: 100px;
   right: -28px;
   transform: rotate(-90deg);
+  -ms-transform: rotate(-90deg);
   z-index: 100;
 }
+cui-wizard-form,
+cui-wizard {
+  display: flex;
+  flex-direction: column;
+}
+.cui-wizard-outer {
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+}
 .cui-wizard-page {
   flex: 1;
 }
@@ -735,19 +848,19 @@ th.cui-sortable.cui-sort-down {
 .cui-wizard-footer {
   background-color: #FFFFFF;
 }
-.cui-wizard,
-.cui-wizard-footer-button-container {
-  margin-left: auto;
-  margin-right: auto;
-  width: auto;
-  max-width: 1440px;
+@media (min-width: 1440px) {
+  .cui-wizard {
+    width: 1440px;
+    margin-left: auto;
+    margin-right: auto;
+  }
 }
 .cui-wizard {
   display: flex;
   height: 100%;
+  flex: 1;
 }
 .cui-wizard-container {
-  margin-bottom: 48px;
   border-left: solid 1px #DCDCDC;
   border-right: solid 1px #DCDCDC;
   display: flex;
@@ -809,13 +922,16 @@ th.cui-sortable.cui-sort-down {
 }
 .cui-wizard-footer {
   border-top: solid 1px #DCDCDC;
-  position: fixed;
-  bottom: 0;
-  z-index: 3;
-  max-width: 100%;
   padding: 11px 24px 12px 24px;
-  left: 0;
-  right: 0;
+}
+@media (min-width: 1464px) {
+  .cui-wizard-footer .cui-wizard-footer-button-container {
+    width: 1440px;
+    margin-right: auto;
+    margin-left: auto;
+    padding-left: 0px;
+    padding-right: 0px;
+  }
 }
 .cui-wizard-footer .btn.prev {
   margin-right: 8px;

+ 22 - 18
desktop/core/src/desktop/static/desktop/less/cui/colors.less

@@ -1,27 +1,29 @@
-/**
- * Licensed to Cloudera, Inc. under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  Cloudera, Inc. licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/*
+ Licensed to Cloudera, Inc. under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  Cloudera, Inc. licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
 @cui-base-color-list:
   gray, ~"blue-gray", blue, steel, teal, green, lime, yellow, orange, red, pink, purple,
   ~"purple-gray", ~"green-gray";
 
 @cui-service-color-list:
   ~"hive-color", ~"hdfs-color", ~"hbase-color", ~"hue-color", ~"mapreduce-color", ~"zookeeper-color", ~"oozie-color",
-  ~"flume-color", ~"impala-color", ~"sqoop-color", ~"solr-color", ~"spark-color", ~"pig-color", ~"yarn-color";
+  ~"flume-color", ~"impala-color", ~"sqoop-color", ~"solr-color", ~"spark-color", ~"pig-color", ~"yarn-color",
+  ~"s3-color", ~"api-color";
 
 
 // Base colors ----------------------------------------------
@@ -222,6 +224,8 @@
 @cui-spark-color:                 @cui-orange-900;
 @cui-pig-color:                   @cui-purple-900;
 @cui-yarn-color:                  @cui-yellow-900;
+@cui-s3-color:                    @cui-orange-500;
+@cui-api-color:                   @cui-gray-700;
 
 
 

+ 38 - 270
desktop/core/src/desktop/static/desktop/less/cui/extra-variables.less

@@ -15,29 +15,8 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 */
-@import (reference) "colors.less";
 
-@gray-base:              @cui-black;
-@gray-darker:            @cui-gray-900;
-@gray-dark:              @cui-gray-800;
-@gray:                   @cui-gray-700;
-@gray-light:             @cui-gray-600;
-@gray-lighter:           @cui-gray-050;
-
-@brand-primary:         @cui-blue-700;
-@brand-success:         @cui-lime-500;
-@brand-info:            @cui-blue-500;
-@brand-warning:         @cui-orange-500;
-@brand-danger:          @cui-red-500;
-
-@font-size-h1: 24px;
-@font-size-h2: 18px;
-@font-size-h3: 16px;
-@font-size-h4: 16px;
-@font-size-h5: 16px;
-@font-size-h6: 14px;
-@font-size-base: 14px;
-@font-size-small: 12px;
+@import (reference) "./variables.less";
 
 @font-weight-h1: normal;
 @font-weight-h2: 400;
@@ -53,148 +32,17 @@
 @line-height-h5: 20px;
 @line-height-h6: 20px;
 
-@breadcrumb-padding-vertical: 0;
-@breadcrumb-padding-horizontal: 24px;
-@breadcrumb-bg:                 transparent;
-@breadcrumb-color:              @cui-gray-400;
-@breadcrumb-separator:          "/";
-
-// The default border color.
-@cui-default-border-color: @cui-gray-300;
-
-// The default background color for content area.
-@cui-default-bg-color: @cui-white;
-
-// The default foreground color when used on an inverse element.
-@cui-default-inverse-color: @cui-default-bg-color;
-
-// Scaffolding
-@text-color: @cui-gray-800;
-@pre-color: @text-color;
-
-// The background color of the body element.
-@body-bg: @cui-blue-gray-050;
-
-// The color of any links.
-@link-color: @cui-blue-700;
-@link-hover-color: @cui-blue-500;
-
-// Many of the paddings/margins are defined based on this variable
-@page-padding-base: 24px;
-@page-header-border-color: @cui-default-border-color;
-
-// Grid gutter
-@grid-gutter-width:         24px;
-
-@state-success-text:             @cui-lime-800;
-@state-success-bg:               @cui-lime-010;
-@state-success-border:           @state-success-bg;
-
-@state-info-text:                @cui-blue-700;
-@state-info-bg:                  @cui-blue-010;
-@state-info-border:              @state-info-bg;
-
-@state-warning-text:             @cui-orange-900;
-@state-warning-bg:               @cui-yellow-010;
-@state-warning-border:           @state-warning-bg;
-
-@state-danger-text:              @cui-red-700;
-@state-danger-bg:                @cui-pink-010;
-@state-danger-border:            @state-danger-bg;
-
-@alert-padding:               @page-padding-base;
-@alert-border-radius:         0;
-@alert-link-font-weight:      normal;
-
-@panel-heading-padding:    0 23px    0 23px;
-@panel-body-padding:    15px 23px 15px 23px;
-@panel-footer-padding:   7px 23px 12px 23px;
-
-@panel-bg:                    @cui-default-bg-color;
-@panel-footer-bg:             @cui-default-bg-color;
-@panel-inner-border:          transparent;
-@panel-default-border:        @cui-default-border-color;
-@panel-default-heading-bg:    transparent;
-@panel-default-text:          @text-color;
-
-@navbar-height:                    48px;
-@navbar-margin-bottom:             0;
-@navbar-border-radius:             0;
-
-@navbar-default-color:             @cui-gray-700;
-@navbar-default-bg:                @cui-default-bg-color;
-@navbar-default-border:            @cui-default-border-color;
-
-// Navbar links
-@navbar-default-link-color:                @cui-gray-700;
-@navbar-default-link-hover-color:          @cui-gray-700;
-@navbar-default-link-hover-bg:             @cui-gray-100;
-@navbar-default-link-active-color:         @text-color;
-@navbar-default-link-active-bg:            @cui-purple-gray-050;
-@navbar-default-link-disabled-color:       @cui-gray-400;
-@navbar-default-link-disabled-bg:          transparent;
-
-@navbar-inverse-color:             @cui-default-inverse-color;
-@navbar-inverse-bg:                @cui-blue-gray-900;
-@navbar-inverse-border:            transparent;
-
-@navbar-inverse-link-color:        @cui-default-inverse-color;
-@navbar-inverse-link-hover-color:  @cui-default-inverse-color;
-@navbar-inverse-link-hover-bg:     @cui-gray-800;
-@navbar-inverse-link-active-color: @cui-default-inverse-color;
-@navbar-inverse-link-active-bg:    @cui-gray-800;
-
-// Inverted navbar brand label
-@navbar-inverse-brand-color:       @navbar-inverse-link-color;
-@navbar-inverse-brand-hover-color: @cui-default-inverse-color;
-@navbar-inverse-brand-hover-bg:    transparent;
-
-// Typography
-@headings-color: @text-color;
-@font-family-monospace:  Roboto Mono, Menlo, Monaco, Consolas, "Courier New", monospace;
-@font-family-sans-serif: Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;
-
-// Nav tabs
-@nav-tabs-active-link-hover-color: @text-color;
-@nav-tabs-link-hover-border-color: @cui-default-border-color;
-@nav-tabs-active-link-hover-bg: @cui-default-bg-color;
-@nav-tabs-justified-active-link-border-color: @cui-default-bg-color;
-@thumbnail-bg:                @cui-default-bg-color;
+@state-unknown-bg:               @cui-gray-050;
+@state-unknown-text:             @text-muted;
 
-// Table
-@table-cell-padding:            7px 8px 8px 8px;
-@table-condensed-cell-padding:  3px 8px 4px 8px;
-@table-border-color: @cui-default-border-color;
-@table-bg: @cui-default-bg-color;
-@table-bg-accent: @cui-default-bg-color;
-@table-bg-hover: @cui-gray-050;
-
-
-// Replace References to Bootstrap 3 Variables
-@border-radius-base: 4px;
-
-// This should be (input-height-base - line-height-computed) / 2 - 1 (border);
-@padding-base-vertical:     5px;
-@padding-base-horizontal:   12px;
-@padding-large-vertical:    12px;
-@padding-large-horizontal:  16px;
-@padding-small-vertical:    5px;
-@padding-small-horizontal:  10px;
-@padding-xs-vertical:       1px;
-@padding-xs-horizontal:     5px;
-
-// === Buttons : Sizing === //
-
-// Border Radius
-@btn-border-radius-base: @border-radius-base; // 4px
-@btn-border-radius-large: @btn-border-radius-base;
-@btn-border-radius-small: @btn-border-radius-base;
-// Note: btn-xs uses the same radius as btn-sm
+@state-progress-bg:              @cui-gray-050;
+@state-progress-text:            @cui-blue;
 
+// === Buttons : Sizes === //
 // Button Height
-@cui-btn-height-lg: 48px;
-@cui-btn-height-md: 32px;
-@cui-btn-height-sm: 28px;
+@cui-btn-height-lg: @input-height-large;
+@cui-btn-height-md: @input-height-base;
+@cui-btn-height-sm: @input-height-small;
 @cui-btn-height-xs: 24px;
 
 // Button Line Height (Computed)
@@ -220,76 +68,37 @@
 
 // === Buttons : Colors === //
 
-@btn-default-color:  @cui-blue-700;
-@btn-default-bg:     @cui-default-bg-color;
-@btn-default-border: @cui-gray-400;
-
-@btn-primary-color:  @cui-default-inverse-color;
-@btn-primary-bg:     @link-color;
-@btn-primary-border: @btn-primary-bg;
-
-// Reset Alert Colors
-// @btn-success-color:  @btn-primary-color;
-// @btn-warning-color:  @btn-primary-color;
-// @btn-danger-color:   @btn-primary-color;
-// @btn-info-color:     @btn-primary-color;
+// button colors go darker when :hover, :focus, and :active
+@cui-btn-hover-color:     @cui-blue-900;
+@cui-btn-hover-bg:        @cui-gray-050;
+@cui-btn-hover-border:    @cui-gray-400;
+@cui-btn-hover-shadow:    0 1px 2px 0 @cui-gray-100;
 
-// @btn-success-bg:     @btn-primary-bg;
-// @btn-warning-bg:     @btn-primary-bg;
-// @btn-danger-bg:      @btn-primary-bg;
-// @btn-info-bg:        @btn-primary-bg;
+@cui-btn-active-color:    @cui-blue-900;
+@cui-btn-active-bg:       @cui-gray-050;
+@cui-btn-active-border:   @cui-gray-400;
+@cui-btn-active-shadow:   inset 0 2px 4px 0 @cui-gray-400;
 
-// @btn-success-border: @btn-primary-border;
-// @btn-warning-border: @btn-primary-border;
-// @btn-danger-border:  @btn-primary-border;
-// @btn-info-border:    @btn-primary-border;
+@cui-btn-disabled-color:  @cui-gray-600;
+@cui-btn-disabled-bg:     @cui-default-bg-color;
+@cui-btn-disabled-border: @cui-gray-300;
 
-// === Buttons : Pseudo-Classes === //
+@cui-btn-primary-font-weight:     500;
+@cui-btn-primary-hover-color:     @cui-default-inverse-color;
+@cui-btn-primary-hover-bg:        @cui-blue-800;
+@cui-btn-primary-hover-border:    @cui-blue-900;
+@cui-btn-primary-hover-shadow:    0 1px 2px 0 @cui-gray-500;
 
-@cui-btn-hover-color: @link-hover-color;
-@cui-btn-hover-bg: @btn-default-bg;
-@cui-btn-hover-border: @link-hover-color;
+@cui-btn-primary-active-color:    @cui-default-inverse-color;
+@cui-btn-primary-active-bg:       @cui-blue-800;
+@cui-btn-primary-active-border:   @cui-blue-900;
+@cui-btn-primary-active-shadow:   inset 0 2px 4px 0 @cui-blue-gray-900;
 
-@cui-btn-primary-hover-color: @cui-default-inverse-color;
-@cui-btn-primary-hover-bg: @link-hover-color;
-@cui-btn-primary-hover-border: @link-hover-color;
+@cui-btn-primary-disabled-color:  @cui-gray-600;
+@cui-btn-primary-disabled-bg:     @cui-gray-200;
+@cui-btn-primary-disabled-border: @cui-gray-400;
 
-@cui-btn-disabled-font-color:           @cui-gray-600;
-@cui-btn-disabled-default-bg-color:     @cui-default-bg-color;
-@cui-btn-disabled-primary-bg-color:     @cui-gray-200;
-@cui-btn-disabled-default-border-color: @cui-default-border-color;
-@cui-btn-disabled-primary-border-color: @cui-btn-disabled-primary-bg-color;
 
-@cui-btn-active-shadow: inset 0 0 2px rgba(0,0,0,0.5);
-
-// Dropdown Highlight
-@dropdown-link-hover-color: @cui-default-inverse-color;
-@dropdown-link-hover-bg:    @cui-btn-hover-color;
-
-// Pagination
-@pagination-bg: transparent;
-@pagination-border: transparent;
-@pagination-active-color: @cui-black;
-@pagination-active-bg: transparent;
-@pagination-active-border: transparent;
-
-// Border radius
-@border-radius-base: 4px;
-@border-radius-large: 4px;
-@border-radius-small: 4px;
-
-@navbar-border-radius: 0;
-@pager-border-radius: 0;
-@alert-border-radius: 0;
-@progress-border-radius: 0;
-@list-group-border-radius: 0;
-@panel-border-radius: 0;
-@thumbnail-border-radius: 0;
-@badge-border-radius: 0;
-
-// === Modals : Backdrop === //
-@modal-backdrop-bg:      @cui-black;
-@modal-backdrop-opacity: .68;
 
 // === Modals : Shape and Position === //
 @cui-modal-clearing: 30px; // For calculating max-height
@@ -298,9 +107,7 @@
 @cui-modal-box-shadow:    0 0 3px 0 rgba(0, 0, 0, 0.11);
 
 // === Modals : Spacing === //
-@cui-modal-header-height: 60px;
-@modal-title-line-height: @cui-modal-header-height;
-@modal-inner-padding: 24px;
+@cui-modal-header-height: @modal-title-line-height;
 // Cloudera UI does not set modal title font size;
 // Use markups to specific font size, e.g. <h2>Title</h2>
 @cui-modal-height-ratio: 0.8;
@@ -313,53 +120,14 @@
 @cui-modal-header-bg:   @cui-purple-gray-050;
 @cui-modal-footer-bg:   @cui-default-bg-color;
 
-@modal-header-border-color:  @cui-default-border-color; // border-bottom only
-@modal-content-border-color: @cui-gray-800;
-@modal-footer-border-color:  @cui-default-border-color;
-@modal-content-bg:           @cui-default-bg-color;
-
 // === Modals : Sizing === //
 @cui-modal-width-md: 580px;
 @cui-modal-width-lg: 900px;
 @cui-modal-width-xl: 90%;
 
-// Wells
-@well-bg: @cui-gray-050;
-@well-border: @cui-default-border-color;
 
-// popover
-@popover-title-bg: @cui-purple-gray-050;
-@popover-border-color: @cui-default-border-color;
+// For right aligned horizontal dl, we want a slightly wider.
+@dl-horizontal-right-offset: 176px;
 
-// Forms and Inputs
-
-// `<input>` background color
-@input-bg:                       @cui-default-bg-color;
-
-// `<input disabled>` background color
-@input-bg-disabled:              @cui-gray-050;
-
-// Text color for `<input>`s
-@input-color:                    @text-color;
-
-// `<input>` border color
-@input-border:                   @cui-gray-400;
-
-// Placeholder text color
-@input-color-placeholder:        @cui-gray-500;
-
-// Regular input height, these should be the same as regular buttons.
-@input-height-base: @cui-btn-height-md;
-
-// Large input height, these should be the same as the large buttons.
-@input-height-large: @cui-btn-height-lg;
-
-// Small input height, these should be the same as the small buttons.
-@input-height-small: @cui-btn-height-sm;
-
-@form-group-margin-bottom: 16px;
-
-@input-group-addon-bg:           @well-bg;
-
-// Border color for textual input addons
-@input-group-addon-border-color: @input-border;
+// Many of the paddings/margins are defined based on this variable
+@page-padding-base: @grid-gutter-width;

+ 17 - 1
desktop/core/src/desktop/static/desktop/less/cui/sidebar.less

@@ -1,4 +1,20 @@
-
+/*
+ Licensed to Cloudera, Inc. under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  Cloudera, Inc. licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
 
 @import (reference) "extra-variables.less";
 @import (reference) "../hue-mixins.less";

+ 895 - 0
desktop/core/src/desktop/static/desktop/less/cui/variables.less

@@ -0,0 +1,895 @@
+/*
+ Licensed to Cloudera, Inc. under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  Cloudera, Inc. licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+//
+// Variables
+// --------------------------------------------------
+@import (reference) "./colors.less";
+
+// The default border color.
+@cui-default-border-color:  @cui-gray-300;
+
+// The default background color for content area.
+@cui-default-bg-color:      @cui-white;
+
+// The default foreground color when used on an inverse element.
+@cui-default-inverse-color: @cui-default-bg-color;
+
+
+//== Colors
+//
+//## Gray and brand colors for use across Bootstrap.
+
+@gray-base:               @cui-black;
+@gray-darker:             @cui-gray-900;
+@gray-dark:               @cui-gray-800;
+@gray:                    @cui-gray-700;
+@gray-light:              @cui-gray-600;
+@gray-lighter:            @cui-gray-050;
+
+@brand-primary:           @cui-blue-700;
+@brand-success:           @cui-lime-500;
+@brand-info:              @cui-blue-500;
+@brand-warning:           @cui-orange-500;
+@brand-danger:            @cui-red-500;
+
+//== Scaffolding
+//
+//## Settings for some of the most global styles.
+
+//** Background color for `<body>`.
+@body-bg:               @cui-blue-gray-050;
+//** Global text color on `<body>`.
+@text-color:            @cui-gray-800;
+
+//** Global textual link color.
+@link-color:            @brand-primary;
+//** Link hover color set via explicit color
+@link-hover-color:      @cui-blue-900;
+//** Link hover decoration.
+@link-hover-decoration: underline;
+
+
+//== Typography
+//
+//## Font, line-height, and color for body text, headings, and more.
+
+@font-family-sans-serif:  Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;
+@font-family-serif:       Georgia, "Times New Roman", Times, serif;
+//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
+@font-family-monospace:   Roboto Mono, Menlo, Monaco, Consolas, "Courier New", monospace;
+@font-family-base:        @font-family-sans-serif;
+
+@font-size-base:          14px;
+@font-size-large:         ceil((@font-size-base * 1.25)); // ~18px
+@font-size-small:         12px;
+
+@font-size-h1:            24px;
+@font-size-h2:            18px;
+@font-size-h3:            16px;
+@font-size-h4:            16px;
+@font-size-h5:            16px;
+@font-size-h6:            14px;
+
+//** Unit-less `line-height` for use in components like buttons.
+@line-height-base:        1.428571429; // 20/14
+//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+@line-height-computed:    floor((@font-size-base * @line-height-base)); // ~20px
+
+//** By default, this inherits from the `<body>`.
+@headings-font-family:    inherit;
+@headings-font-weight:    500;
+@headings-line-height:    1.1;
+@headings-color:          @text-color;
+
+
+//== Iconography
+//
+//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
+
+//** Load fonts from this directory.
+@icon-font-path:          "../fonts/";
+//** File name for all font files.
+@icon-font-name:          "glyphicons-halflings-regular";
+//** Element ID within SVG icon file.
+@icon-font-svg-id:        "glyphicons_halflingsregular";
+
+//== Components
+//
+//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
+
+// This should be (input-height-base - line-height-computed) / 2 - 1 (border);
+@padding-base-vertical:     5px;
+@padding-base-horizontal:   12px;
+
+@padding-large-vertical:    12px;
+@padding-large-horizontal:  16px;
+
+@padding-small-vertical:    5px;
+@padding-small-horizontal:  10px;
+
+@padding-xs-vertical:       1px;
+@padding-xs-horizontal:     5px;
+
+@line-height-large:         1.3333333; // extra decimals for Win 8.1 Chrome
+@line-height-small:         1.5;
+
+@border-radius-base:        4px;
+@border-radius-large:       4px;
+@border-radius-small:       4px;
+
+//** Global color for active items (e.g., navs or dropdowns).
+@component-active-color:    @cui-default-inverse-color;
+//** Global background color for active items (e.g., navs or dropdowns).
+@component-active-bg:       @brand-primary;
+
+//** Width of the `border` for generating carets that indicator dropdowns.
+@caret-width-base:          4px;
+//** Carets increase slightly in size for larger components.
+@caret-width-large:         5px;
+
+
+//== Tables
+//
+//## Customizes the `.table` component with basic values, each used across all table variations.
+
+//** Padding for `<th>`s and `<td>`s.
+@table-cell-padding:            7px 8px 8px 8px;
+//** Padding for cells in `.table-condensed`.
+@table-condensed-cell-padding:  3px 8px 4px 8px;
+
+//** Default background color used for all tables.
+@table-bg:                      transparent;
+//** Background color used for `.table-striped`.
+@table-bg-accent:               @cui-default-bg-color;
+//** Background color used for `.table-hover`.
+@table-bg-hover:                @cui-gray-050;
+@table-bg-active:               @table-bg-hover;
+
+//** Border color for table and cell borders.
+@table-border-color:            @cui-default-border-color;
+
+
+//== Buttons
+//
+//## For each of Bootstrap's buttons, define text, background and border color.
+
+@btn-font-weight:                normal;
+
+@btn-default-color:              @cui-blue-700;
+@btn-default-bg:                 @cui-default-bg-color;
+@btn-default-border:             @cui-gray-400;
+
+@btn-primary-color:              @cui-default-inverse-color;
+@btn-primary-bg:                 @link-color;
+@btn-primary-border:             @cui-blue-900;
+
+@btn-success-color:              @cui-default-inverse-color;
+@btn-success-bg:                 @brand-success;
+@btn-success-border:             darken(@btn-success-bg, 5%);
+
+@btn-info-color:                 @cui-default-inverse-color;
+@btn-info-bg:                    @brand-info;
+@btn-info-border:                darken(@btn-info-bg, 5%);
+
+@btn-warning-color:              @cui-default-inverse-color;
+@btn-warning-bg:                 @brand-warning;
+@btn-warning-border:             darken(@btn-warning-bg, 5%);
+
+@btn-danger-color:               @cui-default-inverse-color;
+@btn-danger-bg:                  @brand-danger;
+@btn-danger-border:              darken(@btn-danger-bg, 5%);
+
+@btn-link-disabled-color:        @gray-light;
+
+// Allows for customizing button radius independently from global border radius
+@btn-border-radius-base:         @border-radius-base;
+@btn-border-radius-large:        @border-radius-base;
+@btn-border-radius-small:        @border-radius-base;
+
+
+//== Forms
+//
+//##
+
+//** `<input>` background color
+@input-bg:                       @cui-default-bg-color;
+//** `<input disabled>` background color
+@input-bg-disabled:              @cui-gray-050;
+
+//** Text color for `<input>`s
+@input-color:                    @text-color;
+//** `<input>` border color
+@input-border:                   @cui-gray-400;
+
+// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
+//** Default `.form-control` border radius
+// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
+@input-border-radius:            @border-radius-base;
+//** Large `.form-control` border radius
+@input-border-radius-large:      @border-radius-large;
+//** Small `.form-control` border radius
+@input-border-radius-small:      @border-radius-small;
+
+//** Border color for inputs on focus
+@input-border-focus:             #66afe9;
+
+//** Placeholder text color
+@input-color-placeholder:        @cui-gray-500;
+
+//** Default `.form-control` height
+@input-height-base:              32px;
+//** Large `.form-control` height
+@input-height-large:             48px;
+//** Small `.form-control` height
+@input-height-small:             28px;
+
+//** `.form-group` margin
+@form-group-margin-bottom:       12px;
+
+@legend-color:                   @gray-dark;
+@legend-border-color:            #e5e5e5;
+
+//** Background color for textual input addons
+@input-group-addon-bg:           @well-bg;
+//** Border color for textual input addons
+@input-group-addon-border-color: @input-border;
+
+//** Disabled cursor for form controls and buttons.
+@cursor-disabled:                not-allowed;
+
+
+//== Dropdowns
+//
+//## Dropdown menu container and contents.
+
+//** Background for the dropdown menu.
+@dropdown-bg:                    @cui-default-bg-color;
+//** Dropdown menu `border-color`.
+@dropdown-border:                rgba(0,0,0,.15);
+//** Dropdown menu `border-color` **for IE8**.
+@dropdown-fallback-border:       #ccc;
+//** Divider color for between dropdown items.
+@dropdown-divider-bg:            #e5e5e5;
+
+//** Dropdown link text color.
+@dropdown-link-color:            @gray-dark;
+//** Hover color for dropdown links.
+@dropdown-link-hover-color:      @cui-default-inverse-color;
+//** Hover background for dropdown links.
+@dropdown-link-hover-bg:         @cui-blue-700;
+
+//** Active dropdown menu item text color.
+@dropdown-link-active-color:     @component-active-color;
+//** Active dropdown menu item background color.
+@dropdown-link-active-bg:        @component-active-bg;
+
+//** Disabled dropdown menu item background color.
+@dropdown-link-disabled-color:   @gray-light;
+
+//** Text color for headers within dropdown menus.
+@dropdown-header-color:          @gray-light;
+
+//** Deprecated `@dropdown-caret-color` as of v3.1.0
+@dropdown-caret-color:           #000;
+
+
+//-- Z-index master list
+//
+// Warning: Avoid customizing these values. They're used for a bird's eye view
+// of components dependent on the z-axis and are designed to all work together.
+//
+// Note: These variables are not generated into the Customizer.
+
+@zindex-navbar:            1000;
+@zindex-dropdown:          1000;
+@zindex-popover:           1060;
+@zindex-tooltip:           1070;
+@zindex-navbar-fixed:      1030;
+@zindex-modal-background:  1040;
+@zindex-modal:             1050;
+
+
+//== Media queries breakpoints
+//
+//## Define the breakpoints at which your layout will change, adapting to different screen sizes.
+
+// Extra small screen / phone
+//** Deprecated `@screen-xs` as of v3.0.1
+@screen-xs:                  480px;
+//** Deprecated `@screen-xs-min` as of v3.2.0
+@screen-xs-min:              @screen-xs;
+//** Deprecated `@screen-phone` as of v3.0.1
+@screen-phone:               @screen-xs-min;
+
+// Small screen / tablet
+//** Deprecated `@screen-sm` as of v3.0.1
+@screen-sm:                  768px;
+@screen-sm-min:              @screen-sm;
+//** Deprecated `@screen-tablet` as of v3.0.1
+@screen-tablet:              @screen-sm-min;
+
+// Medium screen / desktop
+//** Deprecated `@screen-md` as of v3.0.1
+@screen-md:                  992px;
+@screen-md-min:              @screen-md;
+//** Deprecated `@screen-desktop` as of v3.0.1
+@screen-desktop:             @screen-md-min;
+
+// Large screen / wide desktop
+//** Deprecated `@screen-lg` as of v3.0.1
+@screen-lg:                  1200px;
+@screen-lg-min:              @screen-lg;
+//** Deprecated `@screen-lg-desktop` as of v3.0.1
+@screen-lg-desktop:          @screen-lg-min;
+
+// So media queries don't overlap when required, provide a maximum
+@screen-xs-max:              (@screen-sm-min - 1);
+@screen-sm-max:              (@screen-md-min - 1);
+@screen-md-max:              (@screen-lg-min - 1);
+
+
+//== Grid system
+//
+//## Define your custom responsive grid.
+
+//** Number of columns in the grid.
+@grid-columns:              12;
+//** Padding between columns. Gets divided in half for the left and right.
+@grid-gutter-width:         24px;
+// Navbar collapse
+//** Point at which the navbar becomes uncollapsed.
+@grid-float-breakpoint:     @screen-sm-min;
+//** Point at which the navbar begins collapsing.
+@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
+
+
+//== Container sizes
+//
+//## Define the maximum width of `.container` for different screen sizes.
+
+// Small screen / tablet
+@container-tablet:             (720px + @grid-gutter-width);
+//** For `@screen-sm-min` and up.
+@container-sm:                 @container-tablet;
+
+// Medium screen / desktop
+@container-desktop:            (940px + @grid-gutter-width);
+//** For `@screen-md-min` and up.
+@container-md:                 @container-desktop;
+
+// Large screen / wide desktop
+@container-large-desktop:      (1140px + @grid-gutter-width);
+//** For `@screen-lg-min` and up.
+@container-lg:                 @container-large-desktop;
+
+
+//== Navbar
+//
+//##
+
+// Basics of a navbar
+@navbar-height:                    48px;
+@navbar-margin-bottom:             0;
+@navbar-border-radius:             0;
+@navbar-padding-horizontal:        floor((@grid-gutter-width / 2));
+@navbar-padding-vertical:          ((@navbar-height - @line-height-computed) / 2);
+@navbar-collapse-max-height:       340px;
+
+@navbar-default-color:             @cui-gray-700;
+@navbar-default-bg:                @cui-default-bg-color;
+@navbar-default-border:            @cui-default-border-color;
+
+// Navbar links
+@navbar-default-link-color:                @cui-gray-700;
+@navbar-default-link-hover-color:          @cui-gray-700;
+@navbar-default-link-hover-bg:             @cui-gray-100;
+@navbar-default-link-active-color:         @text-color;
+@navbar-default-link-active-bg:            @cui-purple-gray-050;
+@navbar-default-link-disabled-color:       @cui-gray-400;
+@navbar-default-link-disabled-bg:          transparent;
+
+// Navbar brand label
+@navbar-default-brand-color:               @navbar-default-link-color;
+@navbar-default-brand-hover-color:         darken(@navbar-default-brand-color, 10%);
+@navbar-default-brand-hover-bg:            transparent;
+
+// Navbar toggle
+@navbar-default-toggle-hover-bg:           #ddd;
+@navbar-default-toggle-icon-bar-bg:        #888;
+@navbar-default-toggle-border-color:       #ddd;
+
+
+//=== Inverted navbar
+// Reset inverted navbar basics
+@navbar-inverse-color:                      @cui-default-inverse-color;
+@navbar-inverse-bg:                         @cui-blue-gray-900;
+@navbar-inverse-border:                     transparent;
+
+// Inverted navbar links
+@navbar-inverse-link-color:                 @cui-default-inverse-color;
+@navbar-inverse-link-hover-color:           @cui-default-inverse-color;
+@navbar-inverse-link-hover-bg:              @cui-gray-800;
+@navbar-inverse-link-active-color:          @cui-default-inverse-color;
+@navbar-inverse-link-active-bg:             @cui-gray-800;
+@navbar-inverse-link-disabled-color:        #444;
+@navbar-inverse-link-disabled-bg:           transparent;
+
+// Inverted navbar brand label
+@navbar-inverse-brand-color:                @navbar-inverse-link-color;
+@navbar-inverse-brand-hover-color:          @cui-default-inverse-color;
+@navbar-inverse-brand-hover-bg:             transparent;
+
+// Inverted navbar toggle
+@navbar-inverse-toggle-hover-bg:            #333;
+@navbar-inverse-toggle-icon-bar-bg:         @cui-default-bg-color;
+@navbar-inverse-toggle-border-color:        #333;
+
+
+//== Navs
+//
+//##
+
+//=== Shared nav styles
+@nav-link-padding:                          10px 15px;
+@nav-link-hover-bg:                         @gray-lighter;
+
+@nav-disabled-link-color:                   @gray-light;
+@nav-disabled-link-hover-color:             @gray-light;
+
+//== Tabs
+@nav-tabs-border-color:                     #ddd;
+
+@nav-tabs-link-hover-border-color:          @cui-default-border-color;
+
+@nav-tabs-active-link-hover-bg:             @cui-default-bg-color;
+@nav-tabs-active-link-hover-color:          @text-color;
+@nav-tabs-active-link-hover-border-color:   #ddd;
+
+@nav-tabs-justified-link-border-color:            #ddd;
+@nav-tabs-justified-active-link-border-color: @cui-default-bg-color;
+
+//== Pills
+@nav-pills-border-radius:                   @border-radius-base;
+@nav-pills-active-link-hover-bg:            @component-active-bg;
+@nav-pills-active-link-hover-color:         @component-active-color;
+
+
+//== Pagination
+//
+//##
+
+@pagination-color:                     @link-color;
+@pagination-bg:                        transparent;
+@pagination-border:                    transparent;
+
+@pagination-hover-color:               @link-hover-color;
+@pagination-hover-bg:                  @gray-lighter;
+@pagination-hover-border:              #ddd;
+
+@pagination-active-color:              @cui-black;
+@pagination-active-bg:                 transparent;
+@pagination-active-border:             transparent;
+
+@pagination-disabled-color:            @gray-light;
+@pagination-disabled-bg:               @cui-default-bg-color;
+@pagination-disabled-border:           transparent;
+
+
+//== Pager
+//
+//##
+
+@pager-bg:                             @pagination-bg;
+@pager-border:                         @pagination-border;
+@pager-border-radius:                  0;
+
+@pager-hover-bg:                       @pagination-hover-bg;
+
+@pager-active-bg:                      @pagination-active-bg;
+@pager-active-color:                   @pagination-active-color;
+
+@pager-disabled-color:                 @pagination-disabled-color;
+
+
+//== Jumbotron
+//
+//##
+
+@jumbotron-padding:              30px;
+@jumbotron-color:                inherit;
+@jumbotron-bg:                   @gray-lighter;
+@jumbotron-heading-color:        inherit;
+@jumbotron-font-size:            ceil((@font-size-base * 1.5));
+@jumbotron-heading-font-size:    ceil((@font-size-base * 4.5));
+
+
+//== Form states and alerts
+//
+//## Define colors for form feedback states and, by default, alerts.
+
+@state-success-text:             @cui-lime-800;
+@state-success-bg:               @cui-lime-010;
+@state-success-border:           @state-success-bg;
+
+@state-info-text:                @cui-blue-700;
+@state-info-bg:                  @cui-blue-010;
+@state-info-border:              @state-info-bg;
+
+@state-warning-text:             @cui-orange-900;
+@state-warning-bg:               @cui-yellow-010;
+@state-warning-border:           @state-warning-bg;
+
+@state-danger-text:              @cui-red-700;
+@state-danger-bg:                @cui-pink-010;
+@state-danger-border:            @state-danger-bg;
+
+//== Tooltips
+//
+//##
+
+//** Tooltip max width
+@tooltip-max-width:           200px;
+//** Tooltip text color
+@tooltip-color:               @cui-default-inverse-color;
+//** Tooltip background color
+@tooltip-bg:                  #000;
+@tooltip-opacity:             .9;
+
+//** Tooltip arrow width
+@tooltip-arrow-width:         5px;
+//** Tooltip arrow color
+@tooltip-arrow-color:         @tooltip-bg;
+
+
+//== Popovers
+//
+//##
+
+//** Popover body background color
+@popover-bg:                          @cui-default-bg-color;
+//** Popover maximum width
+@popover-max-width:                   276px;
+//** Popover border color
+@popover-border-color:                @cui-default-border-color;
+//** Popover fallback border color
+@popover-fallback-border-color:       #ccc;
+
+//** Popover title background color
+@popover-title-bg: @cui-purple-gray-050;
+
+//** Popover arrow width
+@popover-arrow-width:                 10px;
+//** Popover arrow color
+@popover-arrow-color:                 @popover-bg;
+
+//** Popover outer arrow width
+@popover-arrow-outer-width:           (@popover-arrow-width + 1);
+//** Popover outer arrow color
+@popover-arrow-outer-color:           fadein(@popover-border-color, 5%);
+//** Popover outer arrow fallback color
+@popover-arrow-outer-fallback-color:  darken(@popover-fallback-border-color, 20%);
+
+
+//== Labels
+//
+//##
+
+//** Default label background color
+@label-default-bg:            @gray-light;
+//** Primary label background color
+@label-primary-bg:            @brand-primary;
+//** Success label background color
+@label-success-bg:            @brand-success;
+//** Info label background color
+@label-info-bg:               @brand-info;
+//** Warning label background color
+@label-warning-bg:            @brand-warning;
+//** Danger label background color
+@label-danger-bg:             @brand-danger;
+
+//** Default label text color
+@label-color:                 @cui-default-inverse-color;
+//** Default text color of a linked label
+@label-link-hover-color:      @cui-default-inverse-color;
+
+
+//== Modals
+//
+//##
+
+//** Padding applied to the modal body
+@modal-inner-padding:         24px;
+
+//** Padding applied to the modal title
+@modal-title-padding:         15px;
+//** Modal title line-height
+@modal-title-line-height:     60px;
+
+//** Background color of modal content area
+@modal-content-bg:           @cui-default-bg-color;
+//** Modal content border color
+@modal-content-border-color: @cui-gray-800;
+//** Modal content border color **for IE8**
+@modal-content-fallback-border-color:          #999;
+
+//** Modal backdrop background color
+@modal-backdrop-bg:           @cui-black;
+//** Modal backdrop opacity
+@modal-backdrop-opacity: .68;
+//** Modal header border color
+@modal-header-border-color:  @cui-default-border-color; // border-bottom only
+//** Modal footer border color
+@modal-footer-border-color:  @cui-default-border-color;
+
+@modal-lg:                    900px;
+@modal-md:                    600px;
+@modal-sm:                    300px;
+
+
+//== Alerts
+//
+//## Define alert colors, border radius, and padding.
+
+@alert-padding:               24px;
+@alert-border-radius:         0;
+@alert-link-font-weight:      normal;
+
+@alert-success-bg:            @state-success-bg;
+@alert-success-text:          @state-success-text;
+@alert-success-border:        @state-success-border;
+
+@alert-info-bg:               @state-info-bg;
+@alert-info-text:             @state-info-text;
+@alert-info-border:           @state-info-border;
+
+@alert-warning-bg:            @state-warning-bg;
+@alert-warning-text:          @state-warning-text;
+@alert-warning-border:        @state-warning-border;
+
+@alert-danger-bg:             @state-danger-bg;
+@alert-danger-text:           @state-danger-text;
+@alert-danger-border:         @state-danger-border;
+
+
+//== Progress bars
+//
+//##
+
+//** Background color of the whole progress component
+@progress-bg:                 #f5f5f5;
+//** Progress bar text color
+@progress-bar-color:          @cui-default-inverse-color;
+//** Variable for setting rounded corners on progress bar.
+@progress-border-radius:      0;
+
+//** Default progress bar color
+@progress-bar-bg:             @brand-primary;
+//** Success progress bar color
+@progress-bar-success-bg:     @brand-success;
+//** Warning progress bar color
+@progress-bar-warning-bg:     @brand-warning;
+//** Danger progress bar color
+@progress-bar-danger-bg:      @brand-danger;
+//** Info progress bar color
+@progress-bar-info-bg:        @brand-info;
+
+
+//== List group
+//
+//##
+
+//** Background color on `.list-group-item`
+@list-group-bg:                 @cui-default-bg-color;
+//** `.list-group-item` border color
+@list-group-border:             #ddd;
+//** List group border radius
+@list-group-border-radius:      0;
+
+//** Background color of single list items on hover
+@list-group-hover-bg:           #f5f5f5;
+//** Text color of active list items
+@list-group-active-color:       @component-active-color;
+//** Background color of active list items
+@list-group-active-bg:          @component-active-bg;
+//** Border color of active list elements
+@list-group-active-border:      @list-group-active-bg;
+//** Text color for content within active list items
+@list-group-active-text-color:  lighten(@list-group-active-bg, 40%);
+
+//** Text color of disabled list items
+@list-group-disabled-color:      @gray-light;
+//** Background color of disabled list items
+@list-group-disabled-bg:         @gray-lighter;
+//** Text color for content within disabled list items
+@list-group-disabled-text-color: @list-group-disabled-color;
+
+@list-group-link-color:         #555;
+@list-group-link-hover-color:   @list-group-link-color;
+@list-group-link-heading-color: #333;
+
+
+//== Panels
+//
+//##
+
+@panel-bg:                    @cui-default-bg-color;
+@panel-body-padding:          15px 23px 15px 23px;
+@panel-heading-padding:       0 23px 0 23px;
+@panel-footer-padding:        7px 23px 12px 23px;
+@panel-border-radius:         0;
+
+//** Border color for elements within panels
+@panel-inner-border:          transparent;
+@panel-footer-bg:             @cui-default-bg-color;
+
+@panel-default-text:          @gray-dark;
+@panel-default-border:        @cui-default-border-color;
+@panel-default-heading-bg:    transparent;
+
+@panel-primary-text:          @cui-default-inverse-color;
+@panel-primary-border:        @brand-primary;
+@panel-primary-heading-bg:    @brand-primary;
+
+@panel-success-text:          @state-success-text;
+@panel-success-border:        @state-success-border;
+@panel-success-heading-bg:    @state-success-bg;
+
+@panel-info-text:             @state-info-text;
+@panel-info-border:           @state-info-border;
+@panel-info-heading-bg:       @state-info-bg;
+
+@panel-warning-text:          @state-warning-text;
+@panel-warning-border:        @state-warning-border;
+@panel-warning-heading-bg:    @state-warning-bg;
+
+@panel-danger-text:           @state-danger-text;
+@panel-danger-border:         @state-danger-border;
+@panel-danger-heading-bg:     @state-danger-bg;
+
+
+//== Thumbnails
+//
+//##
+
+//** Padding around the thumbnail image
+@thumbnail-padding:           4px;
+//** Thumbnail background color
+@thumbnail-bg:                @cui-default-bg-color;
+//** Thumbnail border color
+@thumbnail-border:            #ddd;
+//** Thumbnail border radius
+@thumbnail-border-radius:     0;
+
+//** Custom text color for thumbnail captions
+@thumbnail-caption-color:     @text-color;
+//** Padding around the thumbnail caption
+@thumbnail-caption-padding:   9px;
+
+
+//== Wells
+//
+//##
+
+@well-bg: @cui-gray-050;
+@well-border: @cui-default-border-color;
+
+
+//== Badges
+//
+//##
+
+@badge-color:                 @cui-default-inverse-color;
+//** Linked badge text color on hover
+@badge-link-hover-color:      @cui-default-inverse-color;
+@badge-bg:                    @gray-light;
+
+//** Badge text color in active nav link
+@badge-active-color:          @link-color;
+//** Badge background color in active nav link
+@badge-active-bg:             @cui-default-bg-color;
+
+@badge-font-weight:           bold;
+@badge-line-height:           1;
+@badge-border-radius:         0;
+
+
+//== Breadcrumbs
+//
+//##
+
+@breadcrumb-padding-vertical: 0;
+@breadcrumb-padding-horizontal: 24px;
+//** Breadcrumb background color
+@breadcrumb-bg:                 transparent;
+//** Breadcrumb text color
+@breadcrumb-color:              @cui-gray-400;
+//** Text color of current page in the breadcrumb
+@breadcrumb-active-color:       @gray-light;
+//** Textual separator for between breadcrumb elements
+@breadcrumb-separator:          "/";
+
+
+//== Carousel
+//
+//##
+
+@carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6);
+
+@carousel-control-color:                      @cui-default-inverse-color;
+@carousel-control-width:                      15%;
+@carousel-control-opacity:                    .5;
+@carousel-control-font-size:                  20px;
+
+@carousel-indicator-active-bg:                @cui-default-bg-color;
+@carousel-indicator-border-color:             #fff;
+
+@carousel-caption-color:                      @cui-default-inverse-color;
+
+
+//== Close
+//
+//##
+
+@close-font-weight:           bold;
+@close-color:                 #000;
+@close-text-shadow:           0 1px 0 #fff;
+
+
+//== Code
+//
+//##
+
+@code-color:                  #c7254e;
+@code-bg:                     #f9f2f4;
+
+@kbd-color:                   @cui-default-inverse-color;
+@kbd-bg:                      #333;
+
+@pre-bg:                      #f5f5f5;
+@pre-color:                   @text-color;
+@pre-border-color:            #ccc;
+@pre-scrollable-max-height:   340px;
+
+
+//== Type
+//
+//##
+
+//** Horizontal offset for forms and lists.
+@component-offset-horizontal: 146px;
+//** Text muted color
+@text-muted:                  @cui-gray-700;
+//** Abbreviations and acronyms border color
+@abbr-border-color:           @gray-light;
+//** Headings small color
+@headings-small-color:        @gray-light;
+//** Blockquote small color
+@blockquote-small-color:      @gray-light;
+//** Blockquote font size
+@blockquote-font-size:        (@font-size-base * 1.25);
+//** Blockquote border color
+@blockquote-border-color:     @gray-lighter;
+//** Page header border color
+@page-header-border-color:    @cui-default-border-color;
+//** Width of horizontal description list titles
+@dl-horizontal-offset:        @component-offset-horizontal;
+//** Point at which .dl-horizontal becomes horizontal
+@dl-horizontal-breakpoint:    @grid-float-breakpoint;
+//** Horizontal line color.
+@hr-border:                   @cui-default-border-color;