AMBARI-18893. Remove redundant css (part 2) (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/07cde1d7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/07cde1d7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/07cde1d7 Branch: refs/heads/trunk Commit: 07cde1d74d94bbcf380d195be271491ee5035746 Parents: 5a32eda Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Tue Nov 15 11:55:02 2016 +0200 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Tue Nov 15 11:55:02 2016 +0200 ---------------------------------------------------------------------- ambari-web/app/styles/alerts.less | 55 - ambari-web/app/styles/application.less | 997 ++++++++----------- ambari-web/app/styles/bootstrap_overrides.less | 14 + ambari-web/app/styles/common.less | 298 +----- ambari-web/app/styles/config_history_flow.less | 6 - ambari-web/app/styles/modal_popups.less | 3 - ambari-web/app/styles/stack_versions.less | 24 +- ambari-web/app/styles/widgets.less | 4 +- .../common/configs/selectCreateConfigGroup.hbs | 4 +- .../templates/common/host_progress_popup.hbs | 4 +- .../common/modal_popups/log_tail_popup.hbs | 2 +- ambari-web/app/templates/login.hbs | 2 +- .../main/alerts/definition_details.hbs | 8 +- .../main/dashboard/plus_button_filter.hbs | 8 +- .../main/dashboard/widgets/yarn_links.hbs | 2 +- ambari-web/app/templates/main/host/summary.hbs | 2 +- .../manage_configuration_groups_popup.hbs | 8 +- .../templates/main/service/services/flume.hbs | 4 +- ambari-web/app/templates/main/views.hbs | 5 +- ambari-web/app/templates/wizard/step3.hbs | 4 +- ambari-web/app/views/main/dashboard/widgets.js | 2 + .../host_component_recommendation_mixin_test.js | 24 +- .../host_component_validation_mixin_test.js | 24 +- 23 files changed, 476 insertions(+), 1028 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/styles/alerts.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/alerts.less b/ambari-web/app/styles/alerts.less index 1ea3492..4569e25 100644 --- a/ambari-web/app/styles/alerts.less +++ b/ambari-web/app/styles/alerts.less @@ -184,25 +184,8 @@ .alert-definition-details-header { margin-bottom: 30px; } - .definition-details-block { - margin-top: 30px; - .multiline-text { - padding-top: 4px; - height: 60px; - } - } - hr { - margin: 10px 0 0 0; - } - .edit-description-button { - font-size: 14px; - } - .edit-description-button:hover { - text-decoration: none; - } .status { - text-align: right; .label { font-size: 14px; padding: 5px 8px; @@ -215,8 +198,6 @@ width: 100%; } .properties-list { - padding: 10px; - text-align: left; .property-name { font-weight: bold; } @@ -231,45 +212,9 @@ font-weight: bold; } - .definition-name { - .name-text-field{ - margin-left: 2px; - margin-bottom: 0; - input { - width: 99%; - margin-bottom: 0; - margin-top: -4px; - margin-left: -5px; - } - } - .edit-buttons { - margin-bottom: 0; - margin-top: -4px; - float: left; - margin-left: 7px; - } - } - .error-msg { color: #b94a48; } - - .edit-buttons { - text-align: right; - margin-bottom: 10px; - } - - .text-area-edit { - textarea { - width: 99%; - height: 100px; - margin-left: -5px; - } - } - - .edit-link { - cursor: pointer; - } } .alert-configs { http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 3d2375e..5312ee2 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -91,6 +91,286 @@ footer { height: @footer-height - 60px; } + +.editable-list-container { + &:hover { + .pencil-box { + opacity: 1; + } + } + &.disabled { + .pencil-box { + display: none; + } + } + &.well{ + padding: 10px; + position: relative; + margin-bottom: 25px; + cursor: pointer; + &.edit-mode{ + cursor: default; + } + &.disabled{ + background: white; + } + } + &.edit-mode { + &:hover { + .pencil-box { + opacity: 0; + } + } + .items-box { + ul.items-list { + li.item { + &.add-item-input .ember-text-field{ + display: inline-block!important; + text-overflow: ellipsis; + white-space: nowrap; + position: relative; + padding: 0; + margin: 0; + border: none; + width: 50px; + height: 18px; + box-shadow: none; + -webkit-transition: none; + -moz-transition: none; + -o-transition: none; + transition: none; + } + .close { + display: inline-block; + } + } + } + } + } + .actions-panel{ + position: absolute; + right: 5px; + bottom: -42px; + padding: 2px 5px 5px 5px; + background: #f5f5f5; + border: 1px solid #e3e3e3; + border-top: none; + border-radius: 0 0 4px 4px; + + -webkit-transition: all 0.3s; + -o-transition: all 0.3s; + transition: all 0.3s; + + -ms-transform-origin: 0% 0%; /* IE 9 */ + -webkit-transform-origin: 0% 0%; /* Chrome, Safari, Opera */ + transform-origin: 0% 0%; + + -webkit-transform: rotateX(0deg); + -ms-transform: rotateX(0deg); + -o-transform: rotateX(0deg); + transform: rotateX(0deg); + + .btn-xs { + padding: 1px 5px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; + } + .glyphicon-remove { + color: #000; + } + .glyphicon-ok { + color: white; + } + } + .items-box { + ul.items-list{ + list-style-type: none; + margin: 0; + padding: 0; + li.item{ + display: inline-block; + padding: 4px 8px; + margin: 0 5px 5px 2px; + background: white; + border: 1px solid #ebebeb; + max-width: 100%; + white-space: nowrap; + position: relative; + &.add-item{ + color: #ddd; + } + &.deletable{ + padding-right: 25px; + } + &.global{ + background-color: #f5f5f5; + } + li { + a { + text-decoration: none; + } + } + a { + color: #555; + } + .close{ + margin: -2px 0 0 5px; + width: 13px; + outline: none; + position: absolute; + display: none; + } + } + } + } + .pencil-box{ + position: absolute; + right: 5px; + top: 5px; + opacity: 0; + -webkit-transition: all 0.3s; + -o-transition: all 0.3s; + transition: all 0.3s; + } +} + +.typeahead-box { + position: absolute; + left: 0; + margin-top: 5px; + background: white; + border: 1px solid #ebebeb; + z-index: 1000; + min-width: 65px; + max-height: 150px; + overflow: auto; + ul { + list-style-type: none; + margin: 0; + padding: 0; + li { + padding: 3px 5px; + display: block; + cursor: pointer; + &.selected, .typeahead-box ul li:hover{ + background: #eee; + } + } + } +} + + +.table-overlay { + position: absolute; + opacity: 0.9; + background-color: #fefefe; + .spinner { + display: none; + } +} + +.host-elements { + border: 1px solid #ddd; + height: 120px; + overflow: auto; + padding: 5px; + ul { + margin-bottom: 0; + } + table { + width: 100%; + td { + width: 50%; + padding: 0; + } + } +} + +.export-graph-list { + top: 25px; + min-width: 60px; + font-size: 14px; + cursor: auto; + a { + cursor: pointer; + } +} + +.pre-styled { + display: block; + padding: 9.5px; + margin: 0 0 10px; + font-size: 11px; + line-height: 14px; + font-family: monospace; + word-break: break-all; + word-wrap: break-word; + white-space: pre-wrap; + background-color: #f5f5f5; + border: 1px solid rgba(0, 0, 0, 0.15); + border-radius: 4px; +} + +.clear { + clear: both; +} + +.noDisplay { + display: none !important; +} + +.display { + display: block !important; +} + +.display-inline-block { + display: inline-block; +} + +.popover { + small { + font-size: 1.3rem; + } +} + +.form-group { + .help-block { + &.help-inline { + margin-bottom: 0; + } + } +} + +.alert { + & > ul, ol { + padding-left: inherit; + } +} + +.dropdown-toggle.btn-icon { + padding-left: 8px; + padding-right: 8px; +} + +::-webkit-scrollbar { + -webkit-appearance: none; +} + +::-webkit-scrollbar:vertical { + width: 11px; +} + +::-webkit-scrollbar:horizontal { + height: 11px; +} + +::-webkit-scrollbar-thumb { + border-radius: 8px; + border: 2px solid white; + background-color: rgba(0, 0, 0, .5); +} + #content { padding: 15px 0; } @@ -122,11 +402,6 @@ table.diff { line-height: @spinner-default-height; } -.heatmap-select-metric-btn, .heatmap-select-metric-btn:focus { - font-size: 13px; - padding: 10px; -} - .row.row-no-pad { .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 { @@ -147,15 +422,15 @@ table.diff { text-decoration: none; } .upgrade-in-progress { - .infoPulse; + .infoPulse(); } .upgrade-holding { - .warnPulse; + .warnPulse(); } .upgrade-aborted { - .dangerPulse; + .dangerPulse(); .glyphicon-remove { color: #fff; } @@ -173,6 +448,22 @@ table.diff { cursor: pointer; } +.health-status-HEALTHY, .health-status-LIVE, .health-status-STARTING, .health-status-started, .health-status-starting { + color: @health-status-green; +} +.health-status-color-red, .health-status-installed, .health-status-stopping, .health-status-DEAD-RED, .health-status-STOPPING { + color: @health-status-red !important; +} +.health-status-unknown, .health-status-DEAD-YELLOW { + color: @health-status-yellow !important; +} +.health-status-DEAD-ORANGE { + color: @health-status-orange; +} +.health-status-color-blue { + color:@health-status-blue; +} + #top-nav { .navbar.navbar-static-top { @@ -182,8 +473,6 @@ table.diff { background-image: -o-linear-gradient(top, @top-nav-bg-color-from, @top-nav-bg-color-to); background-image: linear-gradient(to bottom, @top-nav-bg-color-from, @top-nav-bg-color-to); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr= @top-nav-bg-color-from, endColorstr=@top-nav-bg-color-to); //for IE9- - -webkit-box-shadow: inset 0 0 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 0 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); box-shadow: inset 0 0 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); .navbar-text.brand-wrapper { @@ -204,7 +493,7 @@ table.diff { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: @top-nav-ops-count-bg-color; &.operations-count { - .infoPulse; + .infoPulse(); } &.alert-crit-count { background-color: @health-status-red; @@ -224,7 +513,7 @@ table.diff { .ops-count { margin-right: -1px; color: #006DCC; - .infoPulseInner; + .infoPulseInner(); } } a:hover { @@ -266,8 +555,6 @@ table.diff { .active > a, .active > a:hover, .active > a:focus { color: @top-nav-menu-active-text-color; background-color: @top-nav-menu-active-bg-color; - -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); - -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); } li > a:focus, li > a:hover { @@ -299,30 +586,12 @@ table.diff { list-style: none; background-color: @top-nav-menu-dropdown-bg-color; border: 3px solid @top-nav-menu-dropdown-border-color; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -webkit-background-clip: padding-box; -moz-background-clip: padding; background-clip: padding-box; - .health-status-LIVE, .health-status-STARTING { - color: @health-status-green; - } - .health-status-DEAD-RED, .health-status-STOPPING { - color: @health-status-red; - } - .health-status-DEAD-YELLOW { - color: @health-status-yellow; - } - .label { - padding: 0 0 0 3px; - } .alerts-count { - line-height: 14px; - padding: 1px 4px; - float: right; margin-right: 5px; - margin-top: 3px; } } .top-nav-dropdown-menu > li{ @@ -333,9 +602,6 @@ table.diff { text-align: left; display: block; padding: 3px 0 3px 5px; - clear: both; - font-weight: normal; - line-height: 20px; color: @top-nav-menu-dropdown-text-color; white-space: nowrap; .glyphicon-health-block > span:before { @@ -373,7 +639,6 @@ table.diff { border-radius: 8px; font-size: 13px; font-weight: bold; - line-height: 19px; margin: 1px 10px 2px 0; padding: 7px 14px; text-decoration: none; @@ -397,9 +662,6 @@ table.diff { .service-caption { display: inline-block; width: 100%; - &.with-alert { - width: 80%; - } } .glyphicon-caption { display: inline-block; @@ -486,21 +748,12 @@ h1 { width: 8px; } -.glyphicon-caret-right { +.glyphicon-caret-right, .glyphicon-caret-left { min-width: 8px; padding-top: 2px; } -.glyphicon-caret-left { - min-width: 8px; - padding-top: 2px; -} - -.glyphicon-remove { - color: #FF4B4B; -} - -.glyphicon-remove-sign { +.glyphicon-remove, .glyphicon-remove-sign { color: #FF4B4B; } @@ -663,8 +916,6 @@ h1 { li.filter-status.active, li.filter-status.active:hover { background-color: #666; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); border-radius: 5px; } @@ -768,13 +1019,11 @@ h1 { font-size: 12px; li.filter-status.active a { text-decoration: none; - color: #FFFFFF; + color: #fff; } li.filter-status.active, li.filter-status.active:hover { background-color: #666; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); border-radius: 5px; } @@ -954,11 +1203,6 @@ h1 { #summary-restart-bar { margin-top: 20px; - .alert { - .glyphicon-refresh { - color: #fdb82f; - } - } } #serviceConfig { @@ -1067,20 +1311,21 @@ h1 { .action { cursor: pointer; } - .glyphicon-plus-sign { - color: @health-status-green; + .a-icon(@color) { + color: @color; margin-right: 2px; } + .glyphicon-plus-sign { + .a-icon(@health-status-green); + } .glyphicon-minus-sign { - color: #FF4B4B; - margin-right: 2px; + .a-icon(#FF4B4B); } .icon-undo { - color: rgb(243, 178, 11); - margin-right: 2px; + .a-icon(rgb(243, 178, 11)); } .btn-final{ - background: transparent repeat scroll 0 0 rgba(255, 255, 255, 0); + background: transparent repeat scroll 0 0 #fff; } .btn-final .glyphicon-lock{ color: #a6a6a6; @@ -1094,8 +1339,6 @@ h1 { background-color: #d9d9d9 \9; background-image: none; outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn-final.active[disabled] { @@ -1182,9 +1425,6 @@ h1 { font-size: 27px; line-height: 30px; } - .glyphicon-ok-sign { - color: @health-status-green; - } .glyphicon-warning-sign { color: @health-status-red; } @@ -1683,7 +1923,9 @@ a:focus { padding: 5px; } - .tab-marker-position { + .health-status-LIVE, .health-status-STARTING, + .health-status-DEAD-RED, .health-status-STOPPING, + .health-status-DEAD-ORANGE, .health-status-DEAD-YELLOW { list-style: none; min-height: 20px; min-width: 20px; @@ -1691,29 +1933,6 @@ a:focus { float: none; display: inline; } - .health-status-LIVE, .health-status-STARTING { - .tab-marker-position; - color: @health-status-green; - } - .health-status-DEAD-RED, .health-status-STOPPING { - .tab-marker-position; - color: @health-status-red; - } - .health-status-DEAD-ORANGE { - .tab-marker-position; - color: @health-status-orange; - } - .health-status-DEAD-YELLOW { - .tab-marker-position; - color: @health-status-yellow; - } - dt { - text-align: left; - width: 120px; - } - dd { - margin-left: 145px; - } .like_pointer { cursor: pointer; } @@ -1758,7 +1977,8 @@ a:focus { } .services, .summary-info { - .tab-marker-position { + .tab-marker-position(@color) { + color: @color; background-position: 0 3px; background-repeat: no-repeat; list-style: none; @@ -1769,16 +1989,13 @@ a:focus { float: none !important; } .STARTING, .STARTED { - .tab-marker-position; - color: @health-status-green; + .tab-marker-position (@health-status-green); } .STOPPING, .INSTALLED { - .tab-marker-position; - color: @health-status-red; + .tab-marker-position (@health-status-red); } .UNKNOWN { - .tab-marker-position; - color: @health-status-yellow; + .tab-marker-position (@health-status-yellow); } .summary-view-host{ @@ -1798,7 +2015,7 @@ a:focus { } } .service-summary-component-red-dead { - color: #ff0000; + color: @health-status-red; display: inline; } .service-summary-component-green-live { @@ -1875,7 +2092,7 @@ a:focus { width: 100%; padding: 7px 0; text-align: center; - color: #333333; + color: #333; &:hover { background-color: #eee; color: #333; @@ -1901,7 +2118,7 @@ a:focus { li { border-bottom: 1px solid #eee; list-style: none; - padding: 5px 5px 5px 5px; + padding: 5px; background-position: 14px 9px; background-repeat: no-repeat; .date-time { @@ -1918,9 +2135,6 @@ a:focus { font-weight: normal; font-size: 13px; } - .row [class*="span"] { - min-height: 0; - } .status-icon { padding-top: 7px; } @@ -2056,7 +2270,7 @@ a:focus { .x_tick { margin-top: 5px; .title { - padding: 0 2px 0 2px; + padding: 0 2px; opacity: 1 !important; top: 148px; } @@ -2146,7 +2360,9 @@ a:focus { /*Services*/ .services-menu { .nav-list { - .tab-marker-position { + .health-status-LIVE, .health-status-STARTING, + .health-status-DEAD-RED, .health-status-STOPPING, + .health-status-DEAD-YELLOW { list-style: none; height: 20px; width: 20px; @@ -2154,35 +2370,12 @@ a:focus { display: inline; float: none; } - .health-status-LIVE, .health-status-STARTING { - .tab-marker-position; - color: @health-status-green; - } - .health-status-DEAD-RED, .health-status-STOPPING { - .tab-marker-position; - color: @health-status-red; - } - .health-status-DEAD-YELLOW { - .tab-marker-position; - color: @health-status-yellow; - } li { line-height: 24px; a { padding: 3px 4px; white-space: nowrap; } - .label { - padding: 0 0 0 3px; - } - .label.alerts-count { - line-height: 14px; - padding: 1px 4px; - background: @health-status-red; - float: right; - margin-right: 1px; - margin-top: 3px; - } } li.clients { @@ -2202,10 +2395,6 @@ a:focus { } - .start-stop-all-service-button { - margin: 5px 5px 10px 10px; - text-align: center; - } .icon-medkit { padding-left:6px; } @@ -2248,13 +2437,6 @@ a.services-menu-blocks{ margin: 0 2px; } } -.host-rack-id-popup { - .control-label { - width: 100px; - margin-right: 10px; - } -} - .service-block { margin-top: 20px; @@ -2286,10 +2468,6 @@ a.services-menu-blocks{ } .summary-metric-graphs { - [class*="span"] { - float: left; - margin-left: 10px; - } .chart-container { .chart-x-axis { left: 0; @@ -2336,47 +2514,16 @@ table.graphs { /*Dashboard Widgets/heatmaps Start*/ #dashboard-widgets-container{ - > ul.nav.nav-tabs { - margin-bottom: 10px; - } #widgets-options-menu { .add-widgets-text .dropdown-menu { - top: 0; - left: 99%; - margin-top: -6px; - margin-left: -1px; - max-height: 375px; overflow: auto; width: 210px; - li { - display: block; - padding: 3px 0 3px 5px; - .checkbox { - margin: 0; - } - ul { - margin-left: 0; - } - } - &>li { - &>ul { - width: 180px; - margin-left: 0; - } - } - } - .add-widgets-text:hover .dropdown-menu { - display: block; } } .dashboard-widgets-box { margin-top: 4px; } - h4{ - line-height: 30px; - margin-bottom: 0; - margin-top: 0; - } + #dashboard-widgets { .caption { height: 25px; @@ -2394,25 +2541,14 @@ table.graphs { width: 19.60%; *width: 19.60%; } - .span4p8 { - float: left; - width: 39.55%; - *width: 39.55%; - } .thumbnails > div { - margin-left: 0; - margin-right: 3px; - margin-top: 0; - margin-bottom: 3px; + margin: 0 3px 3px 0; height: 163px; } .thumbnails li { height: 160px; width: 100%; - margin-left: 0; - margin-right: 3px; - margin-top: 3px; - margin-bottom: 0; + margin: 3px 3px 0 0; } .img-thumbnail .corner-icon { @@ -2420,14 +2556,14 @@ table.graphs { position: relative; padding: 7px 0; .glyphicon-remove-sign{ - color: #000000; + color: #000; text-shadow: #fff 0 0 15px; position: absolute; left: -10px; top: -10px; } .glyphicon-edit, .glyphicon-save { - color: #555555; + color: #555; } } .export-graph-list { @@ -2438,7 +2574,7 @@ table.graphs { } } .img-thumbnail .hidden-info-general{ - color: #555555; + color: #555; font-size: 12px; font-weight: bold; text-align: center; @@ -2466,11 +2602,8 @@ table.graphs { } } .img-thumbnail .caption { - padding-left: 0; - padding-top: 7px; - padding-bottom: 7px; - padding-right: 0; - color: #555555; + padding: 7px 0; + color: #555; font-weight:bold; font-size: 12px; text-align: left; @@ -2490,7 +2623,7 @@ table.graphs { width: 90%; height: 105px; border: 1px solid silver; - color: #ffffff; + color: #fff; i { font-size: inherit; } @@ -2505,7 +2638,7 @@ table.graphs { position: relative; } .img-thumbnail{ - background-color: #ffffff; + background-color: #fff; z-index: 3; } .has-hidden-info { @@ -2515,7 +2648,6 @@ table.graphs { } .has-hidden-info .img-thumbnail:hover { cursor: move; - //background-color: #d3d3d3; .corner-icon{ display:block; text-decoration: none; @@ -2532,15 +2664,13 @@ table.graphs { margin-left: -13px; z-index: 7; } - .widget-content{ - top: -104px; + .content-mx(@top) { + top: @top; opacity: 0.3; z-index: 5; } - .widget-content-isNA{ - top: -104px; - opacity: 0.3; - z-index: 5; + .widget-content, .widget-content-isNA { + .content-mx(-104px); } .uptime-content{ top: -116px; @@ -2552,36 +2682,26 @@ table.graphs { top: -82px; } .content-hidden-two-line{ - top: -105px; - opacity: 0.3; - z-index: 5; + .content-mx(-105px); } .content-hidden-three-line{ - top: -116px; - opacity: 0.3; - z-index: 5; + .content-mx(-116px); } .content-hidden-four-line{ - top: -126px; - opacity: 0.3; - z-index: 5; + .content-mx(-126px); } .content-hidden-five-line{ - top: -140px; - opacity: 0.3; - z-index: 5; + .content-mx(-140px); } .content-hidden-six-line{ - top: -143px; - opacity: 0.3; - z-index: 5; + .content-mx(-143px); } } .cluster-metrics { position: relative; .chart-container{ - margin: 0 10px 0 10px; + margin: 0 10px; .chart-y-axis{ margin-top: 10px; } @@ -2621,30 +2741,23 @@ table.graphs { } } - .links { - ul { - margin: 0; - } - } .links .img-thumbnail{ li{ height:20px; - margin: 3px; } .link-button{ - padding-top: 7px; - padding-left: 70px; + float: right; .disabled-hdfs-quick-link { - pointer-events: none; - color: #808080; - cursor: default; - } + pointer-events: none; + color: #808080; + cursor: default; + } } .widget-content{ text-align: center; font-size: 11px; - color: #555555; + color: #555; padding-top: 40px; table{ vertical-position: center; @@ -2672,58 +2785,31 @@ table.graphs { position: relative; } - #map-reduce-slots-text{ - padding-left: 5px; - padding-top: 40px; - color: #555555; - font-weight:bold; - font-size: 10px; - >ul{ - margin-top:5px; - margin-bottom: 0; - } - #map-reduce-slots-bar1{ - margin-left: 10px; - } - #map-reduce-slots-bar2{ - margin-left: 3px; - } - #map-reduce-slots-num1{ - margin-left: 5px; - } - #map-reduce-slots-num2{ - margin-left: 5px; - } + .widget-cn(@color) { + color: @color; + padding-top: 70px; + font-weight: bold; } - .is-red{ .widget-content { - color: @health-status-red; - padding-top: 70px; - font-weight: bold; + .widget-cn(@health-status-red); } } .is-orange{ .widget-content { - color: @health-status-orange; - padding-top: 70px; - font-weight: bold; + .widget-cn(@health-status-orange); } } .is-green { .widget-content { - color: @health-status-green; - padding-top: 70px; - font-weight: bold; + .widget-cn(@health-status-green); } } .is-na { position: relative; .widget-content { - color: #D6DDDF; + .widget-cn(#D6DDDF); text-shadow: none; - padding-top: 70px; - font-weight: bold; } } } @@ -2731,7 +2817,7 @@ table.graphs { /*Dashboard Widgets END*/ .dialog-delete-component { - border: 1px solid #FDB82F; + border: 1px solid @restart-indicator-color; border-radius: 4px; padding: 4px; background: #FFFDF6; @@ -2775,34 +2861,17 @@ table.graphs { } } - .status-dot-position { + .health-status-HEALTHY, + .health-status-LIVE, + .health-status-DEAD-RED, + .health-status-DEAD-ORANGE, + .health-status-DEAD-YELLOW { background-position: center; background-repeat: no-repeat; height: 20px; width: 13px; display: inline !important; float: none !important; - } - .health-status-HEALTHY, - .health-status-LIVE { - .status-dot-position; - color: @health-status-green; - margin-right: 1px; - margin-left: 1px; - } - .health-status-DEAD-RED { - .status-dot-position; - color: @health-status-red; - } - .health-status-DEAD-ORANGE { - .status-dot-position; - color: @health-status-orange; - margin-right: 1px; - margin-left: 1px; - } - .health-status-DEAD-YELLOW { - .status-dot-position; - color: @health-status-yellow; margin-right: 1px; margin-left: 1px; } @@ -2968,40 +3037,6 @@ table.graphs { margin: 4px 4px 2px 2px; } } - li#title-bar { - text-align: left; - border-bottom: 1px solid #e4e4e4; - a.close { - background: #777; - display: inline; - color: #fff; - padding-left: 35px; - padding-right: 12px; - text-shadow: 0 1px 0 #fff; - float: none; - font-size: 10px; - opacity: 0.6; - } - a.close:hover { - background: #777; - opacity: 1.0; - } - } - li#selector-bar { - text-align: left; - border-bottom: 1px solid #e4e4e4; - font-size: 6px; - } - li#list-area { - font-weight: normal; - text-align: left; - } - li#button-bar { - text-align: center; - button { - font-size: 12px; - } - } select { width: 150px; } @@ -3041,39 +3076,9 @@ table.graphs { .dropdown { margin-top: 3px; } - .dropdown { - margin-top: 3px; - } .dropdown select { width: 60px; } - .page-listing a { - line-height: 0; - border: none; - margin: 0; - margin-right: 10px; - cursor: pointer; - color: #0088CC; - padding: 8px 0; - float: left; - text-decoration: underline; - } - .page-listing a:hover { - text-decoration: none; - } - .page-listing { - width: 100px; - .table { - th.name { - width: 300px; - a.filter-label { - width: 57px; - display: block; - float: left; - } - } - } - } } .collapsed-list { padding-left: 10px; @@ -3127,9 +3132,7 @@ table.graphs { #host-details { - .set-rack-id { - cursor: pointer; - } + .status-info { .host-title { font-size: 18px; @@ -3151,7 +3154,14 @@ table.graphs { border-bottom-color: #000; } - .marker { + .components-health.glyphicon-arrow-up { + color:@health-status-red; + } + + .health-status-started, .health-status-starting, .health-status-LIVE, + .health-status-installed, .health-status-stopping, .health-status-DEAD-RED, + .health-status-unknown, .health-status-DEAD-YELLOW, + .health-status-DEAD-ORANGE { background-repeat: no-repeat; height: 13px; width: 13px; @@ -3159,53 +3169,6 @@ table.graphs { float: none !important; } - .components-health.glyphicon-arrow-up{ - color:@health-status-red; - } - - .health-status-started, .health-status-starting { - .marker; - color: @health-status-green; - } - - .health-status-installed, .health-status-stopping { - .marker; - color: @health-status-red; - } - - .health-status-unknown { - .marker; - color: @health-status-yellow; - } - - .health-status-LIVE { - .marker; - color: @health-status-green; - } - - .health-status-DEAD-RED { - .marker; - color: @health-status-red; - } - - .health-status-color-blue { - color:#0000ff; - } - - .health-status-color-red { - color: @health-status-red; - } - - .health-status-DEAD-ORANGE { - .marker; - color: @health-status-orange; - } - - .health-status-DEAD-YELLOW { - .marker; - color: @health-status-yellow; - } - .host-details-summary-list { .summary-label { text-align: right; @@ -3280,23 +3243,11 @@ table.graphs { .services-menu { .glyphicon-refresh { - color: @restart-indicator-color; margin-left: 4px; } } -#host-details, #serviceConfig { - .glyphicon-refresh { - color: @restart-indicator-color; - } -} #hosts{ - .glyphicon-refresh { - color: @restart-indicator-color; - } - .alerts-crit-count { - float: right; - } - .alerts-warn-count { + .alerts-crit-count, .alerts-warn-count { float: right; } } @@ -3335,15 +3286,6 @@ table.graphs { } /*End Admin*/ -/* Start Admin Access*/ -.ha-btn { - margin-left: 0; -} - -.rm-ha { - margin-top: 20px; -} -/* End Admin Access*/ /*Start About*/ .about { @@ -3415,7 +3357,6 @@ table.graphs { max-width: 250px; } - .hostName { word-wrap: break-word!important; white-space: normal; @@ -3472,14 +3413,6 @@ ul.filter { #main-admin-menu { padding: 8px 0; - .nav-list { - li { - line-height: 24px; - a { - padding: 3px 20px; - } - } - } } .button-caret-margin { @@ -3670,9 +3603,6 @@ ul.filter { .container-fluid { padding: 0; } - .row [class*="span"] { - margin-left: 0; - } .legend { margin-top: 20px; margin-bottom: 20px; @@ -3705,10 +3635,6 @@ ul.filter { /*End Heatmap*/ -.noDisplay { - display: none !important; -} - /* CHARTS */ .chart { overflow: hidden; @@ -3727,36 +3653,6 @@ ul.filter { font-weight: bold; } - .horizon { - border-bottom: 1px solid #000; - overflow: hidden; - position: relative; - } - .horizon { - border-bottom: 1px solid #000; - border-top: 1px solid #000; - } - .horizon + .horizon { - border-top: medium none; - } - .horizon canvas { - display: block; - } - .horizon .title, .horizon .value { - bottom: 0; - line-height: 30px; - margin: 0 6px; - position: absolute; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - white-space: nowrap; - } - .horizon .title { - left: 0; - } - .horizon .value { - right: 0; - } - .rule { display: none; width: 30px; @@ -3808,7 +3704,6 @@ ul.filter { } text { - font-family: Arial; font-size: 9pt; } } @@ -3832,10 +3727,6 @@ ul.filter { border: none !important; } -ul.noStyle { - list-style: none; -} - ul.inline li { display: inline; } @@ -3936,8 +3827,6 @@ ul.inline li { color: #555; text-decoration: none; background-color: #e5e5e5; - -webkit-box-shadow: inset 0 -5px 8px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 -5px 8px rgba(0, 0, 0, 0.05); box-shadow: inset 0 -5px 8px rgba(0, 0, 0, 0.05); } .filter-btn { @@ -4122,12 +4011,6 @@ ul.inline li { } } -#step10-alert-message { - .glyphicon-refresh { - color: @restart-indicator-color; - } -} - #step10-content { ul { li { @@ -4397,11 +4280,6 @@ i.glyphicon-asterisks { width: 19.47%; *width: 19.47%; } - .span4p8 { - float: left; - width: 39.45%; - *width: 39.45%; - } .thumbnails > div { margin-right: 5px; } @@ -4419,20 +4297,10 @@ i.glyphicon-asterisks { font-size: 12px; } } - #map-reduce-slots-text{ - font-size: 12px; - #map-reduce-slots-bar1{ - margin-left: 11px; - } - } } } .summary-metric-graphs { - [class*="span"] { - float: left; - margin-left: 10px; - } .chart-container { .chart-x-axis { left: 0; @@ -4463,25 +4331,9 @@ i.glyphicon-asterisks { } } -.row .host-component-block { - - .refresh-icon-block { - width: 6%; - float: right; - } - - .medkit-icon-block { - width: 6%; - float: left; - padding-left: 3px; - } -} - .filter-combobox{ > input{ width: 170px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; padding-right: 20px; } @@ -4508,12 +4360,10 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { #config-group-select-create-dialog { .select-create-config-group-div { - margin-left: 20px; - margin-bottom: 20px; - .btn-group >.dropdown-menu { + .dropdown-menu { max-height: 160px; max-width: 300px; - overflow: scroll; + overflow-y: scroll; } } .message{ @@ -4524,7 +4374,6 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { #config-group-confirm-save { .message{ color: #777; - padding-left: 10px; } } @@ -4558,11 +4407,6 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { } } -.prrl { - position: relative; - right: @space-m; -} - .pts { padding-top: @space-s; } @@ -4667,29 +4511,14 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { cursor: pointer; } td.icon { - width: 6%; - padding-left: 20px; - padding-right: 5px; + vertical-align: middle; + width: 40px; .view-icon-image { img { height: 32px; } } } - td.label-version-description { - padding-top: 10px; - .view-label-text { - display: inline; - font-size: 16px; - font-weight: bold; - } - .view-version-text, - .view-description-text { - font-size: 14px; - display: inline; - color: #808080; - } - } } .no-views-text { padding-left: 20px; @@ -4744,32 +4573,16 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { overflow: hidden; max-width: 90px; } - .glyphicon-ok-sign { - color: @health-status-green; - } - .glyphicon-question-sign { - color: @health-status-yellow; - } .glyphicon-warning-sign { - color: #FDB82F; - } - .sorting_asc { - background: - url(data:image/png;base64,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) no-repeat right 50%; - } - .sorting_desc { - background: url(data:image/png;base64,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) no-repeat right 50%; - } - .sorting { - background: url( data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAKQWlDQ1BJQ0MgUHJvZmlsZQAASA2dlndUU9kWh8+9N73QEiIgJfQaegkg0jtIFQRRiUmAUAKGhCZ2RAVGFBEpVmRUwAFHhyJjRRQLg4Ji1wnyEFDGwVFEReXdjGsJ7601896a/cdZ39nnt9fZZ+9917oAUPyCBMJ0WAGANKFYFO7rwVwSE8vE9wIYEAEOWAHA4WZmBEf4RALU/L09mZmoSMaz9u4ugGS72yy/UCZz1v9/kSI3QyQGAApF1TY8fiYX5QKUU7PFGTL/BMr0lSkyhjEyFqEJoqwi48SvbPan5iu7yZiXJuShGlnOGbw0noy7UN6aJeGjjAShXJgl4GejfAdlvVRJmgDl9yjT0/icTAAwFJlfzOcmoWyJMkUUGe6J8gIACJTEObxyDov5OWieAHimZ+SKBIlJYqYR15hp5ejIZvrxs1P5YjErlMNN4Yh4TM/0tAyOMBeAr2+WRQElWW2ZaJHtrRzt7VnW5mj5v9nfHn5T/T3IevtV8Sbsz55BjJ5Z32zsrC+9FgD2JFqbHbO+lVUAtG0GQOXhrE/vIADyBQC03pzzHoZsXpLE4gwnC4vs7GxzAZ9rLivoN/ufgm/Kv4Y595nL7vtWO6YXP4EjSRUzZUXlpqemS0TMzAwOl89k/fcQ/+PAOWnNycMsnJ/AF/GF6FVR6JQJhIlou4U8gViQLmQKhH/V4X8YNicHGX6daxRodV8AfYU5ULhJB8hvPQBDIwMkbj96An3rWxAxCsi+vGitka9zjzJ6/uf6Hwtcim7hTEEiU+b2DI9kciWiLBmj34RswQISkAd0oAo0gS4wAixgDRyAM3AD3iAAhIBIEAOWAy5IAmlABLJBPtgACkEx2AF2g2pwANSBetAEToI2cAZcBFfADXALDIBHQAqGwUsw Ad6BaQiC8BAVokGqkBakD5lC1hAbWgh5Q0FQOBQDxUOJkBCSQPnQJqgYKoOqoUNQPfQjdBq6CF2D+qAH0CA0Bv0BfYQRmALTYQ3YALaA2bA7HAhHwsvgRHgVnAcXwNvhSrgWPg63whfhG/AALIVfwpMIQMgIA9FGWAgb8URCkFgkAREha5EipAKpRZqQDqQbuY1IkXHkAwaHoWGYGBbGGeOHWYzhYlZh1mJKMNWYY5hWTBfmNmYQM4H5gqVi1bGmWCesP3YJNhGbjS3EVmCPYFuwl7ED2GHsOxwOx8AZ4hxwfrgYXDJuNa4Etw/XjLuA68MN4SbxeLwq3hTvgg/Bc/BifCG+Cn8cfx7fjx/GvyeQCVoEa4IPIZYgJGwkVBAaCOcI/YQRwjRRgahPdCKGEHnEXGIpsY7YQbxJHCZOkxRJhiQXUiQpmbSBVElqIl0mPSa9IZPJOmRHchhZQF5PriSfIF8lD5I/UJQoJhRPShxFQtlOOUq5QHlAeUOlUg2obtRYqpi6nVpPvUR9Sn0vR5Mzl/OX48mtk6uRa5Xrl3slT5TXl3eXXy6fJ18hf0r+pvy4AlHBQMFTgaOwVqFG4bTCPYVJRZqilWKIYppiiWKD4jXFUSW8koGStxJPqUDpsNIlpSEaQtOledK4tE20Otpl2jAdRzek+9OT6cX0H+i99AllJWVb5SjlHOUa5bPKUgbCMGD4M1IZpYyTjLuMj/M05rnP48/bNq9pXv+8KZX5Km4qfJUilWaVAZWPqkxVb9UU1Z2qbapP1DBqJmphatlq+9Uuq43Pp893ns+dXzT/5PyH6rC6iXq4+mr1w+o96pMamhq+GhkaVRqXNMY1GZpumsma5ZrnNMe0aFoLtQRa5VrntV4wlZnuzFRmJbOLOaGtru2nLdE+pN2rPa1jqLNYZ6NOs84TXZIuWzdBt1y3U3dCT0svWC9fr1HvoT5Rn62fpL9Hv1t/ysDQINpgi0GbwaihiqG/YZ5ho +FjI6qRq9Eqo1qjO8Y4Y7ZxivE+41smsImdSZJJjclNU9jU3lRgus+0zwxr5mgmNKs1u8eisNxZWaxG1qA5wzzIfKN5m/krCz2LWIudFt0WXyztLFMt6ywfWSlZBVhttOqw+sPaxJprXWN9x4Zq42Ozzqbd5rWtqS3fdr/tfTuaXbDdFrtOu8/2DvYi+yb7MQc9h3iHvQ732HR2KLuEfdUR6+jhuM7xjOMHJ3snsdNJp9+dWc4pzg3OowsMF/AX1C0YctFx4bgccpEuZC6MX3hwodRV25XjWuv6zE3Xjed2xG3E3dg92f24+ysPSw+RR4vHlKeT5xrPC16Il69XkVevt5L3Yu9q76c+Oj6JPo0+E752vqt9L/hh/QL9dvrd89fw5/rX+08EOASsCegKpARGBFYHPgsyCRIFdQTDwQHBu4IfL9JfJFzUFgJC/EN2hTwJNQxdFfpzGC4sNKwm7Hm4VXh+eHcELWJFREPEu0iPyNLIR4uNFksWd0bJR8VF1UdNRXtFl0VLl1gsWbPkRoxajCCmPRYfGxV7JHZyqffS3UuH4+ziCuPuLjNclrPs2nK15anLz66QX8FZcSoeGx8d3xD/iRPCqeVMrvRfuXflBNeTu4f7kufGK+eN8V34ZfyRBJeEsoTRRJfEXYljSa5JFUnjAk9BteB1sl/ygeSplJCUoykzqdGpzWmEtPi000IlYYqwK10zPSe9L8M0ozBDuspp1e5VE6JA0ZFMKHNZZruYjv5M9UiMJJslg1kLs2qy3mdHZZ/KUcwR5vTkmuRuyx3J88n7fjVmNXd1Z752/ob8wTXuaw6thdauXNu5Tnddwbrh9b7rj20gbUjZ8MtGy41lG99uit7UUaBRsL5gaLPv5sZCuUJR4b0tzlsObMVsFWzt3WazrWrblyJe0fViy+KK4k8l3JLr31l9V/ndzPaE7b2l9qX7d+B2CHfc3em681iZYlle2dCu4F2t5czyovK3u1fsvlZhW3 FgD2mPZI+0MqiyvUqvakfVp+qk6oEaj5rmvep7t+2d2sfb17/fbX/TAY0DxQc+HhQcvH/I91BrrUFtxWHc4azDz+ui6rq/Z39ff0TtSPGRz0eFR6XHwo911TvU1zeoN5Q2wo2SxrHjccdv/eD1Q3sTq+lQM6O5+AQ4ITnx4sf4H++eDDzZeYp9qukn/Z/2ttBailqh1tzWibakNml7THvf6YDTnR3OHS0/m/989Iz2mZqzymdLz5HOFZybOZ93fvJCxoXxi4kXhzpXdD66tOTSna6wrt7LgZevXvG5cqnbvfv8VZerZ645XTt9nX297Yb9jdYeu56WX+x+aem172296XCz/ZbjrY6+BX3n+l37L972un3ljv+dGwOLBvruLr57/17cPel93v3RB6kPXj/Mejj9aP1j7OOiJwpPKp6qP6391fjXZqm99Oyg12DPs4hnj4a4Qy//lfmvT8MFz6nPK0a0RupHrUfPjPmM3Xqx9MXwy4yX0+OFvyn+tveV0auffnf7vWdiycTwa9HrmT9K3qi+OfrW9m3nZOjk03dp76anit6rvj/2gf2h+2P0x5Hp7E/4T5WfjT93fAn88ngmbWbm3/eE8/syOll+AAAACXBIWXMAAAsTAAALEwEAmpwYAAABmElEQVQ4EdWSv0vDQBTH7y4ZUkKhTdtYHArOUvwPdHAVpeBY3PwH/BfEycF/wclR6NzBxUFxKrgokRLaSkmhTZr+ADWJ32s5DeXaSkHBW97du/c+73vvHiF/vaIooj+pyZYFAaTbtn0DuzR2YQBX1G63K57n7TQajfNlhRfCfN8/6na7u4AS13VPOp3O/iLgXBgAa0i+/Hh7J5RSEoYh6fV6FfjX5wGlMCQwgKpQNs0Lo4kdjUYEz77FvSIDSmGA7DmOU+SKxGJkukeRDfTwWPjjVo0fxH48Hic1TbtmjBX5c2F1WA/3rSAI7obDoSVif81+vyNWAmNQHgwGB6qqbqHxOUVRklD kQ2ELCu+h+qJQKDzGUiZb6TPT6TTt9/uHABLeK947QFKE0RSyNg3DkM6c9AN0Xb9CwguUCNDXeKDQQyaTeZpVxc9SZVASQMk2frWFzyCTwUBDElqCmKZZxv10VmaIUmU8Bgmv+Xy+JNRxXzabraJfz3y/0mo2m2e1Wi2q1+sQG+VWgogkAKhlWaeY/pLw/T/7CTBQv9a27vsbAAAAAElFTkSuQmCC) no-repeat right 50%; + color: @restart-indicator-color; } #flume-host-agent-row { cursor: pointer; text-align: left; - background-color: #ffffff; + background-color: #fff; } .empty-label { - border-top: 1px solid #dddddd; + border-top: 1px solid #ddd; text-align: center; } } @@ -5014,10 +4827,18 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { font-style: italic; } } - td:first-child, td:first-child + td, th:first-child, th:first-child + th { + td:first-child, + td:first-child + td, + th:first-child, + th:first-child + th { width: 12.5%; } - td:first-child + td + td, td:first-child + td + td + td, td:first-child + td + td + td + td, th:first-child + th + th, th:first-child + th + th + th, th:first-child + th + th + th + th { + td:first-child + td + td, + td:first-child + td + td + td, + td:first-child + td + td + td + td, + th:first-child + th + th, + th:first-child + th + th + th, + th:first-child + th + th + th + th { width: 25%; } } @@ -5031,21 +4852,6 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { } } -.table { - background-color: #fff; -} - -.panel { - background-color: #fff; -} - -.panel-heading { - background-color: #f0f0f0; - .panel-title { - line-height: 34px; - } -} - .config-manage-nav { .config-groups-dropdown { display: inline-block; @@ -5077,7 +4883,7 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { } .icon-undo { - color: rgb(243, 178, 11); + color: #F3B20B; } .view-permission-header th { @@ -5129,11 +4935,6 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { font-weight: normal; cursor: pointer; } - #upload-definition-file-panel.disabled { - .local-option-label { - color: #999; - } - } } .register-version-options { input.disabled { @@ -5177,9 +4978,6 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { color: grey; } } - .border-bottom { - border-bottom: 1px solid #ebebeb; - } .repos-inner-table { margin-bottom: 0; background-color: transparent; @@ -5188,14 +4986,11 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { width: 90%; height: 24px; } - #skip-validation { + #skip-validation, #use-redhat { span.disabled { opacity: 0.7; } } - #use-redhat span.disabled { - opacity: 0.7; - } } } #combo_search_box { http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/styles/bootstrap_overrides.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/bootstrap_overrides.less b/ambari-web/app/styles/bootstrap_overrides.less index f6efa0a..dd427cb 100644 --- a/ambari-web/app/styles/bootstrap_overrides.less +++ b/ambari-web/app/styles/bootstrap_overrides.less @@ -51,3 +51,17 @@ .modal-open { overflow-y: scroll; } + +.table { + background-color: #fff; +} + +.panel { + background-color: #fff; + .panel-heading { + background-color: #f0f0f0; + .panel-title { + line-height: 34px; + } + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/styles/common.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/common.less b/ambari-web/app/styles/common.less index 9eaf932..8099e8a 100644 --- a/ambari-web/app/styles/common.less +++ b/ambari-web/app/styles/common.less @@ -16,6 +16,10 @@ * limitations under the License. */ +/** + * This file only for variables and mixins! + */ + /************************************************************************ * Health status(service/host/host component health)icons class names ***********************************************************************/ @@ -32,10 +36,11 @@ * Health status(service/host/host component health)icon colors ***********************************************************************/ @health-status-red: #ff0000; +@health-status-blue: #0000ff; @health-status-green: #5AB400; @health-status-yellow: #FFD13D; @health-status-orange: #FF8E00; -@maintenance-black: #000000; +@maintenance-black: #000; /************************************************************************ * Health status(service/host/host component health)icon colors ends ***********************************************************************/ @@ -176,21 +181,21 @@ animation-iteration-count: infinite; } -.infoPulse { +.infoPulse() { .pulse(bluePulse); background-color: #006DCC; } -.infoPulseInner { +.infoPulseInner() { .pulse(bluePulseInner); } -.warnPulse { +.warnPulse() { .pulse(orangePulse); background-color: @health-status-orange; } -.dangerPulse { +.dangerPulse() { .pulse(redPulse); background-color: @health-status-red; } @@ -209,286 +214,3 @@ @modal-header-height: 50px; // modal footer height @modal-footer-height: 60px; - -.editable-list-container.well{ - padding: 10px; - position: relative; - margin-bottom: 25px; - cursor: pointer; -} -.editable-list-container.well.edit-mode{ - cursor: default; -} -.editable-list-container.well.disabled{ - background: white; -} - -.editable-list-container .items-box{ - -} -.editable-list-container .items-box ul.items-list{ - list-style-type: none; - margin: 0; - padding: 0; -} - -.editable-list-container .items-box ul.items-list li.item{ - display: inline-block; - padding: 4px 8px; - margin: 0 5px 5px 2px; - background: white; - border: 1px solid #ebebeb; - max-width: 100%; - white-space: nowrap; - position: relative; - a { - color: #555; - } -} - -.editable-list-container.edit-mode .items-box ul.items-list li.item.deletable{ - padding-right: 25px; -} -.editable-list-container .items-box ul.items-list li.item.global{ - background-color: #f5f5f5; -} - -.editable-list-container .items-box ul.items-list li.item .close{ - margin: -2px 0 0 5px; - width: 13px; - outline: none; - position: absolute; - display: none; -} -.editable-list-container.edit-mode .items-box ul.items-list li.item .close{ - display: inline-block; -} - -.editable-list-container .items-box ul.items-list li a{ - text-decoration: none; -} - -.editable-list-container.edit-mode .items-box ul.items-list li.item.add-item-input .ember-text-field{ - display: inline-block!important; - text-overflow: ellipsis; - white-space: nowrap; - position: relative; - padding: 0 0; - margin: 0 0; - border: none; - width: 50px; - height: 18px; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - -webkit-transition: none; - -moz-transition: none; - -o-transition: none; - transition: none; -} - -.editable-list-container .items-box ul.items-list li.item.add-item{ - color: #ddd; -} - -.typeahead-box{ - position: absolute; - left: 0; - margin-top: 5px; - background: white; - border: 1px solid #ebebeb; - z-index: 1000; - min-width: 65px; - max-height: 150px; - overflow: auto; -} -.typeahead-box ul{ - list-style-type: none; - margin: 0; - padding: 0; -} -.typeahead-box ul li{ - padding: 3px 5px; - display: block; - cursor: pointer; -} - -.typeahead-box ul li.selected, .typeahead-box ul li:hover{ - background: #eee; -} - -.editable-list-container .actions-panel{ - position: absolute; - right: 5px; - bottom: -30px; - padding: 2px 5px 5px 5px; - background: #f5f5f5; - border: 1px solid #e3e3e3; - border-top: none; - border-radius: 0 0 4px 4px; - - -webkit-transition: all 0.3s; - -o-transition: all 0.3s; - transition: all 0.3s; - - -ms-transform-origin: 0% 0%; /* IE 9 */ - -webkit-transform-origin: 0% 0%; /* Chrome, Safari, Opera */ - transform-origin: 0% 0%; - - -webkit-transform: rotateX(0deg); - -ms-transform: rotateX(0deg); - -o-transform: rotateX(0deg); - transform: rotateX(0deg); - - .btn-xs { - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; - } - .glyphicon-remove { - color: #000; - } - .glyphicon-ok { - color: white; - } -} - -.editable-list-container.disabled .pencil-box{ - display: none; -} -.editable-list-container .pencil-box{ - position: absolute; - right: 5px; - top: 5px; - opacity: 0; - -webkit-transition: all 0.3s; - -o-transition: all 0.3s; - transition: all 0.3s; -} -.editable-list-container:hover .pencil-box{ - opacity: 1; -} -.editable-list-container.edit-mode:hover .pencil-box{ - opacity: 0; -} - -.table-overlay { - position: absolute; - opacity: 0.9; - background-color: #fefefe; - .spinner { - display: none; - } -} - -.host-elements { - border: 1px solid #ddd; - height: 120px; - overflow: auto; - padding: 5px; - ul { - margin-bottom: 0; - } - table { - width: 100%; - td { - width: 50%; - padding: 0; - } - } -} - -.export-graph-list { - top: 25px; - min-width: 60px; - font-size: 14px; - cursor: auto; - a { - cursor: pointer; - } -} - -.lh-btn { - line-height: 30px; -} - -.text-bold { - font-weight: bold; -} - -.pre-styled { - display: block; - padding: 9.5px; - margin: 0 0 10px; - font-size: 11px; - line-height: 14px; - font-family: monospace; - word-break: break-all; - word-wrap: break-word; - white-space: pre-wrap; - background-color: #f5f5f5; - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.clear { - clear: both; -} - -.noDisplay { - display: none !important; -} - -.display { - display: block !important; -} - -.display-inline-block { - display: inline-block; -} - -.popover { - small { - font-size: 1.3rem; - } -} - -.form-group { - .help-block { - &.help-inline { - margin-bottom: 0; - } - } -} - -.alert { - & > ul, ol { - padding-left: inherit; - } -} - -.dropdown-toggle.btn-icon { - padding-left: 8px; - padding-right: 8px; -} - -::-webkit-scrollbar { - -webkit-appearance: none; -} - -::-webkit-scrollbar:vertical { - width: 11px; -} - -::-webkit-scrollbar:horizontal { - height: 11px; -} - -::-webkit-scrollbar-thumb { - border-radius: 8px; - border: 2px solid white; - background-color: rgba(0, 0, 0, .5); -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/styles/config_history_flow.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/config_history_flow.less b/ambari-web/app/styles/config_history_flow.less index dae2709..e3fe0e7 100644 --- a/ambari-web/app/styles/config_history_flow.less +++ b/ambari-web/app/styles/config_history_flow.less @@ -401,9 +401,6 @@ } } -.version-in-dropdown [class*="span"] { - min-height: 24px; -} // Firefox specific styles @-moz-document url-prefix() { @@ -416,7 +413,4 @@ } } } - .version-in-dropdown [class*="span"] { - min-height: 30px; - } } http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/styles/modal_popups.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/modal_popups.less b/ambari-web/app/styles/modal_popups.less index 4c2ba8c..48c02b5 100644 --- a/ambari-web/app/styles/modal_popups.less +++ b/ambari-web/app/styles/modal_popups.less @@ -192,9 +192,6 @@ clear:both; } .override-controls{ - .glyphicon-ok-sign { - color: #5AB400; - } #filter-dropdown-div { .dropdown-menu { right: 0; http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/styles/stack_versions.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/stack_versions.less b/ambari-web/app/styles/stack_versions.less index e014958..aca9c65 100644 --- a/ambari-web/app/styles/stack_versions.less +++ b/ambari-web/app/styles/stack_versions.less @@ -107,8 +107,6 @@ } .textfield-error input { border-color: #b94a48; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .disabled-label { @@ -278,22 +276,22 @@ .version-column { min-height: 500px; width: 115px; - margin: 15px 7px 0px 7px; + margin: 15px 7px 0 7px; .version-column-display-name { color: #000; text-align: center; font-weight: 500; font-size: 16px; line-height: 18px; - padding: 5px 5px; - margin-bottom: 0px; + padding: 5px; + margin-bottom: 0; } .version-column-show-details { text-align: center; font-size: 13px; - padding: 5px 5px; + padding: 5px; border-bottom: 1px solid #e4e4e4; - margin-bottom: 0px; + margin-bottom: 0; a { cursor: pointer; } @@ -335,7 +333,7 @@ height: 2px; background: #e4e4e4; position: relative; - margin: 0px 0px 0px -15px; + margin: 0 0 0 -15px; } .line-separator { top: -7px; @@ -435,7 +433,7 @@ .repository-list { .os-block { - border-top: 1px solid #dddddd; + border-top: 1px solid #ddd; padding-top: 10px; } input[type="text"] { @@ -473,7 +471,7 @@ .ROLLING, .NON_ROLLING { background-color: #e4e4e4; .method-name,.method-icon,.method-description { - color: #333333; + color: #333; } } .ROLLING { @@ -578,7 +576,7 @@ .admin-cluster { .repositories-table { margin-bottom: 10px; - border: 1px solid #dddddd; + border: 1px solid #ddd; overflow: auto; div { float: left; @@ -604,7 +602,7 @@ width: 100%; .trow { width: 100%; - border-top: 1px solid #dddddd; + border-top: 1px solid #ddd; padding-top: 8px; .os-td { padding-top: 4px; @@ -660,8 +658,6 @@ } .textfield-error input { border-color: #b94a48; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .disabled-textfield input { http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/styles/widgets.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/widgets.less b/ambari-web/app/styles/widgets.less index 98d4fb0..af76e4f 100644 --- a/ambari-web/app/styles/widgets.less +++ b/ambari-web/app/styles/widgets.less @@ -244,10 +244,10 @@ } &.slider-disabled { .tooltip-arrow { - border-top-color: lighten(@green, 20%);; + border-top-color: lighten(@green, 20%); } .tooltip-inner { - background-color: lighten(@green, 20%);; + background-color: lighten(@green, 20%); } } } http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs b/ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs index 47dcb2a..ef731b3 100644 --- a/ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs +++ b/ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs @@ -32,7 +32,7 @@ </div> {{#if view.parentView.availableConfigGroups.length}} <div class="select-create-config-group-div"> - <span class="btn-group"> + <div class="btn-group"> <button class="btn btn-default" {{bindAttr disabled="view.parentView.optionCreateConfigGroup"}}>{{view.parentView.selectedConfigGroup.name}}</button> <button class="btn btn-default dropdown-toggle btn-icon" data-toggle="dropdown" {{bindAttr disabled="view.parentView.optionCreateConfigGroup"}}> <span class="caret"></span> @@ -47,7 +47,7 @@ </li> {{/each}} </ul> - </span> + </div> <div class="message">{{t config.group.selection.dialog.option.select.msg}}</div> </div> {{else}} http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/templates/common/host_progress_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/host_progress_popup.hbs b/ambari-web/app/templates/common/host_progress_popup.hbs index 4536ce3..0a7592b 100644 --- a/ambari-web/app/templates/common/host_progress_popup.hbs +++ b/ambari-web/app/templates/common/host_progress_popup.hbs @@ -265,8 +265,8 @@ {{#each hostLog in view.hostComponentLogs}} <div {{bindAttr class=":tab-pane :log-component-tab hostLog.tabClassName"}}> <p {{bindAttr class="view.isClipBoardActive:hidden"}}> - <span class="text-bold">{{t common.file}}: </span> - <span class="text-bold muted">{{hostLog.fileName}}</span> + <strong>{{t common.file}}: </strong> + <strong class="muted">{{hostLog.fileName}}</strong> {{#view App.LogSearchUILinkView linkQueryParamsBinding="hostLog.linkTail" tagName="span"}} <a {{bindAttr href="view.formatedLink" class=":pull-right view.isLodaded::disabled"}} target="_blank"> <i class="icon-external-link"></i> http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/templates/common/modal_popups/log_tail_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/modal_popups/log_tail_popup.hbs b/ambari-web/app/templates/common/modal_popups/log_tail_popup.hbs index 48e5b9d..1b0a6d0 100644 --- a/ambari-web/app/templates/common/modal_popups/log_tail_popup.hbs +++ b/ambari-web/app/templates/common/modal_popups/log_tail_popup.hbs @@ -18,7 +18,7 @@ <div class="top-wrap top-wrap-header"> <div class="log-tail-popup-info"> - <span class="text-bold">{{t common.file}}: </span> + <strong>{{t common.file}}: </strong> <span class="muted">{{view.content.filePath}}</span> <div class="pull-right action-bar"> <a href="#" {{action toggleCopy target="view"}}> http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/templates/login.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/login.hbs b/ambari-web/app/templates/login.hbs index c17c0fe..ed16734 100644 --- a/ambari-web/app/templates/login.hbs +++ b/ambari-web/app/templates/login.hbs @@ -17,7 +17,7 @@ }} {{#unless isServerClientVersionMismatch}} -<div class="well login col-md-4 col-md-offset-4"> +<div class="well login col-md-4 col-md-offset-4 col-sm-offset-4"> <h2>{{t login.header}}</h2> {{#if errorMessage}} <div class="alert alert-danger"> http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/templates/main/alerts/definition_details.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/definition_details.hbs b/ambari-web/app/templates/main/alerts/definition_details.hbs index 7e2e2ed..5789de6 100644 --- a/ambari-web/app/templates/main/alerts/definition_details.hbs +++ b/ambari-web/app/templates/main/alerts/definition_details.hbs @@ -25,10 +25,10 @@ {{! Alert Definition Name }} <div class="definition-name row"> {{#if controller.editing.label.isEditing}} - <div {{bindAttr class="controller.editing.label.isError:error :col-md-5 :name-text-field :form-group"}}> + <div {{bindAttr class="controller.editing.label.isError:error :col-md-8 :name-text-field"}}> {{view Em.TextField valueBinding="controller.editing.label.value" maxlength="255" class="form-control"}} </div> - <div class="edit-buttons"> + <div class="edit-buttons align-right col-md-4"> <button {{action cancelEdit controller.editing.label target="controller"}} class="btn btn-default cancel-button">{{t common.cancel}}</button> <button {{bindAttr disabled="controller.editing.label.isError"}} {{action saveEdit controller.editing.label target="controller"}} @@ -55,7 +55,7 @@ </div> </div> - <div class="status col-md-4"> + <div class="status align-right col-md-4"> {{view App.AlertDefinitionSummary contentBinding="view.controller.content"}} </div> </div> @@ -85,7 +85,7 @@ <div class="panel-body"> {{view App.AlertDefinitionConfigsView contentBinding="view.controller.content" alertDefinitionTypeBinding="view.controller.content.type" canEdit=false}} {{#if App.router.mainAlertDefinitionConfigsController.canEdit}} - <div class="edit-buttons"> + <div class="edit-buttons align-right"> <button {{action cancelEditConfigs target="App.router.mainAlertDefinitionConfigsController"}} class="btn btn-default">{{t common.cancel}}</button> <button {{bindAttr disabled="App.router.mainAlertDefinitionConfigsController.hasErrors"}} {{action saveConfigs target="App.router.mainAlertDefinitionConfigsController"}} http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/templates/main/dashboard/plus_button_filter.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/plus_button_filter.hbs b/ambari-web/app/templates/main/dashboard/plus_button_filter.hbs index a8792fe..df7714c 100644 --- a/ambari-web/app/templates/main/dashboard/plus_button_filter.hbs +++ b/ambari-web/app/templates/main/dashboard/plus_button_filter.hbs @@ -16,15 +16,12 @@ * limitations under the License. }} -<ul class="dropdown-menu" > {{#if view.hiddenWidgets.length}} <li class="add-widgets-dropdown-list"> <ul> {{#each widget in view.hiddenWidgets}} <li> - <div class="checkbox"> - {{view view.widgetCheckbox checkedBinding="widget.checked" labelBinding="widget.displayName"}} - </div> + {{view view.widgetCheckbox class="checkbox" checkedBinding="widget.checked" labelBinding="widget.displayName"}} </li> {{/each}} </ul> @@ -36,11 +33,10 @@ {{else}} <li> <ul> - <li>{{t dashboard.widgets.nothing}}</li> + <li>{{t dashboard.widgets.nothing}}</li> </ul> </li> <li> <button class="btn btn-default" {{action "closeFilter" target="view"}}>{{t common.cancel}}</button> </li> {{/if}} -</ul> http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/templates/main/dashboard/widgets/yarn_links.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/widgets/yarn_links.hbs b/ambari-web/app/templates/main/dashboard/widgets/yarn_links.hbs index e346abd..a8612f7 100644 --- a/ambari-web/app/templates/main/dashboard/widgets/yarn_links.hbs +++ b/ambari-web/app/templates/main/dashboard/widgets/yarn_links.hbs @@ -48,7 +48,7 @@ {{#if view.model.quickLinks.length}} {{#view App.QuickLinksView contentBinding="view.model"}} <div class="btn-group"> - <button class="btn btn-xs dropdown-toggle" data-toggle="dropdown" href="#"> + <button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" href="#"> {{t common.more}} <span class="caret"></span> </button> http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/templates/main/host/summary.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/summary.hbs b/ambari-web/app/templates/main/host/summary.hbs index 98619be..5d0b09c 100644 --- a/ambari-web/app/templates/main/host/summary.hbs +++ b/ambari-web/app/templates/main/host/summary.hbs @@ -164,7 +164,7 @@ <div class="col-md-4 summary-label summary-rack-label">{{t common.rack}}:</div> <div class="col-md-8 summary-rack-value"> {{formatWordBreak view.content.rack}} {{#isAuthorized "HOST.TOGGLE_MAINTENANCE"}} - <a class="set-rack-id" {{action setRackId view.content target="controller"}}><i + <a href="#" class="set-rack-id" {{action setRackId view.content target="controller"}}><i class="glyphicon glyphicon-pencil"></i></a> {{/isAuthorized}} </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs b/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs index fe6bf8a..12b08d7 100644 --- a/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs +++ b/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs @@ -67,15 +67,15 @@ </div> </div> <div class="row"> - <div class="col-md-2 col-lg-2">{{t common.overrides}}</div> - <div class="col-md-10 col-lg-10"> + <div class="col-md-3 col-lg-3 align-right">{{t common.overrides}}</div> + <div class="col-md-9 col-lg-9"> <a href="#" class="properties-link" {{action showProperties target="controller"}} {{bindAttr data-original-title="tooltipText" }}>{{selectedConfigGroup.properties.length}} {{t common.properties}}</a> </div> </div> <div class="row"> - <div class="col-md-2 col-lg-2"><span class="prrl">{{t common.description}}</span></div> - <div class="col-md-10 col-lg-10 group-description">{{selectedConfigGroup.description}}</div> + <div class="col-md-3 col-lg-3 align-right">{{t common.description}}</div> + <div class="col-md-9 col-lg-9 group-description">{{selectedConfigGroup.description}}</div> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/templates/main/service/services/flume.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/services/flume.hbs b/ambari-web/app/templates/main/service/services/flume.hbs index d9f053a..1e57cd5 100644 --- a/ambari-web/app/templates/main/service/services/flume.hbs +++ b/ambari-web/app/templates/main/service/services/flume.hbs @@ -22,7 +22,7 @@ <a href="#" {{action filterHosts view.flumeHandlerComponent}}>{{view.summaryHeader}}</a> <a href="#" class="pull-right" {{action gotoConfigs target="controller"}}>{{t dashboard.services.flume.summary.configure}}</a> <div id="flume-agent-table-wrap" class="scrollable-container"> - <table class="table table-hover table-bordered table-striped" id="flume-agents-table"> + <table class="table table-hover advanced-header-table table-bordered table-striped" id="flume-agents-table"> <thead> {{#view view.sortView contentBinding="view.filteredContent" class="label-row"}} {{view view.parentView.hostSort}} @@ -130,7 +130,7 @@ {{/each}} {{else}} <tr> - <td colspan="6" id="flume-agents-empty-label" class="empty-label"> + <td colspan="5" id="flume-agents-empty-label" class="empty-label"> {{t services.service.summary.flume.noAgents}} </td> </tr> http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/templates/main/views.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/views.hbs b/ambari-web/app/templates/main/views.hbs index 7fb3bf8..299c98c 100644 --- a/ambari-web/app/templates/main/views.hbs +++ b/ambari-web/app/templates/main/views.hbs @@ -25,11 +25,10 @@ {{#if instance.visible}} <tr {{action "setView" instance target="controller"}}> <td class="icon"> - <a class="view-icon-image" target="_blank"><img {{bindAttr src="instance.iconPath"}}></a> + <a class="view-icon-image"><img {{bindAttr src="instance.iconPath"}}></a> </td> <td class="label-version-description"> - <p class="view-label-text">{{instance.label}}</p> - <p class="view-version-text"> ({{instance.version}})</p> <br /> + <h4 class="view-label-text">{{instance.label}} <small class="view-version-text"> ({{instance.version}})</small></h4> <p class="view-description-text">{{instance.description}}</p> </td> </tr> http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/templates/wizard/step3.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/wizard/step3.hbs b/ambari-web/app/templates/wizard/step3.hbs index 07cf7f2..64c76ef 100644 --- a/ambari-web/app/templates/wizard/step3.hbs +++ b/ambari-web/app/templates/wizard/step3.hbs @@ -30,13 +30,13 @@ <button class="btn btn-primary step3-remove-selected-btn" {{bindAttr disabled="view.noHostsSelected"}} {{action removeSelectedHosts target="controller" }}> <i class="glyphicon glyphicon-trash glyphicon-white"></i> - {{t installer.step3.removeSelected}} + <span class="hidden-sm">{{t installer.step3.removeSelected}}</span> </button> {{/unless}} {{#unless isRetryDisabled}} <a class="btn btn-primary decommission" href="#" {{action retrySelectedHosts target="view"}}> <i class="glyphicon glyphicon-repeat glyphicon-white"></i> - {{t installer.step3.retryFailed}} + <span class="hidden-sm">{{t installer.step3.retryFailed}}</span> </a> {{/unless}} http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/app/views/main/dashboard/widgets.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/dashboard/widgets.js b/ambari-web/app/views/main/dashboard/widgets.js index 57f5f50..f4603a2 100644 --- a/ambari-web/app/views/main/dashboard/widgets.js +++ b/ambari-web/app/views/main/dashboard/widgets.js @@ -228,6 +228,8 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, App.LocalStorage, Ap * @class */ plusButtonFilterView: Ember.View.extend({ + tagName: 'ul', + classNames: ['dropdown-menu'], templateName: require('templates/main/dashboard/plus_button_filter'), hiddenWidgetsBinding: 'parentView.hiddenWidgets', visibleWidgetsBinding: 'parentView.visibleWidgets', http://git-wip-us.apache.org/repos/asf/ambari/blob/07cde1d7/ambari-web/test/mixins/common/hosts/host_component_recommendation_mixin_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/mixins/common/hosts/host_component_recommendation_mixin_test.js b/ambari-web/test/mixins/common/hosts/host_component_recommendation_mixin_test.js index 2e95a06..15bddd0 100644 --- a/ambari-web/test/mixins/common/hosts/host_component_recommendation_mixin_test.js +++ b/ambari-web/test/mixins/common/hosts/host_component_recommendation_mixin_test.js @@ -17,6 +17,7 @@ */ var App = require('app'); +var helpers = require('test/helpers'); describe('App.HostComponentRecommendationMixin', function() { var mixedObject; @@ -25,7 +26,7 @@ describe('App.HostComponentRecommendationMixin', function() { }); describe('#formatRecommendComponents', function() { - var cases = [ + [ { components: undefined, hosts: [], @@ -51,9 +52,7 @@ describe('App.HostComponentRecommendationMixin', function() { Em.Object.create({ componentName: 'C2', hostName: 'h3'}), ] } - ]; - - cases.forEach(function(test) { + ].forEach(function(test) { it(test.m, function() { expect(mixedObject.formatRecommendComponents(test.components, test.hosts)).to.be.eql(test.e); }); @@ -61,7 +60,6 @@ describe('App.HostComponentRecommendationMixin', function() { }); describe('#getRecommendedHosts', function() { - var cases; beforeEach(function() { sinon.stub(mixedObject, 'loadComponentsRecommendationsFromServer'); sinon.stub(mixedObject, 'getRecommendationRequestData'); @@ -74,7 +72,7 @@ describe('App.HostComponentRecommendationMixin', function() { mixedObject.formatRecommendComponents.restore(); }); - cases = [ + [ { opts: null, e: { @@ -100,9 +98,7 @@ describe('App.HostComponentRecommendationMixin', function() { }, m: 'should normaly merge defaults with passed options' } - ]; - - cases.forEach(function(test) { + ].forEach(function(test) { it(test.m, function() { mixedObject.getRecommendedHosts(test.opts); expect(mixedObject.getRecommendationRequestData.args[0][0]).to.be.eql(test.e); @@ -113,7 +109,8 @@ describe('App.HostComponentRecommendationMixin', function() { describe('#loadComponentsRecommedationsFromServer', function() { it('default request options checking', function() { mixedObject.loadComponentsRecommendationsFromServer('someData'); - expect(App.ajax.send.args[0][0]).to.be.eql({ + var args = helpers.findAjaxRequest('name', 'wizard.loadrecommendations'); + expect(args[0]).to.be.eql({ name: 'wizard.loadrecommendations', sender: mixedObject, data: 'someData', @@ -124,14 +121,13 @@ describe('App.HostComponentRecommendationMixin', function() { }); describe('#getRecommendationRequestData', function() { - var cases; beforeEach(function() { sinon.stub(App, 'get').withArgs('stackVersionURL').returns('/stack/url'); }); afterEach(function() { App.get.restore(); }); - cases = [ + [ { options: { hosts: ['h1'], @@ -177,9 +173,7 @@ describe('App.HostComponentRecommendationMixin', function() { }, m: 'when blueprint passed it should be used instead of generated blueprint' } - ]; - - cases.forEach(function(test) { + ].forEach(function(test) { it(test.m, function() { expect(mixedObject.getRecommendationRequestData(test.options)).to.be.eql(test.e); });
