AMBARI-18861. Remove redundant css (part 1) (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2d948db3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2d948db3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2d948db3 Branch: refs/heads/trunk Commit: 2d948db3195286d7ee9eb7fe610628c9993ed865 Parents: 5dea886 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Fri Nov 11 13:50:24 2016 +0200 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Fri Nov 11 13:50:24 2016 +0200 ---------------------------------------------------------------------- ambari-web/app/controllers/application.js | 4 +- ambari-web/app/models/host_component.js | 2 +- ambari-web/app/styles/application.less | 937 +++---------------- ambari-web/app/styles/common.less | 148 ++- ambari-web/app/styles/config_history_flow.less | 36 +- ambari-web/app/styles/stack_versions.less | 3 +- ambari-web/app/templates/application.hbs | 65 +- ambari-web/app/templates/common/about.hbs | 6 +- .../common/assign_master_components.hbs | 10 +- ambari-web/app/templates/login.hbs | 2 +- .../app/templates/main/alerts/configs.hbs | 50 +- .../main/alerts/definition_details.hbs | 66 +- .../app/templates/main/charts/heatmap.hbs | 10 +- .../templates/main/charts/heatmap_dropdown.hbs | 7 +- .../templates/main/dashboard/config_history.hbs | 2 +- ambari-web/app/templates/main/host/configs.hbs | 6 +- .../templates/main/host/delete_hosts_popup.hbs | 2 +- .../main/host/details/doDeleteHostPopup.hbs | 2 +- ambari-web/app/templates/main/host/summary.hbs | 81 +- .../main/service/all_services_actions.hbs | 2 - .../main/service/info/heatmap_dropdown.hbs | 7 +- .../wizard/step1_addLocalRepository.hbs | 2 +- ambari-web/app/templates/wizard/step2.hbs | 105 ++- ambari-web/app/templates/wizard/step3.hbs | 3 +- ambari-web/app/views/main/menu.js | 2 +- 25 files changed, 462 insertions(+), 1098 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/controllers/application.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/application.js b/ambari-web/app/controllers/application.js index 4bd09c3..df0a8e8 100644 --- a/ambari-web/app/controllers/application.js +++ b/ambari-web/app/controllers/application.js @@ -93,14 +93,14 @@ App.ApplicationController = Em.Controller.extend(App.UserPref, { } if (upgradeHolding) { return { - cls: 'upgrade-in-holding', + cls: 'upgrade-holding', icon: 'glyphicon-pause', msg: Em.I18n.t('admin.stackVersions.version.' + typeSuffix + '.pause') } } if (upgradeSuspended) { return { - cls: 'upgrade-in-holding', + cls: 'upgrade-aborted', icon: 'glyphicon-pause', msg: Em.I18n.t('admin.stackVersions.version.' + typeSuffix + '.suspended') } http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/models/host_component.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/host_component.js b/ambari-web/app/models/host_component.js index 76d1023..d408bfd 100644 --- a/ambari-web/app/models/host_component.js +++ b/ambari-web/app/models/host_component.js @@ -250,7 +250,7 @@ App.HostComponentStatus = { case this.disabled: return 'Disabled'; case this.init: - return 'Install Pending...'; + return 'Install Pending'; } return 'Unknown'; }, http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 9d7d949..3d2375e 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -21,6 +21,7 @@ body { overflow-y: scroll; + line-height: 1.3em; } html, body { @@ -46,20 +47,10 @@ body.modal-open { padding-right: 0 !important; } -.glyphicon-2x{font-size: 2em;} -.glyphicon-3x{font-size: 3em;} -.glyphicon-4x{font-size: 4em;} -.glyphicon-5x{font-size: 5em;} - -body.modal-open { - //fix bootstrap padding when modal opened - padding-right: 0 !important; -} - @-moz-document url-prefix() { -input[type="file"] { - line-height: 25px!important; -} + input[type="file"] { + line-height: 25px!important; + } } ul.typeahead.dropdown-menu { @@ -70,11 +61,6 @@ select.form-control { display: inline-block; } -// Override bootstrap class to ensure that popover content will fit to popover window -.popover-content { - word-break: break-word; -} - #wrapper { min-height: 100%; } @@ -100,7 +86,7 @@ footer { border-top: 1px solid #e5e5e5; padding: 30px 0; background-color: #fff; - color: #666666; + color: #666; margin-top: -1 * @footer-height - 1; height: @footer-height - 60px; } @@ -113,9 +99,6 @@ footer { background-color: #b94a48!important; } -.alert { - padding: 8px 35px 8px 14px; -} .form-control { height: 30px; float: none; @@ -126,8 +109,8 @@ table.diff { .replace, .insert, .empty { float: none; width: 50%; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; } } @@ -164,63 +147,35 @@ table.diff { text-decoration: none; } .upgrade-in-progress { - text-shadow: none; - background-color: #006DCC; - -webkit-animation-name: greenPulse; - -webkit-animation-duration: 1s; - -webkit-animation-iteration-count: infinite; - -moz-animation-name: greenPulse; - -moz-animation-duration: 1s; - -moz-animation-iteration-count: infinite; - animation-name: greenPulse; - animation-duration: 1s; - animation-iteration-count: infinite; + .infoPulse; } .upgrade-holding { - text-shadow: none; - background-color: @health-status-orange; - -webkit-animation-name: orangePulse; - -webkit-animation-duration: 1s; - -webkit-animation-iteration-count: infinite; - -moz-animation-name: orangePulse; - -moz-animation-duration: 1s; - -moz-animation-iteration-count: infinite; - animation-name: orangePulse; - animation-duration: 1s; - animation-iteration-count: infinite; + .warnPulse; } .upgrade-aborted { - text-shadow: none; - background-color: @health-status-red; - -webkit-animation-name: redPulse; - -webkit-animation-duration: 1s; - -webkit-animation-iteration-count: infinite; - -moz-animation-name: redPulse; - -moz-animation-duration: 1s; - -moz-animation-iteration-count: infinite; - animation-name: redPulse; - animation-duration: 1s; - animation-iteration-count: infinite; + .dangerPulse; .glyphicon-remove { color: #fff; } } } +.alerts-crit-count { + margin-left: 0; + background: @health-status-red; + cursor: pointer; +} -#top-nav { - - .navbar { - margin-bottom: 0; - } +.alerts-warn-count { + margin-left: 0; + background: @health-status-orange; + cursor: pointer; +} - .navbar-nav { - margin: 0; - } +#top-nav { .navbar.navbar-static-top { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; background-image: -moz-linear-gradient(top, @top-nav-bg-color-from, @top-nav-bg-color-to); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@top-nav-bg-color-from), to(@top-nav-bg-color-to)); background-image: -webkit-linear-gradient(top, @top-nav-bg-color-from, @top-nav-bg-color-to); @@ -230,39 +185,36 @@ table.diff { -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); - height: 41px; - min-height: 40px; .navbar-text.brand-wrapper { - margin-top: 0; color: @top-nav-brand-color; font-size: 16px; font-weight: normal; - line-height: 32px; - margin-left: 0; - padding: 2px 5px 0 10px; - text-shadow: 0 1px 0 #555555; - float: left; - margin-right: 15px; + text-shadow: 0 1px 0 #555; a, a:hover, a:active, a:visited { color: @top-nav-brand-color; text-decoration: none; } - .label.alert-crit-count { - background-color: @health-status-red; - } - .label.alert-warn-count { - background-color: @health-status-orange; - } - .label.alerts-none-count { - cursor: default; + .ambari-link { + margin-left: 25px; } .label { - padding: 3px 5px 3px; color: @top-nav-ops-count-color; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: @top-nav-ops-count-bg-color; + &.operations-count { + .infoPulse; + } + &.alert-crit-count { + background-color: @health-status-red; + } + &.alert-warn-count { + background-color: @health-status-orange; + } + &.alerts-none-count { + cursor: default; + } } .icon-caret-left { color: @top-nav-ops-count-bg-color; @@ -272,16 +224,7 @@ table.diff { .ops-count { margin-right: -1px; color: #006DCC; - text-shadow: none; - -webkit-animation-name: greenPulseInner; - -webkit-animation-duration: 1s; - -webkit-animation-iteration-count: infinite; - -moz-animation-name: greenPulseInner; - -moz-animation-duration: 1s; - -moz-animation-iteration-count: infinite; - animation-name: greenPulseInner; - animation-duration: 1s; - animation-iteration-count: infinite; + .infoPulseInner; } } a:hover { @@ -291,87 +234,29 @@ table.diff { .logo { img { height: 32px; + width: 32px; + position: absolute; + top: 8px; } } - .label.operations-count { - background-color: #006DCC; - -webkit-animation-name: greenPulse; - -webkit-animation-duration: 1s; - -webkit-animation-iteration-count: infinite; - -moz-animation-name: greenPulse; - -moz-animation-duration: 1s; - -moz-animation-iteration-count: infinite; - animation-name: greenPulse; - animation-duration: 1s; - animation-iteration-count: infinite; - } - .label.alert-crit-count { - background-color: @health-status-red; - } - .label.alert-warn-count { - background-color: @health-status-orange; - } - .label.alerts-none-count { - cursor: default; - } .alerts-label { margin-left: 5px; display: inline-block; } - .label { - //padding: 3px 5px 3px; - color: @top-nav-ops-count-color; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: @top-nav-ops-count-bg-color; - } + .icon-caret-left { color: @top-nav-ops-count-bg-color; margin-right: -1px; text-shadow: none; } - .ops-count { - margin-right: -1px; - color: #006DCC; - text-shadow: none; - -webkit-animation-name: greenPulseInner; - -webkit-animation-duration: 1s; - -webkit-animation-iteration-count: infinite; - -moz-animation-name: greenPulseInner; - -moz-animation-duration: 1s; - -moz-animation-iteration-count: infinite; - animation-name: greenPulseInner; - animation-duration: 1s; - animation-iteration-count: infinite; - } .cluster-name { margin-left: 20px; } - ul.top-nav-menu.nav { - padding-left: 5px; - li>a { - padding: 10px 15px 10px; - } - } - - @media (max-width: 1200px) { - ul.top-nav-menu.nav li>a { - padding: 10px 10px 10px; - } - } - .top-nav-menu.nav { - display: block; - float: right; - padding-left: 20px; - overflow: visible; - - & > li { - display: inline-block; - } - + padding-right: 20px; li > a { text-shadow: none; color: @top-nav-menu-text-color; @@ -390,28 +275,10 @@ table.diff { text-decoration: none; background-color: transparent; } - .alerts-crit-count { - margin-left: 0; - background: @health-status-red; - cursor: pointer; - } - .alerts-warn-count { - margin-left: 0; - background: @health-status-orange; - cursor: pointer; - } .glyphicon-th { font-size: 1.1em; } - .top-nav-dropdown { - @media (min-width: 768px) { - .views-button-container { - padding-bottom: 10px; - } - } - } - li.top-nav-dropdown { position: relative; } @@ -456,12 +323,6 @@ table.diff { float: right; margin-right: 5px; margin-top: 3px; - &.alerts-crit-count { - background: @health-status-red; - } - &.alerts-warn-count { - background: @health-status-orange; - } } } .top-nav-dropdown-menu > li{ @@ -485,9 +346,9 @@ table.diff { background-color: #e5e5e5; } .top-nav-dropdown-menu > li > a:hover { - color: #ffffff; - background-color: #666666; - background-image: linear-gradient(to bottom, #666666, #555555); + color: #fff; + background-color: #666; + background-image: linear-gradient(to bottom, #666, #555); background-repeat: repeat-x; } .top-nav-dropdown-menu > li.disabled > a { @@ -502,24 +363,14 @@ table.diff { } } - .top-nav-user { - float: right; - margin-left: 10px; - .navbar-btn { - margin-bottom: 0; - margin-top: 3px; - } - } .navbar .nav .top-nav-user .active > a, .navbar .nav .top-nav-user .active > a:hover { - color: #FFFFFF; + color: #fff; text-decoration: none; } .navbar .nav .top-nav-user > li > a { border-radius: 8px; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; font-size: 13px; font-weight: bold; line-height: 19px; @@ -531,7 +382,7 @@ table.diff { .navbar .nav .top-nav-user > li > a:hover { background-color: transparent; - color: #999999; + color: #999; text-decoration: none; } @@ -592,35 +443,7 @@ table.diff { #version-mismatch-title { font-size: 18px; font-weight: bold; - margin: 10px 0 10px 0; -} - -#main-nav { - - li { - font-size: 15px; - border-left: 1px solid #fefefe; - border-right: 1px solid #f0f0f0; - text-align: center; - } - li.col-md-2 { - padding: 0; - margin: 0; - width: 140px; - } - - li:first-child { - border-left: none; - a { - border-radius: 4px 0 0 4px; - } - } - - .navbar-inner { - padding-left: 0; - } - - margin-bottom: 15px; + margin: 10px 0; } .pre-scrollable { @@ -631,20 +454,11 @@ h1 { color: @green; } -.login.well.col-md-4 { - margin: 20px auto; - padding: 25px; - float: none; -} - .login { h2 { margin-top: 0; margin-bottom: 20px; } - .btn { - margin-top: 15px; - } } .hide, .hidden { @@ -659,11 +473,11 @@ h1 { * Ambari wide icon colors ***************/ .glyphicon-ok { - color: #5AB400; + color: @health-status-green; } .glyphicon-warning-sign { - color: #FDB82F; + color: @restart-indicator-color; } .glyphicon-empty { @@ -725,9 +539,12 @@ h1 { } } -.arrow-right { +.arrow() { cursor: pointer; display: inline-block; +} +.arrow-right { + .arrow(); margin: 0 0 20px 70px; border-top: 70px solid transparent; border-bottom: 70px solid transparent; @@ -735,8 +552,7 @@ h1 { } .arrow-left { - cursor: pointer; - display: inline-block; + .arrow(); margin: 0 -10px 20px 3px; border-top: 70px solid transparent; border-bottom: 70px solid transparent; @@ -745,8 +561,7 @@ h1 { .arrow-up { - cursor: pointer; - display: inline-block; + .arrow(); border-left: 70px solid #dedede; border-bottom: 15px solid #dedede; border-right: 70px solid #dedede; @@ -755,8 +570,7 @@ h1 { } .arrow-down { - cursor: pointer; - display: inline-block; + .arrow(); border-left: 70px solid #dedede; border-top: 15px solid #dedede; border-right: 70px solid #dedede; @@ -775,12 +589,7 @@ h1 { } .wizard { - h2 { - margin-top: 0; - } - .btn.btn-success { - /* float: right; */ - } + .btn-extra-info{ padding-top: 6px; padding-right: 15px; @@ -808,61 +617,12 @@ h1 { } #installOptions { - .sshKey-file-view { - width: 486px; - height: 200px; - overflow-y: auto; - border: 1px solid #ccc; - margin-top: 5px; - padding: 8px; - font-family: Consolas, "Liberation Mono", Courier, monospace; - } - .sshKey-file-view.disabled { - background-color: #eee; - } - .manual-install { - margin-top: 10px; - width: 504px; - height: auto; - } .ssh-user, .ssh-port { padding-top: 5px; } - #targetHosts { - .target-hosts-input { - padding-left: 18px; - } - } - .col-md-6 { - min-width: 504px; - } - #hostConnectivity { - margin-top: 20px; - .control-group { - margin-bottom: 0; - } - } - .advancedOptions { - margin-top: 20px; - margin-bottom: 30px; - label { - margin-bottom: 10px; - } - label.disabled { - color: #ccc; - } - } - .java-home { - margin-bottom: 10px - } - .ssh-key-input { - padding-left: 18px; - } - .ssh-key-input-indentation { - margin-bottom: 5px; - } + #sshKey { - color: #000000; + color: #000; font-family: "Courier New","courier"; font-size: 0.9em; } @@ -892,39 +652,35 @@ h1 { } #host-filter { - margin-top: 1px; + ul { margin: 3px; 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: #666666; + 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); - -webkit-border-radius: 5px; - -moz-border-radius: 5px; border-radius: 5px; } li.filter-status:hover { background-color: #d8d8d8; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; border-radius: 5px; } li.divider { - color: #666666; + color: #666; padding: 4px 2px; } li { list-style: none; display: block; float: left; - padding: 4px 4px; + padding: 4px; a { text-decoration: underline; } @@ -964,19 +720,8 @@ h1 { .glyphicon-asterisks { color: #00688B; } - th { - input { - margin-right: 5px; - } - } } #step6 { - a.remove-link { - text-decoration:none; - pointer-events: none; - color:black; - cursor: default; - } .pre-scrollable { max-height: 440px; position: relative; @@ -1027,29 +772,25 @@ h1 { } li.filter-status.active, li.filter-status.active:hover { - background-color: #666666; + 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); - -webkit-border-radius: 5px; - -moz-border-radius: 5px; border-radius: 5px; } li.filter-status:hover { background-color: #d8d8d8; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; border-radius: 5px; } li.divider { - color: #666666; + color: #666; padding: 4px 2px; } li { list-style: none; display: block; float: left; - padding: 4px 4px; + padding: 4px; a { text-decoration: underline; } @@ -1255,10 +996,13 @@ h1 { padding: 5px; margin-left: -5px; } - .checkbox.list-inline { - vertical-align: baseline; - &>.ember-checkbox{ - margin-left: -14px; + .checkbox { + line-height: 0.8em; + &.list-inline { + vertical-align: baseline; + &>.ember-checkbox{ + margin-left: -14px; + } } } } @@ -1270,9 +1014,6 @@ h1 { } .entry-row { margin: 0; - // .control-label-span{ - // width: auto !important; - // } .glyphicon-lock { color: #008000; } @@ -1296,8 +1037,6 @@ h1 { .overridden-hosts-view { display: inline-block; } - .error { - } &>.ember-checkbox{ margin-bottom: 5px; } @@ -1310,48 +1049,12 @@ h1 { .badge { margin-left: 4px; } - .slave-component-group-menu { - float: left; - .nav { - margin-bottom: 10px; - } - .nav li { - position: relative; - a { - padding-right: 24px; - } - .glyphicon-remove { - border: 1px solid white; - position: absolute; - right: 7px; - top: 10px; - z-index: 2; - cursor: default; - color: #555555; - } - .glyphicon-remove:hover { - border: 1px solid grey; - } - } - } - .remove-group-error { - display: none; - } - .add-slave-component-group { - margin-bottom: 10px; - } + .master-host, .master-hosts, .slave-hosts { padding-top: 5px; line-height: 20px; } - #attention { - margin: 20px 0; - } - #slave-hosts-popup { - ul { - list-style-type: none; - } - } + .enhanced-config-tab-content { .action { display: inline-block; @@ -1365,7 +1068,7 @@ h1 { cursor: pointer; } .glyphicon-plus-sign { - color: #5AB400; + color: @health-status-green; margin-right: 2px; } .glyphicon-minus-sign { @@ -1442,14 +1145,7 @@ h1 { width: 12px; height: 12px; } - #section_label{ - display: none; - border: 1px solid black; - padding: 2px 5px; - position: absolute; - border-radius: 3px; - background-color: #f9f9f9; - } + .frame{ position:relative; width: 200px; @@ -1779,7 +1475,7 @@ a:focus { vertical-align: middle; } .pending, .queued { - color: #999999; + color: #999; } .in_progress { color: #367FE6; @@ -1790,10 +1486,7 @@ a:focus { .failed { color: #DF5F5F; } - .aborted { - color: #FF9C09; - } - .timedout { + .aborted, .timedout { color: #FF9C09; } } @@ -2061,38 +1754,6 @@ a:focus { padding: 4px; } } - .dashboard-mini-chart > div { - width: 172px; - } - .dashboard-mini-chart { - right: 0; - float: right; - top: 7px; - position: absolute; - overflow: visible; // for quick links - text-align: center; //width: 180px; - height: 200px; - .dropdown-menu { - text-align: left; - } - .chart-container { - .chart-x-axis { - left: 0; - width: 100%; - text-align: left; - } - } - .chartLabel { - font-size: 11px; - color: #7b7b7b; - } - .chart-legend { - left: -205px; - text-align: left; - top: 0; - width: 185px; - } - } } } @@ -2104,7 +1765,7 @@ a:focus { height: 20px; width: 20px; margin-left: 0; - display: list-inline !important; + display: inline !important; float: none !important; } .STARTING, .STARTED { @@ -2307,14 +1968,6 @@ a:focus { /*end alerts summary*/ /*Alerts popup*/ -.alertsPopupLinks { - padding: 20px 40px 0; - text-align: right; - - a:first-child { - float: left; - } -} .align-center { text-align: center; @@ -2486,14 +2139,6 @@ a:focus { font-size: @smaller-font-size; } -.mini-chart { - position: absolute; - .chart-container { - width: 130px; - height: 130px; - } -} - /*end chart/graph styles*/ /*****end styles for dashboard page*****/ @@ -2537,12 +2182,6 @@ a:focus { float: right; margin-right: 1px; margin-top: 3px; - &.alerts-crit-count { - background: @health-status-red; - } - &.alerts-warn-count { - background: @health-status-orange; - } } } @@ -3110,7 +2749,6 @@ table.graphs { #hosts { .bulk-menu { - a { &.disabled { color: gray; @@ -3142,7 +2780,7 @@ table.graphs { background-repeat: no-repeat; height: 20px; width: 13px; - display: list-inline !important; + display: inline !important; float: none !important; } .health-status-HEALTHY, @@ -3309,15 +2947,15 @@ table.graphs { } ul.filter-components { padding: 5px 0; - background: #777777; - color: #ffffff; + background: #777; + color: #fff; font-weight: normal; font-size: 12px; label { font-size: 12px; } li.active-filter { - background-color: #777777; + background-color: #777; } li { display: block; @@ -3334,18 +2972,18 @@ table.graphs { text-align: left; border-bottom: 1px solid #e4e4e4; a.close { - background: #777777; + background: #777; display: inline; - color: #ffffff; + color: #fff; padding-left: 35px; padding-right: 12px; - text-shadow: 0 1px 0 #ffffff; + text-shadow: 0 1px 0 #fff; float: none; font-size: 10px; opacity: 0.6; } a.close:hover { - background: #777777; + background: #777; opacity: 1.0; } } @@ -3437,14 +3075,6 @@ table.graphs { } } } - .expander { - .glyphicon-caret-right, .glyphicon-caret-down { - vertical-align: middle; - margin-right: 5px; - margin-bottom: 2px; - text-decoration: none; - } - } .collapsed-list { padding-left: 10px; } @@ -3510,41 +3140,27 @@ table.graphs { .host-maintenance-notice { background-color: #E4E4E4; border: 1px solid #D4D4D4; - color: #333333; + color: #333; padding: 8px 35px 8px 14px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; border-radius: 4px; } } - /* - .component-operation-button { - background-color: #E5E5E5; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#E5E5E5), to(#F1F1F1)); - background-image: -webkit-linear-gradient(top, #E5E5E5, #F1F1F1); - background-image: -o-linear-gradient(top, #E5E5E5, #F1F1F1); - background-image: linear-gradient(to bottom, #E5E5E5, #F1F1F1); - background-image: -moz-linear-gradient(top, #E5E5E5, #F1F1F1); - background-repeat: repeat-x; - color: #000000; - } - */ .caret { - border-top-color: #000000; - border-bottom-color: #000000; + border-top-color: #000; + border-bottom-color: #000; } .marker { background-repeat: no-repeat; height: 13px; width: 13px; - display: list-inline !important; + display: inline !important; float: none !important; } .components-health.glyphicon-arrow-up{ - color:red; + color:@health-status-red; } .health-status-started, .health-status-starting { @@ -3577,7 +3193,7 @@ table.graphs { } .health-status-color-red { - color:#ff0000; + color: @health-status-red; } .health-status-DEAD-ORANGE { @@ -3590,38 +3206,14 @@ table.graphs { color: @health-status-yellow; } - .back { - display: block; - width: 105px; - margin-bottom: 5px; - } - - hr { - margin-bottom: 0; - clear: both; - } - - .content { - padding: 10px 0; - } - - .host-configuration .dl-horizontal { - margin-top: 14px; - dt { - width: 120px; - line-height: 20px; - } - dd { - margin-left: 100px; - line-height: 20px; + .host-details-summary-list { + .summary-label { + text-align: right; + font-weight: 700; } } .host-metrics { - [class*="span"] { - float: left; - margin: 0; - } .chart-container { .chart-x-axis { left: 30%; @@ -3666,31 +3258,8 @@ table.graphs { &>.row { padding-bottom: 10px; } - .btn-group { - //hack to apply style only for firefox - white-space: normal; - margin: 0 5px 10px 0; - & > .btn { - width: 140px; - } - .component-text-status { - cursor: default; - display: block; - padding: 3px 20px; - clear: both; - font-weight: normal; - line-height: 20px; - color: #333; - white-space: nowrap; - font-style: italic; - } - } } - .host-tab-content, - .logs-tab-content { - margin-top: 20px; - } .logs-tab-content { a.external-link { font-size: @smaller-font-size; @@ -3701,23 +3270,12 @@ table.graphs { font-size: 14px; } } - td.align-center { - text-align: center; - } .logs-tab-content { .table { table-layout: auto; } } - .host-configs { - margin-left: 0; - } - #host-details-summary-alerts { - .label { - background-color: #999999; - } - } } .services-menu { @@ -3730,61 +3288,19 @@ table.graphs { .glyphicon-refresh { color: @restart-indicator-color; } - .alerts-crit-count { - margin-left: 0; - background: @health-status-red; - } - .alerts-warn-count { - margin-left: 0; - background: @health-status-orange; - } } #hosts{ .glyphicon-refresh { color: @restart-indicator-color; } .alerts-crit-count { - margin-left: 0; - background: @health-status-red; - cursor: pointer; float: right; } .alerts-warn-count { - margin-left: 0; - background: @health-status-orange; - cursor: pointer; float: right; } } -.background-operations { - .progress { - margin-bottom: 5px; - .bar { - width: 100%; - } - } - .open-details { - clear: left; - display: block; - float: left; - text-decoration: none; - width: 16px; - } - .operation-details { - padding-left: 16px; - padding-top: 5px; - display: none; - } - margin-bottom: 10px; -} - -.background-operations.is-open { - .operation-details { - display: block; - } -} - /*End Hosts*/ /*Start Admin*/ @@ -3796,21 +3312,10 @@ table.graphs { margin-left: 20px } -.admin-misc { - .col-md-6 { - padding-left: 0; - } -} - .admin-auto-start { - .col-md-6 { - margin-left: 0 !important; - } - .bootstrap-switch { margin-left: 20px; } - .nav i { margin-top: 0; color: @green; @@ -3831,15 +3336,6 @@ table.graphs { /*End Admin*/ /* Start Admin Access*/ -#access{ - .checkbox{ - margin: 0; - } - .acces-values{ - padding-bottom: 15px; - } -} - .ha-btn { margin-left: 0; } @@ -3851,16 +3347,9 @@ table.graphs { /*Start About*/ .about { - .logo { - width: 20%; - float: left; - } - .content { - float: left; - .project { - font-weight: bold; - font-size: 2em; - } + .project { + font-weight: bold; + font-size: 2em; } } /*End About*/ @@ -3879,54 +3368,39 @@ table.graphs { padding-top: 5px; } - .round-corners { - border-radius: 8px; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - } - .remaining-hosts { padding: 25px; - border-top: solid 1px #cccccc; - border-left: solid 1px #cccccc; - border-right: groove 5px #cccccc; - border-bottom: groove 5px #cccccc; + border-top: solid 1px #ccc; + border-left: solid 1px #ccc; + border-right: groove 5px #ccc; + border-bottom: groove 5px #ccc; margin-top: 20px; background-color: #FCF8E3; color: #C09853; } .host-assignments .mapping-box { - border: solid 1px #cccccc; + border: solid 1px #ccc; padding: 8px; margin-bottom: 10px; background-color: #fafafa; } - .host-assignments .assignedService { - padding: 2px 8px; - border: solid 1px #cccccc; - margin: 2px; - background-color: #969696; - color: white; - white-space: nowrap; - font-size: 0.9em; - display: inline-block; + .host-assignments { + .service-component { + white-space: nowrap; + font-size: 0.9em; + display: inline-block; + margin: 2px; + } + .new-service { + background-color: @green; + } } - .host-assignments .newService { - padding: 2px 8px; - border: solid 1px #cccccc; - margin: 2px; - background-color: @green; - color: white; - white-space: nowrap; - font-size: 0.9em; - display: inline-block; - } .host-assignments .grey { background-color: #808080; - border: solid 1px #000000; + border: solid 1px #000; } .form-horizontal .control-label { @@ -3956,7 +3430,7 @@ table.graphs { .badge { background-color: @green; - color: #ffffff; + color: #fff; cursor: pointer; font-weight: bold; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); @@ -3983,24 +3457,6 @@ table.graphs { /*end assign masters*/ -.assign-clients { - .round-corners { - border-radius: 8px; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - } - .assignedService { - padding: 2px 8px; - border: solid 1px #cccccc; - margin: 2px; - background-color: @blue; - color: white; - white-space: nowrap; - font-size: 0.9em; - display: inline-block; - } -} - /*Dashboard*/ .alerts-count { cursor: pointer; @@ -4008,7 +3464,7 @@ table.graphs { } ul.filter { - background: #ffffff; + background: #fff; list-style: none; position: absolute; padding: 10px; @@ -4017,15 +3473,6 @@ ul.filter { #main-admin-menu { padding: 8px 0; .nav-list { - .tab-marker-position { - background-position: 6px 5px; - background-repeat: no-repeat; - list-style: none; - float: left; - height: 20px; - width: 20px; - margin-left: 0; - } li { line-height: 24px; a { @@ -4035,26 +3482,16 @@ ul.filter { } } -#user-auth-method select { - width: 320px; -} -.host-block { - margin-top: 20px; -} - .button-caret-margin { margin-top: 8px; } /*start charts rack*/ .rack { - width: 99%; - display: inline-block; vertical-align: top; border: 1px solid #D4D4D4; - margin-right: 4px; margin-bottom: 10px; margin-top:5px; - background-color: #FFFFFF; + background-color: #fff; .rackHeader { background-color: #F7F7F7; @@ -4064,7 +3501,7 @@ ul.filter { .statusName { font-size: 15px; color: #006F9F; - text-shadow: #ffffff 0 0 1px; + text-shadow: #fff 0 0 1px; font-weight: bold; vertical-align: top; } @@ -4102,7 +3539,7 @@ ul.filter { font-size: 12px; padding: 4px 0 4px 9px; .textBlock { - color: #000000; + color: #000; padding-right: 10px; div { @@ -4190,13 +3627,6 @@ ul.filter { /*Start Heatmap*/ .heatmap { padding-top: 10px; - #heatmap-metric-title { - margin-left: 23px; - } - - #select-metric-btn-group { - margin-top:5px; - } li.heatmap-metrics-dropdown-links{ cursor: pointer; @@ -4226,13 +3656,7 @@ ul.filter { height: 430px; } } - .legend-column { - min-width: 160px; - padding-right: 0; - } - .heatmap-content { - padding-left: 0; - } + .heatmap_host_details { font-size: 12px; line-height: 1.6em; @@ -4265,16 +3689,8 @@ ul.filter { } } - .maximum-input { - line-height: 40px; - input { - width: 50%; - } - } - h4 { - color: #777777; - margin-top: 5px; + color: #777; } .heatmap-host { display: block; @@ -4283,8 +3699,6 @@ ul.filter { } .active-widget { - float: right; - width: 78%; position: static; } } @@ -4298,7 +3712,6 @@ ul.filter { /* CHARTS */ .chart { overflow: hidden; -/*padding-bottom: 25px;*/ .attributes { width: 75px; @@ -4315,13 +3728,13 @@ ul.filter { } .horizon { - border-bottom: 1px solid #000000; + border-bottom: 1px solid #000; overflow: hidden; position: relative; } .horizon { - border-bottom: 1px solid #000000; - border-top: 1px solid #000000; + border-bottom: 1px solid #000; + border-top: 1px solid #000; } .horizon + .horizon { border-top: medium none; @@ -4367,13 +3780,12 @@ ul.filter { line { shape-rendering: crispedges; - stroke: #000000; + stroke: #000; } } .line { - background: none repeat scroll 0 0 #000000; - /* opacity: 0.2; */ + background: none repeat scroll 0 0 #000; z-index: 2; } @@ -4424,7 +3836,7 @@ ul.noStyle { list-style: none; } -ul.list-inline li { +ul.inline li { display: inline; } @@ -4449,11 +3861,6 @@ ul.list-inline li { } } -#config_history_flow { - margin-bottom: 10px; -} - - .pointer { cursor: pointer; } @@ -4515,7 +3922,7 @@ ul.list-inline li { padding-left: 10px; } .active-sort { - color: #555555; + color: #555; text-decoration: none; background-color: #e5e5e5; border-radius: 0; @@ -4526,7 +3933,7 @@ ul.list-inline li { padding: 8px; } .active-filter { - color: #555555; + color: #555; text-decoration: none; background-color: #e5e5e5; -webkit-box-shadow: inset 0 -5px 8px rgba(0, 0, 0, 0.05); @@ -4534,14 +3941,14 @@ ul.list-inline li { box-shadow: inset 0 -5px 8px rgba(0, 0, 0, 0.05); } .filter-btn { - color: #999999; + color: #999; font-size: 12px; line-height: 14px; padding-left: 6px; text-align: left; width: 100px; .glyphicon-filter { - color: #999999; + color: #999; } } } @@ -4753,11 +4160,6 @@ ul.list-inline li { // COMBOBOX FIXES END @media all and (max-width: 2560px) { - #main-nav { - li.col-md-2 { - width: 120px; - } - } #hosts { .table { .col2, @@ -4818,15 +4220,6 @@ ul.list-inline li { } } - .assign-masters { - .host-assignments { - margin-left: 0; - width: 32%; - } - .select-hosts { - width: 68%; - } - } .wizard-content { #serviceConfig { .nav-tabs { @@ -4890,11 +4283,11 @@ ul.list-inline li { // Gray palette // .nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { - background-color: #666666; + background-color: #666; } .nav-list > li.active > a, .nav-list > li.active > a:hover { - background-color: #666666; + background-color: #666; color: #fff; } @@ -4935,7 +4328,7 @@ i.glyphicon-asterisks { .rickshaw_legend { .action { opacity: 1; - color: #ffffff; + color: #fff; } .action:hover { opacity: 0.8; @@ -4949,8 +4342,8 @@ i.glyphicon-asterisks { } .code-snippet { - background-color: #EEEEEE; - border: 1px dashed #CCCCCC; + background-color: #eee; + border: 1px dashed #ccc; font-family: Courier; font-size: 12px; padding: 4px; @@ -4973,7 +4366,6 @@ i.glyphicon-asterisks { clear: both; } - .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 1130px; @@ -5138,14 +4530,10 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { .manage-configuration-group-popup { .group-select { - width: 100%; height: 250px; } - .btn-toolbar { - margin-top: 0; - } + .manage-configuration-group-content { - margin-bottom: 0; .group-description { height:40px; overflow-y: auto; @@ -5497,7 +4885,7 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { } .bottom-border { - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid #ddd; } .progress-counter { @@ -5531,7 +4919,7 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { padding: 18px; border: 1px solid #e4e4e4; vertical-align: top; - background-color: #FFFFFF; + background-color: #fff; h4 { margin: 0; font-size: 22px; @@ -5644,11 +5032,11 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { } .table { - background-color: #FFFFFF; + background-color: #fff; } .panel { - background-color: #FFFFFF; + background-color: #fff; } .panel-heading { @@ -5711,7 +5099,7 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { cursor: pointer; } a.disabled{ - color: #999999; + color: #999; background: none; } } @@ -5719,7 +5107,7 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { } #select-stack .stack-version-selection.disabled{ .select-version-label { - color: #999999; + color: #999; } } @@ -5732,8 +5120,6 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { } #select-stack { .big-radio { - font-weight: bold; - padding: 5px 15px; &.disabled>span{ opacity: 0.7; } @@ -5745,7 +5131,7 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { } #upload-definition-file-panel.disabled { .local-option-label { - color: #999999; + color: #999; } } } @@ -5765,19 +5151,6 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { display: block; } } - .panel-body { - .version-info-section { - padding: 10px; - } - .control-label { - text-align: left; - line-height: 14px; - } - .version-info { - padding-top: 5px; - line-height: 14px; - } - } .details-panel .patch-icon { color: #ff4500; } @@ -5816,7 +5189,6 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { height: 24px; } #skip-validation { - margin-top: 13px; span.disabled { opacity: 0.7; } @@ -5825,9 +5197,6 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { opacity: 0.7; } } - #repoVersionInfoForm { - - } } #combo_search_box { .VS-search { @@ -5884,11 +5253,3 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { } } } - -#host-configurations-table { - tbody { - td:first-child { - vertical-align: middle; - } - } -} http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/styles/common.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/common.less b/ambari-web/app/styles/common.less index 8c8199c..9eaf932 100644 --- a/ambari-web/app/styles/common.less +++ b/ambari-web/app/styles/common.less @@ -67,58 +67,71 @@ color: @maintenance-black; } + +@restart-indicator-color: #FDB82F; + +@top-nav-bg-color-from: #555; +@top-nav-bg-color-to: #333; +@top-nav-brand-color: #fff; +@top-nav-ops-count-color: #fff; +@top-nav-ops-count-bg-color: #c3c3c3; +@top-nav-menu-active-text-color: #333; +@top-nav-menu-active-bg-color: #fff; +@top-nav-menu-text-color: #c3c3c3; +@top-nav-menu-text-hover-color: #fff; +@top-nav-menu-dropdown-border-color: #c3c3c3; +@top-nav-menu-dropdown-bg-color: #fff; +@top-nav-menu-dropdown-text-color: #333; + @-webkit-keyframes orangePulse { - from { background-color: #fdb82f; } + from { background-color: @restart-indicator-color; } 50% { background-color: #fd910e; } - to { background-color: #fdb82f; } + to { background-color: @restart-indicator-color; } } @-moz-keyframes orangePulse { - from { background-color: #fdb82f; } + from { background-color: @restart-indicator-color; } 50% { background-color: #fd910e; } - to { background-color: #fdb82f; } + to { background-color: @restart-indicator-color; } } -@keyframes orangePulse -{ - 0% { background-color: #fdb82f; } +@keyframes orangePulse { + 0% { background-color: @restart-indicator-color; } 50% { background-color: #fd910e; } - 100% { background-color: #fdb82f; } + 100% { background-color: @restart-indicator-color; } } -@-webkit-keyframes greenPulse { +@-webkit-keyframes bluePulse { from { background-color: #118fff; } 50% { background-color: #006DCC; } to { background-color: #118fff; } } -@-moz-keyframes greenPulse { +@-moz-keyframes bluePulse { from { background-color: #118fff; } 50% { background-color: #006DCC; } to { background-color: #118fff; } } -@keyframes greenPulse -{ +@keyframes bluePulse { 0% { background-color: #118fff; } 50% { background-color: #006DCC; } 100% { background-color: #118fff; } } -@-webkit-keyframes greenPulseInner { +@-webkit-keyframes bluePulseInner { from { color: #118fff; } 50% { color: #006DCC; } to { color: #118fff; } } -@-moz-keyframes greenPulseInner { +@-moz-keyframes bluePulseInner { from { color: #118fff; } 50% { color: #006DCC; } to { color: #118fff; } } -@keyframes greenPulseInner -{ +@keyframes bluePulseInner { 0% { color: #118fff; } 50% { color: #006DCC; } 100% { color: #118fff; } @@ -136,8 +149,7 @@ to { background-color: #ff3333; } } -@keyframes redPulse -{ +@keyframes redPulse { 0% { background-color: #ff3333; } 50% { background-color: #ff0000; } 100% { background-color: #ff3333; } @@ -151,23 +163,40 @@ filter: progid:dximagetransform.microsoft.gradient(startColorstr= @start, endColorstr= @stop, GradientType=0); // for IE9- } +.pulse(@name) { + text-shadow: none; + -webkit-animation-name: @name; + -webkit-animation-duration: 1s; + -webkit-animation-iteration-count: infinite; + -moz-animation-name: @name; + -moz-animation-duration: 1s; + -moz-animation-iteration-count: infinite; + animation-name: @name; + animation-duration: 1s; + animation-iteration-count: infinite; +} -@footer-height: 100px; +.infoPulse { + .pulse(bluePulse); + background-color: #006DCC; +} -@restart-indicator-color: #FDB82F; +.infoPulseInner { + .pulse(bluePulseInner); +} + +.warnPulse { + .pulse(orangePulse); + background-color: @health-status-orange; +} + +.dangerPulse { + .pulse(redPulse); + background-color: @health-status-red; +} + +@footer-height: 100px; -@top-nav-bg-color-from: #555555; -@top-nav-bg-color-to: #333333; -@top-nav-brand-color: #ffffff; -@top-nav-ops-count-color: #ffffff; -@top-nav-ops-count-bg-color: #c3c3c3; -@top-nav-menu-active-text-color: #333333; -@top-nav-menu-active-bg-color: #ffffff; -@top-nav-menu-text-color: #c3c3c3; -@top-nav-menu-text-hover-color: #ffffff; -@top-nav-menu-dropdown-border-color: #c3c3c3; -@top-nav-menu-dropdown-bg-color: #ffffff; -@top-nav-menu-dropdown-text-color: #333333; @default-font-size: 14px; @smaller-font-size: 12px; @@ -318,7 +347,7 @@ border-radius: 3px; } .glyphicon-remove { - color: #000000; + color: #000; } .glyphicon-ok { color: white; @@ -441,59 +470,6 @@ } } -.nav-tabs-left, .nav-tabs-right { - border-bottom: none; - padding-top: 2px; -} -.nav-tabs-left { - border-right: 1px solid #ddd; -} -.nav-tabs-right { - border-left: 1px solid #ddd; -} -.nav-tabs-left>li, .nav-tabs-right>li { - float: none; - margin-bottom: 2px; -} -.nav-tabs-left>li { - margin-right: -1px; -} -.nav-tabs-right>li { - margin-left: -1px; -} -.nav-tabs-left>li>a:hover, -.nav-tabs-left>li>a:focus { - border-bottom-color: transparent; -} -.nav-tabs-left>li.active>a, -.nav-tabs-left>li.active>a:hover, -.nav-tabs-left>li.active>a:focus { - border-bottom-color: #ddd; - border-right-color: transparent; -} - -.nav-tabs-right>li.active>a, -.nav-tabs-right>li.active>a:hover, -.nav-tabs-right>li.active>a:focus { - border-bottom: 1px solid #ddd; - border-left-color: transparent; -} -.nav-tabs-left>li>a { - border-radius: 4px 0 0 4px; - margin-right: 0; - display:block; -} -.nav-tabs-right>li>a { - border-radius: 0 4px 4px 0; - margin-right: 0; -} - -.checkbox { - &.checkbox-row { - margin: 0; - } -} - .dropdown-toggle.btn-icon { padding-left: 8px; padding-right: 8px; http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/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 c42f4bb..dae2709 100644 --- a/ambari-web/app/styles/config_history_flow.less +++ b/ambari-web/app/styles/config_history_flow.less @@ -18,6 +18,7 @@ @import 'common.less'; #config_history_flow { + margin-bottom: 10px; .version-slider { .flow-element { .version-box .box { @@ -48,10 +49,10 @@ margin-top: -5px; .version-slider { width: 100%; - height: 69px; + height: 75px; margin: 5px 0; .flow-element { - height: 69px; + height: 75px; width: 15.2%; max-width: 146px; .version-box { @@ -62,7 +63,7 @@ cursor: pointer; width: 92%; height: 100%; - background-color: #ffffff; + background-color: #fff; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -70,27 +71,20 @@ font-size: 11px; .top-label { min-width: 20px; - padding: 6px 2px; + padding: 3px 2px 0 2px; } .author, .content { - padding: 2px; text-align: center; - color: #555555; + color: #555; display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } - .content { - max-width: 97% !important; - } - .author { - max-width: 75% !important; - } .current-label { text-align: center; - padding: 5px 5px; + padding: 5px; } .stack-label { margin-right: 6px; @@ -108,7 +102,7 @@ width: 380px; padding: 8px; list-style: none; - background-color: #ffffff; + background-color: #fff; border: 1px solid #c3c3c3; -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); @@ -145,7 +139,7 @@ .version-box .box.displayed { background-color: #e6f1f6; .content { - color: #444444; + color: #444; } } .version-box .box.grayedOut { @@ -215,7 +209,7 @@ margin-bottom: 5px; .glyphicon-remove-circle { - color: #ffffff; + color: #fff; font-size: 1.5em; padding-top: 4px; margin-top: 0; @@ -280,9 +274,9 @@ } } li:hover { - background-color: #666666; - background-image: linear-gradient(to bottom, #666666, #555555); - color: #ffffff; + background-color: #666; + background-image: linear-gradient(to bottom, #666, #555); + color: #fff; } li#show_more:hover { background: none; @@ -297,7 +291,7 @@ } } li.not-allowed:hover { - background-color: #ffffff; + background-color: #fff; background-image: none; color: #808080; } @@ -313,7 +307,7 @@ font-size: 13px; margin: 0; padding: 8px; - color: #333333; + color: #333; cursor: default; .content { padding: 1px 5px 15px 5px; http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/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 ce6a595..e014958 100644 --- a/ambari-web/app/styles/stack_versions.less +++ b/ambari-web/app/styles/stack_versions.less @@ -154,6 +154,7 @@ padding-bottom: 25px; padding-left: 0; margin-top: 10px; + margin-left: -1px; .versions-slides-bar { display: inline-flex; } @@ -175,7 +176,7 @@ background: none repeat scroll 0 0 #fff; border: 1px solid #d2d9dd; margin: 15px 15px 0 0; - padding: 5px 0; + padding: 0 5px; a.not-active:hover { text-decoration: none; } http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/templates/application.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/application.hbs b/ambari-web/app/templates/application.hbs index 2831a80..4da11fc 100644 --- a/ambari-web/app/templates/application.hbs +++ b/ambari-web/app/templates/application.hbs @@ -24,12 +24,18 @@ <div id="top-nav"> <nav class="navbar navbar-default navbar-static-top"> <div class="container main-container"> - <p class="navbar-text brand-wrapper"> + <div class="navbar-header"> {{#if enableLinks}} - <a {{translateAttr href="topnav.logo.href"}} class="logo"> + <a {{translateAttr href="topnav.logo.href"}} class="navbar-brand logo"> <img src="/img/logo-white.png" alt="Apache Ambari" title="Apache Ambari"> </a> - <a {{translateAttr href="topnav.logo.href"}} title="Apache Ambari">{{t app.name}}</a> + {{else}} + <a class="logo"><img src="/img/logo-white.png" alt="Apache Ambari" title="Apache Ambari"></a> + {{/if}} + </div> + <p class="navbar-text brand-wrapper"> + {{#if enableLinks}} + <a {{translateAttr href="topnav.logo.href"}} class="ambari-link" title="Apache Ambari">{{t app.name}}</a> {{! cluster name }} <a href="#" {{bindAttr title="clusterName"}} {{action "showPopup" target="App.router.backgroundOperationsController"}} class="cluster-name"> {{#unless App.isClusterUser}} @@ -64,15 +70,16 @@ {{/if}} {{! alerts label end }} {{else}} - <a class="logo"><img src="/img/logo-white.png" alt="Apache Ambari" title="Apache Ambari"></a> <a title="Apache Ambari">{{t app.name}}</a> {{/if}} </p> - {{! user dropdown }} + {{! right offset. don't delete me! }} + <ul class="nav navbar-nav navbar-right"></ul> + {{! user dropdown }} {{#if App.router.loggedIn}} - <ul class="nav navbar-nav navbar-right top-nav-user"> + <ul class="nav navbar-nav top-nav-user navbar-right"> <li class="dropdown"> <button class="dropdown-toggle navbar-btn btn btn-default" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <i class="glyphicon glyphicon-user"></i> {{App.router.displayLoginName}} <span class="caret"></span> @@ -129,31 +136,29 @@ <div class="container main-container"> <div id="content"> {{#if App.wizardIsNotFinished}} - <div class="ru-badge"> - <div class="clearfix"> - <div class="row"> - {{#if isExistingClusterDataLoaded}} - <p class="col-md-10 col-md-offset-2"> - {{#if App.router.wizardWatcherController.isNonWizardUser}} - <span class="label upgrade-in-progress"> - <i class="glyphicon glyphicon-cog"></i> {{App.router.wizardWatcherController.wizardDisplayName}} - </span> - {{/if}} - {{#if showUpgradeLabel}} - <a href="#" {{action "openUpgradeDialog" target="App.router.mainAdminStackAndUpgradeController"}}> - <span {{bindAttr class="upgradeMap.cls :label"}}> - <i {{bindAttr class="upgradeMap.icon :glyphicon"}}></i> - {{upgradeMap.msg}} - </span> - </a> - {{/if}} - </p> - {{#if App.router.mainAdminStackAndUpgradeController.isFinalizeItem}} - <p class="col-md-10 col-md-offset-2 alert alert-danger">{{t admin.stackVersions.version.upgrade.notFinalized.warning}}</p> - {{/if}} + <div class="ru-badge row"> + {{#if isExistingClusterDataLoaded}} + <p class="col-md-4 col-md-offset-4"> + {{#if App.router.wizardWatcherController.isNonWizardUser}} + <span class="label upgrade-in-progress"> + <i class="glyphicon glyphicon-cog"></i> {{App.router.wizardWatcherController.wizardDisplayName}} + </span> + {{/if}} + {{#if showUpgradeLabel}} + <a href="#" {{action "openUpgradeDialog" target="App.router.mainAdminStackAndUpgradeController"}}> + <span {{bindAttr class="upgradeMap.cls :label"}}> + <i {{bindAttr class="upgradeMap.icon :glyphicon"}}></i> + {{upgradeMap.msg}} + </span> + </a> {{/if}} - </div> - </div> + </p> + {{/if}} + </div> + <div class="row"> + {{#if App.router.mainAdminStackAndUpgradeController.isFinalizeItem}} + <p class="col-md-10 col-md-offset-1 alert alert-danger">{{t admin.stackVersions.version.upgrade.notFinalized.warning}}</p> + {{/if}} </div> {{/if}} {{outlet}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/templates/common/about.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/about.hbs b/ambari-web/app/templates/common/about.hbs index 59e0622..00388c8 100644 --- a/ambari-web/app/templates/common/about.hbs +++ b/ambari-web/app/templates/common/about.hbs @@ -16,11 +16,11 @@ * limitations under the License. }} -<div class="about"> - <div class="logo"> +<div class="about row"> + <div class="logo col-md-2"> <img src="/img/logo.png" alt="Apache Ambari" title="Apache Ambari" /> </div> - <div class="content"> + <div class="content col-md-10"> <div class="project">Apache Ambari</div> <br /> {{t app.aboutAmbari.version}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/templates/common/assign_master_components.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/assign_master_components.hbs b/ambari-web/app/templates/common/assign_master_components.hbs index b3470a8..fc90a99 100644 --- a/ambari-web/app/templates/common/assign_master_components.hbs +++ b/ambari-web/app/templates/common/assign_master_components.hbs @@ -32,7 +32,7 @@ {{/each}} {{#if controller.isLoaded}} <div class="assign-masters row"> - <div class="select-hosts col-md-7"> + <div class="select-hosts col-md-8"> <div class="row col-md-12"> {{#if showCurrentHost}} <div class="col-md-12 control-group mlc"> @@ -121,18 +121,18 @@ </div> </div> - <div class="host-assignments col-md-5"> + <div class="host-assignments col-md-4"> {{#each masterHostMapping}} - <div class="mapping-box round-corners well"> + <div class="mapping-box"> <div class="hostString"><span>{{hostInfo}}</span></div> {{#each masterServicesToDisplay}} - <span {{bindAttr class="isInstalled:assignedService:newService :round-corners"}}>{{display_name}}</span> + <span {{bindAttr class="isInstalled:assigned-service:new-service :service-component :label"}}>{{display_name}}</span> {{/each}} </div> {{/each}} {{#if remainingHosts}} - <div class="remaining-hosts round-corners well"> + <div class="remaining-hosts"> <span><strong>{{remainingHosts}}</strong> {{t installer.step5.attention}}</span></div> {{/if}} </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/templates/login.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/login.hbs b/ambari-web/app/templates/login.hbs index b3037ea..c17c0fe 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"> +<div class="well login col-md-4 col-md-offset-4"> <h2>{{t login.header}}</h2> {{#if errorMessage}} <div class="alert alert-danger"> http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/templates/main/alerts/configs.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/configs.hbs b/ambari-web/app/templates/main/alerts/configs.hbs index febc2b8..771a66b 100644 --- a/ambari-web/app/templates/main/alerts/configs.hbs +++ b/ambari-web/app/templates/main/alerts/configs.hbs @@ -15,32 +15,30 @@ * See the License for the specific language governing permissions and * limitations under the License. }} -<div style="padding-top:20px;"> - <form class="form-horizontal alert-configs"> - {{#each property in controller.configs}} - {{#unless property.hidden}} - <div {{bindAttr class=":form-group property.name property.isValid::has-error"}}> - {{#if property.isPreLabeled}} - <label {{bindAttr class=":control-label :col-md-2"}}>{{property.label}}</label> +<form class="form-horizontal alert-configs"> + {{#each property in controller.configs}} + {{#unless property.hidden}} + <div {{bindAttr class=":form-group property.name property.isValid::has-error"}}> + {{#if property.isPreLabeled}} + <label {{bindAttr class=":control-label :col-md-2"}}>{{property.label}}</label> - <div {{bindAttr class=":col-md-10"}}> + <div {{bindAttr class=":col-md-10"}}> + {{view property.viewClass propertyBinding="property"}} + </div> + {{else}} + <div> + <label class="radio"> {{view property.viewClass propertyBinding="property"}} - </div> - {{else}} - <div> - <label class="radio"> - {{view property.viewClass propertyBinding="property"}} - {{property.label}} - </label> - </div> - {{/if}} - </div> - {{/unless}} - {{/each}} - {{#if controller.hasThresholdsError}} - <div class="error-message"> - {{view.errorMessage}} + {{property.label}} + </label> + </div> + {{/if}} </div> - {{/if}} - </form> -</div> \ No newline at end of file + {{/unless}} + {{/each}} + {{#if controller.hasThresholdsError}} + <div class="error-message"> + {{view.errorMessage}} + </div> + {{/if}} +</form> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/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 b74dae6..7e2e2ed 100644 --- a/ambari-web/app/templates/main/alerts/definition_details.hbs +++ b/ambari-web/app/templates/main/alerts/definition_details.hbs @@ -36,21 +36,22 @@ </button> </div> {{else}} - <span> - {{controller.content.label}} - </span> + <div class="col-md-12"> + <span> + {{controller.content.label}} + </span> + {{#isAuthorized "SERVICE.TOGGLE_ALERTS"}} + <a href="#" {{action edit controller.editing.label target="controller"}} class="edit-description-button"> + <i class="glyphicon glyphicon-pencil"></i> + </a> + {{/isAuthorized}} + </div> {{/if}} - {{#unless controller.editing.label.isEditing}} - {{#isAuthorized "SERVICE.TOGGLE_ALERTS"}} - <a {{action edit controller.editing.label target="controller"}} class="edit-description-button"><i - class="glyphicon glyphicon-pencil"></i></a> - {{/isAuthorized}} - {{/unless}} </div> {{! Alert Definition Name end }} <div class="error-msg"> {{controller.errorMessage}} </div> - <div class="row"><a href="javascript:void(null)" {{action back}}><i - class="glyphicon glyphicon-arrow-left"></i> {{t common.back}}</a> + <div> + <a href="javascript:void(null)" {{action back}}><i class="glyphicon glyphicon-arrow-left"></i> {{t common.back}}</a> </div> </div> @@ -59,23 +60,26 @@ </div> </div> - <div class="row" style="display: flex; align-items: stretch;"> + <div class="row"> {{! Left column }} {{! Alert Definition Configs }} - <div class="panel panel-default col-md-8"> - <div class="panel-heading row"> - <div class="pull-left col-md-7"> - <h4 class="panel-title">{{t common.configuration}}</h4> - </div> - <div class="pull-right col-md-5"> - {{#isAuthorized "SERVICE.TOGGLE_ALERTS"}} - {{#unless App.router.mainAlertDefinitionConfigsController.canEdit}} - <a {{action editConfigs target="App.router.mainAlertDefinitionConfigsController"}} class="pull-right edit-link btn btn-link"> - {{t common.edit}} - </a> - {{/unless}} - {{/isAuthorized}} + <div class="col-md-8"> + <div class="panel panel-default"> + <div class="panel-heading"> + <div class="row"> + <div class="pull-left col-md-7"> + <h4 class="panel-title">{{t common.configuration}}</h4> + </div> + <div class="pull-right col-md-5"> + {{#isAuthorized "SERVICE.TOGGLE_ALERTS"}} + {{#unless App.router.mainAlertDefinitionConfigsController.canEdit}} + <a {{action editConfigs target="App.router.mainAlertDefinitionConfigsController"}} class="pull-right edit-link btn btn-link"> + {{t common.edit}} + </a> + {{/unless}} + {{/isAuthorized}} + </div> </div> </div> <div class="panel-body"> @@ -91,6 +95,7 @@ {{/if}} </div> </div> + </div> {{! Alert Definition Configs end }} {{! Left column end }} @@ -174,7 +179,7 @@ </span> {{/if}} {{#isAuthorized "SERVICE.TOGGLE_ALERTS"}} - <a {{action editRepeatTolerance target="controller"}} class="edit-description-button"> + <a href="#" {{action editRepeatTolerance target="controller"}} class="edit-description-button"> <i class="glyphicon glyphicon-pencil"></i> </a> {{/isAuthorized}} @@ -194,9 +199,12 @@ {{! List of alerts }} <div class="row"> - <h2 class="table-title col-sm-1">{{t alerts.definition.details.instances}}</h2> + <div class="col-md-12"> + <h2 class="table-title">{{t alerts.definition.details.instances}}</h2> + </div> </div> - + <div class="row"> + <div class="col-md-12"> {{#if App.router.mainAlertInstancesController.isLoaded}} <table class="table advanced-header-table table-hover alerts-table" id="alert-instances-table"> @@ -268,6 +276,8 @@ {{else}} {{view App.SpinnerView}} {{/if}} + </div> + </div> {{! List of alerts end }} http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/templates/main/charts/heatmap.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/charts/heatmap.hbs b/ambari-web/app/templates/main/charts/heatmap.hbs index f1f1e92..9fedd37 100644 --- a/ambari-web/app/templates/main/charts/heatmap.hbs +++ b/ambari-web/app/templates/main/charts/heatmap.hbs @@ -18,9 +18,8 @@ <div class="heatmap"> {{#if isLoaded}} - <div class="container-fluid"> <div class="row"> - <div class="col-md-2 legend-column background-text"> + <div class="col-md-3 legend-column background-text"> {{view view.dropdownView}} @@ -36,21 +35,20 @@ {{/each}} </table> {{t common.maximum}}: - <div id="inputMaximum" class="control-group maximum-input"> + <div id="inputMaximum" class="control-group input-group"> {{view Ember.TextField type="text" maxlength="8" valueBinding="controller.inputMaximum" class="form-control"}} - <span>{{controller.selectedMetric.units}}</span> + <span class="input-group-addon">{{controller.selectedMetric.units}}</span> </div> {{/if}} </div> {{#if controller.activeWidget}} - <div class="active-widget" {{bindAttr id="activeWidget.id"}}> + <div class="active-widget col-md-9" {{bindAttr id="activeWidget.id"}}> {{view activeWidget.viewClass contentBinding="activeWidget" racksBinding = "racks" idBinding="activeWidget.id"}} </div> {{else}} {{view App.SpinnerView}} {{/if}} </div> - </div> {{else}} {{view App.SpinnerView}} {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/templates/main/charts/heatmap_dropdown.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/charts/heatmap_dropdown.hbs b/ambari-web/app/templates/main/charts/heatmap_dropdown.hbs index c555655..1dd3d21 100644 --- a/ambari-web/app/templates/main/charts/heatmap_dropdown.hbs +++ b/ambari-web/app/templates/main/charts/heatmap_dropdown.hbs @@ -16,10 +16,9 @@ * limitations under the License. }} -<div class="btn-group"> - <button class="btn btn-default heatmap-select-metric-btn">{{t charts.heatmap.selectMetric}}</button> - <button class="btn btn-default dropdown-toggle heatmap-toggle-metrics-btn btn-icon" data-toggle="dropdown"> - <span class="caret"></span> +<div class="dropdown"> + <button class="btn btn-default btn-block dropdown-toggle heatmap-toggle-metrics-btn btn-icon" data-toggle="dropdown"> + {{t charts.heatmap.selectMetric}} <span class="caret"></span> </button> <ul class="dropdown-menu"> {{#each category in controller.heatmapCategories}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/templates/main/dashboard/config_history.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/config_history.hbs b/ambari-web/app/templates/main/dashboard/config_history.hbs index 77bb808..00f9c38 100644 --- a/ambari-web/app/templates/main/dashboard/config_history.hbs +++ b/ambari-web/app/templates/main/dashboard/config_history.hbs @@ -18,7 +18,7 @@ <div id="config_history"> <div class="row"> - <h2 class="table-title col-sm-2">{{t dashboard.configHistory.title}}</h2> + <h2 class="table-title col-md-12">{{t dashboard.configHistory.title}}</h2> </div> <table class="table advanced-header-table table-hover"> <thead> http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/templates/main/host/configs.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/configs.hbs b/ambari-web/app/templates/main/host/configs.hbs index a6a7532..9cc832b 100644 --- a/ambari-web/app/templates/main/host/configs.hbs +++ b/ambari-web/app/templates/main/host/configs.hbs @@ -18,8 +18,10 @@ {{#if view.isConfigAvailable}} <div class="row host-configs"> - <div class="well col-md-2 services-host-menu"> - {{view App.MainHostServiceMenuView}} + <div class="col-md-2"> + <div class="well services-host-menu"> + {{view App.MainHostServiceMenuView}} + </div> </div> <div class="col-md-10"> {{outlet service_config_outlet}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/templates/main/host/delete_hosts_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/delete_hosts_popup.hbs b/ambari-web/app/templates/main/host/delete_hosts_popup.hbs index ba7c884c..93ffe97 100644 --- a/ambari-web/app/templates/main/host/delete_hosts_popup.hbs +++ b/ambari-web/app/templates/main/host/delete_hosts_popup.hbs @@ -26,7 +26,7 @@ <div class='alert alert-warning'> {{t hosts.bulkOperation.deleteHosts.confirmation.body.msg2}} - <span style="color: red;">{{t hosts.bulkOperation.deleteHosts.confirmation.body.msg3}}</span> + <span class="text-danger">{{t hosts.bulkOperation.deleteHosts.confirmation.body.msg3}}</span> </div> <div class='alert alert-warning'>{{{t common.important.strong}}} {{t hosts.bulkOperation.deleteHosts.confirmation.body.msg4}}</div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs b/ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs index 51a6fff..15729e0 100644 --- a/ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs +++ b/ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs @@ -49,7 +49,7 @@ <div class='alert alert-warning'> <!-- Agent is still online, so host record will be re-inserted on next heartbeat. --> {{t hosts.delete.popup.body.msg5}} - <span style="color: red;">{{t hosts.delete.popup.body.msg6}}</span> + <span class="text-danger">{{t hosts.delete.popup.body.msg6}}</span> </div> {{/unless}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/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 cfc37bd..98619be 100644 --- a/ambari-web/app/templates/main/host/summary.hbs +++ b/ambari-web/app/templates/main/host/summary.hbs @@ -128,8 +128,9 @@ <ul class="dropdown-menu"> {{#each command in option.commands}} <li> - <a - href="javascript:void(null)" {{action "executeCustomCommand" command target="controller" href=true}}>{{command.label}}</a> + <a href="javascript:void(null)" {{action "executeCustomCommand" command target="controller" href=true}}> + {{command.label}} + </a> </li> {{/each}} </ul> @@ -150,43 +151,53 @@ <h4 class="panel-title">{{t hosts.host.summary.header}}</h4> </div> <div class="host-summary-content panel-body"> - <dl class="dl-horizontal host-details-summary-list"> - - <dt class="summary-hostname-label">{{t hosts.host.summary.hostname}}:</dt> - <dd class="summary-hostname-value"> {{view.content.hostName}}</dd> - - <dt class="summary-ipaddress-label">{{t common.ipAddress}}:</dt> - <dd class="summary-ipaddress-value"> {{view.content.ip}}</dd> - - <dt class="summary-rack-label">{{t common.rack}}:</dt> - <dd class="summary-rack-value"> {{formatWordBreak view.content.rack}} + <div class="host-details-summary-list"> + <div class="row row-no-pad"> + <div class="col-md-4 summary-label summary-hostname-label">{{t hosts.host.summary.hostname}}:</div> + <div class="col-md-8 summary-hostname-value"> {{view.content.hostName}}</div> + </div> + <div class="row row-no-pad"> + <div class="col-md-4 summary-label summary-ipaddress-label">{{t common.ipAddress}}:</div> + <div class="col-md-8 summary-ipaddress-value"> {{view.content.ip}}</div> + </div> + <div class="row row-no-pad"> + <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 class="glyphicon glyphicon-pencil"></i></a> {{/isAuthorized}} - </dd> - - <dt class="summary-os-label">{{t common.os}}:</dt> - <dd class="summary-os-value"> {{view.content.osType}} ({{view.content.osArch}})</dd> - - <dt class="summary-cores-label">{{t common.cores.cpu}}:</dt> - <dd class="summary-cores-value"> {{view.content.coresFormatted}}</dd> - - <dt class="summary-disk-label">{{t common.disk}}:</dt> - <dd class="summary-disk-value"> {{view.content.diskInfoBar}}</dd> - - <dt class="summary-memory-label">{{t common.memory}}:</dt> - <dd class="summary-memory-value"> {{view.content.memoryFormatted}}</dd> - - <dt class="summary-load-avg-label">{{t common.loadAvg}}:</dt> - <dd class="summary-load-avg-value"> {{view.content.loadAvg}}</dd> - - <dt class="summary-agent-heart-label">{{t hosts.host.summary.agentHeartbeat}}:</dt> - <dd class="summary-agent-heart-value"> {{view.timeSinceHeartBeat}}</dd> - - <dt class="summary-cur-ver-label">{{t hosts.host.summary.currentVersion}}:</dt> - <dd class="summary-cur-ver-value"> {{view.content.currentVersion}}</dd> - </dl> + </div> + </div> + <div class="row row-no-pad"> + <div class="col-md-4 summary-label summary-os-label">{{t common.os}}:</div> + <div class="col-md-8 summary-os-value"> {{view.content.osType}} ({{view.content.osArch}})</div> + </div> + <div class="row row-no-pad"> + <div class="col-md-4 summary-label summary-cores-label">{{t common.cores.cpu}}:</div> + <div class="col-md-8 summary-cores-value"> {{view.content.coresFormatted}}</div> + </div> + <div class="row row-no-pad"> + <div class="col-md-4 summary-label summary-disk-label">{{t common.disk}}:</div> + <div class="col-md-8 summary-disk-value"> {{view.content.diskInfoBar}}</div> + </div> + <div class="row row-no-pad"> + <div class="col-md-4 summary-label summary-memory-label">{{t common.memory}}:</div> + <div class="col-md-8 summary-memory-value"> {{view.content.memoryFormatted}}</div> + </div> + <div class="row row-no-pad"> + <div class="col-md-4 summary-label summary-load-avg-label">{{t common.loadAvg}}:</div> + <div class="col-md-8 summary-load-avg-value"> {{view.content.loadAvg}}</div> + </div> + <div class="row row-no-pad"> + <div class="col-md-4 summary-label summary-agent-heart-label">{{t hosts.host.summary.agentHeartbeat}}:</div> + <div class="col-md-8 summary-agent-heart-value"> {{view.timeSinceHeartBeat}}</div> + </div> + <div class="row row-no-pad"> + <div class="col-md-4 summary-label summary-cur-ver-label">{{t hosts.host.summary.currentVersion}}:</div> + <div class="col-md-8 summary-cur-ver-value"> {{view.content.currentVersion}}</div> + </div> + </div> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/templates/main/service/all_services_actions.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/all_services_actions.hbs b/ambari-web/app/templates/main/service/all_services_actions.hbs index dc67df8..aba1838 100644 --- a/ambari-web/app/templates/main/service/all_services_actions.hbs +++ b/ambari-web/app/templates/main/service/all_services_actions.hbs @@ -17,7 +17,6 @@ }} <div class="row"> - <div class="col-md-10 col-md-offset-1"> {{#isAuthorized "SERVICE.START_STOP, SERVICE.ADD_DELETE_SERVICES"}} <div class="dropdown"> <button class="btn btn-default dropdown-toggle center-block" data-toggle="dropdown" href="#">{{t common.actions}} @@ -62,5 +61,4 @@ </ul> </div> {{/isAuthorized}} - </div> </div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/templates/main/service/info/heatmap_dropdown.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/heatmap_dropdown.hbs b/ambari-web/app/templates/main/service/info/heatmap_dropdown.hbs index 819db55..d4ad435 100644 --- a/ambari-web/app/templates/main/service/info/heatmap_dropdown.hbs +++ b/ambari-web/app/templates/main/service/info/heatmap_dropdown.hbs @@ -16,10 +16,9 @@ * limitations under the License. }} -<div class="btn-group" id="select-metric-btn-group"> - <button class="btn btn-default heatmap-select-metric-btn">{{t charts.heatmap.selectMetric}}</button> - <button class="btn btn-default dropdown-toggle heatmap-toggle-metrics-btn" data-toggle="dropdown"> - <span class="caret"></span> +<div class="dropdown" id="select-metric-btn-group"> + <button class="btn btn-default btn-block dropdown-toggle heatmap-toggle-metrics-btn" data-toggle="dropdown"> + {{t charts.heatmap.selectMetric}} <span class="caret"></span> </button> <ul class="dropdown-menu"> http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/templates/wizard/step1_addLocalRepository.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/wizard/step1_addLocalRepository.hbs b/ambari-web/app/templates/wizard/step1_addLocalRepository.hbs index 6c48a64..c8f1913 100644 --- a/ambari-web/app/templates/wizard/step1_addLocalRepository.hbs +++ b/ambari-web/app/templates/wizard/step1_addLocalRepository.hbs @@ -42,7 +42,7 @@ <label class="control-label">{{t installer.step1.advancedRepo.localRepo.label.stack}}</label> {{view.stackName}} </div> - <div style="height:100px;"></div> + {{#if view.errorMessage}} <div class="alert alert-warning"> <strong>{{t common.warning}}</strong> {{view.errorMessage}}
