addressing some inconsistencies

This commit is contained in:
Scott Aslan 2016-08-03 17:19:50 -04:00 committed by Matt Gilman
parent 7ffa30d21b
commit 7d1fb09d48
7 changed files with 20 additions and 15 deletions

View File

@ -20,10 +20,10 @@
<div class="settings-container"> <div class="settings-container">
<div> <div>
<div id="settings-tabs" class="settings-tabs tab-container"></div> <div id="settings-tabs" class="settings-tabs tab-container"></div>
<button id="new-service-or-task" class="add-button fa fa-plus"></button>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div id="settings-tabs-content"> <div id="settings-tabs-content">
<button id="new-service-or-task" class="add-button fa fa-plus" title="Create a new controller service" style="display: block;"></button>
<div id="general-settings-tab-content" class="configuration-tab"> <div id="general-settings-tab-content" class="configuration-tab">
<div id="general-settings"> <div id="general-settings">
<div class="setting"> <div class="setting">

View File

@ -31,7 +31,7 @@
Oldest event available:&nbsp;<span id="oldest-event" class="value-color"></span> Oldest event available:&nbsp;<span id="oldest-event" class="value-color"></span>
</div> </div>
<div id="provenance-filter-container" class="filter-container"> <div id="provenance-filter-container" class="filter-container">
<input type="text" id="provenance-filter" class="filter"/> <input type="text" placeholder="Filter" id="provenance-filter" class="filter"/>
<div id="provenance-filter-type" class="filter-type"></div> <div id="provenance-filter-type" class="filter-type"></div>
</div> </div>
</div> </div>

View File

@ -369,6 +369,7 @@ button.fa {
color: #004849; color: #004849;
font-size: 16px; font-size: 16px;
cursor: pointer; cursor: pointer;
line-height: 23px;
} }
button.icon { button.icon {
@ -530,6 +531,7 @@ md-progress-linear > div {
font-size: 12px; font-size: 12px;
font-weight: 500; font-weight: 500;
font-family: Roboto Slab; font-family: Roboto Slab;
text-transform: capitalize;
padding-bottom: 4px; padding-bottom: 4px;
color: #262626; color: #262626;
} }
@ -549,6 +551,7 @@ md-progress-linear > div {
width: 100%; width: 100%;
color: #775351; color: #775351;
font-size: 13px; font-size: 13px;
font-weight: 500;
} }
.setting-header{ .setting-header{

View File

@ -70,8 +70,6 @@
/* general */ /* general */
#general-process-group-configuration input, #general-process-group-configuration textarea { #general-process-group-configuration input, #general-process-group-configuration textarea {
font-size: 11px !important;
font-family: Verdana;
width: 350px; width: 350px;
vertical-align: middle; vertical-align: middle;
} }

View File

@ -41,9 +41,7 @@ div.settings-container {
} }
#new-service-or-task { #new-service-or-task {
position: absolute; float: right;
top: 0px;
right: 0px;
} }
#settings-refresh-container { #settings-refresh-container {
@ -60,7 +58,7 @@ div.settings-tabs {
} }
#settings-tabs-content { #settings-tabs-content {
top: 53px; top: 43px;
bottom: 48px; bottom: 48px;
} }
@ -93,14 +91,12 @@ div.settings-refresh-button {
} }
#settings-last-refreshed { #settings-last-refreshed {
font-weight: bold; font-weight: 500;
} }
/* general */ /* general */
#general-settings input { #general-settings input {
font-size: 11px !important;
font-family: Verdana;
width: 350px; width: 350px;
vertical-align: middle; vertical-align: middle;
} }
@ -116,3 +112,11 @@ div.settings-buttons {
div.settings-buttons div.button { div.settings-buttons div.button {
float: left; float: left;
} }
#reporting-tasks-tab-content {
top: 32px;
}
#controller-services-tab-content {
top: 32px;
}

View File

@ -64,6 +64,7 @@
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
width: 80%; width: 80%;
font-weight: normal;
} }
div.selected-disabled-option { div.selected-disabled-option {

View File

@ -27,7 +27,6 @@ nf.ng.ProvenanceTable = function (provenanceLineageCtrl) {
maxResults: 1000, maxResults: 1000,
defaultStartTime: '00:00:00', defaultStartTime: '00:00:00',
defaultEndTime: '23:59:59', defaultEndTime: '23:59:59',
filterText: 'Filter',
styles: { styles: {
filterList: 'provenance-filter-list', filterList: 'provenance-filter-list',
hidden: 'hidden' hidden: 'hidden'
@ -521,13 +520,13 @@ nf.ng.ProvenanceTable = function (provenanceLineageCtrl) {
applyFilter(); applyFilter();
}).focus(function () { }).focus(function () {
if ($(this).hasClass(config.styles.filterList)) { if ($(this).hasClass(config.styles.filterList)) {
$(this).removeClass(config.styles.filterList).val(''); $(this).removeClass(config.styles.filterList);
} }
}).blur(function () { }).blur(function () {
if ($(this).val() === '') { if ($(this).val() === '') {
$(this).addClass(config.styles.filterList).val(config.filterText); $(this).addClass(config.styles.filterList);
} }
}).addClass(config.styles.filterList).val(config.filterText); }).addClass(config.styles.filterList);
// filter options // filter options
var filterOptions = [{ var filterOptions = [{