diff --git a/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json b/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json index 3c575eb814..562f236316 100644 --- a/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json +++ b/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json @@ -2,7 +2,7 @@ "metadata": { "name": "openmct-symbols-16px", "lastOpened": 0, - "created": 1506973656040 + "created": 1527895011127 }, "iconSets": [ { @@ -40,7 +40,7 @@ "tempChar": "" }, { - "order": 44, + "order": 141, "prevSize": 24, "name": "icon-arrow-right", "id": 39, @@ -48,7 +48,7 @@ "tempChar": "" }, { - "order": 41, + "order": 142, "prevSize": 24, "name": "icon-arrow-double-up", "id": 36, @@ -213,7 +213,7 @@ "tempChar": "" }, { - "order": 29, + "order": 144, "prevSize": 24, "name": "icon-person", "id": 24, @@ -221,7 +221,7 @@ "tempChar": "" }, { - "order": 86, + "order": 147, "prevSize": 24, "name": "icon-plus", "id": 81, @@ -381,7 +381,7 @@ "tempChar": "" }, { - "order": 69, + "order": 145, "prevSize": 24, "name": "icon-line-horz", "id": 64, @@ -389,7 +389,7 @@ "tempChar": "" }, { - "order": 73, + "order": 146, "prevSize": 24, "name": "icon-magnify", "id": 68, @@ -1938,7 +1938,7 @@ }, { "paths": [ - "M1024 896l-201.662-201.662c47.922-72.498 73.662-157.434 73.662-246.338 0-119.666-46.6-232.168-131.216-316.784s-197.118-131.216-316.784-131.216-232.168 46.6-316.784 131.216-131.216 197.118-131.216 316.784 46.6 232.168 131.216 316.784 197.118 131.216 316.784 131.216c88.904 0 173.84-25.74 246.338-73.662l201.662 201.662 128-128zM448 704c-141.16 0-256-114.842-256-256 0-141.16 114.84-256 256-256 141.158 0 256 114.84 256 256 0 141.158-114.842 256-256 256z" + "M1024 896l-256.8-256.8c42.4-66.6 65-144 64.8-223.2 0-229.8-186.2-416-416-416s-416 186.2-416 416 186.2 416 416 416c79 0.2 156.4-22.4 223.2-64.8l256.8 256.8 128-128zM212.4 619.6c-112.4-112.4-112.4-294.8 0-407.2s294.8-112.4 407.2 0 112.4 294.8 0 407.2c-54 54-127.2 84.4-203.6 84.4-76.4 0.2-149.8-30.2-203.6-84.4z" ], "grid": 16, "tags": [ @@ -1946,15 +1946,26 @@ ], "defaultCode": 77, "id": 68, - "attrs": [], + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, "colorPermutations": { - "1161751207457516161751": [] + "1161751207457516161751": [ + { + "f": 1 + } + ] } }, { "paths": [ - "M640 384h-128v-128h-128v128h-128v128h128v128h128v-128h128z", - "M1024 896l-201.662-201.662c47.922-72.498 73.662-157.434 73.662-246.338 0-119.666-46.6-232.168-131.216-316.784s-197.118-131.216-316.784-131.216c-119.666 0-232.168 46.6-316.784 131.216s-131.216 197.118-131.216 316.784c0 119.666 46.6 232.168 131.216 316.784s197.118 131.216 316.784 131.216c88.904 0 173.84-25.74 246.338-73.662l201.662 201.662 128-128zM448 704c-141.16 0-256-114.842-256-256 0-141.16 114.84-256 256-256 141.158 0 256 114.84 256 256 0 141.158-114.842 256-256 256z" + "M1024 896l-256.86-256.86c40.681-62.963 64.861-139.898 64.861-222.481 0-0.232-0-0.464-0.001-0.696l0 0.036c0-229.76-186.24-416-416-416s-416 186.24-416 416 186.24 416 416 416c0.196 0 0.427 0.001 0.659 0.001 82.583 0 159.518-24.18 224.112-65.846l-1.631 0.985 256.86 256.86zM212.36 619.64c-52.114-52.117-84.346-124.114-84.346-203.64 0-159.058 128.942-288 288-288s288 128.942 288 288c0 159.058-128.942 288-288 288-0.005 0-0.010-0-0.014-0l0.001 0c-0.242 0.001-0.529 0.001-0.815 0.001-79.271 0-151.010-32.251-202.811-84.348l-0.013-0.014z", + "M224 352h384v128h-384v-128z", + "M352 224h128v384h-128v-384z" ], "grid": 16, "tags": [ @@ -1962,15 +1973,37 @@ ], "defaultCode": 88, "id": 66, - "attrs": [], + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, "colorPermutations": { - "1161751207457516161751": [] + "1161751207457516161751": [ + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + } + ] } }, { "paths": [ - "M256 384h384v128h-384v-128z", - "M1024 896l-201.662-201.662c47.922-72.498 73.662-157.434 73.662-246.338 0-119.666-46.6-232.168-131.216-316.784s-197.118-131.216-316.784-131.216c-119.666 0-232.168 46.6-316.784 131.216s-131.216 197.118-131.216 316.784c0 119.666 46.6 232.168 131.216 316.784s197.118 131.216 316.784 131.216c88.904 0 173.84-25.74 246.338-73.662l201.662 201.662 128-128zM448 704c-141.16 0-256-114.842-256-256 0-141.16 114.84-256 256-256 141.158 0 256 114.84 256 256 0 141.158-114.842 256-256 256z" + "M767.2 639.2c42.4-66.6 65-144 64.8-223.2 0-229.8-186.2-416-416-416s-416 186.2-416 416 186.2 416 416 416c79 0.2 156.4-22.4 223.2-64.8l256.8 256.8 128-128-256.8-256.8zM619.6 619.6c-54 54-127.2 84.4-203.6 84.4-76.4 0.2-149.8-30.2-203.6-84.4-112.4-112.4-112.4-294.8 0-407.2s294.8-112.4 407.2 0c112.4 112.4 112.4 294.8 0 407.2z", + "M224 352h384v128h-384v-128z" ], "grid": 16, "tags": [ @@ -1978,9 +2011,25 @@ ], "defaultCode": 89, "id": 67, - "attrs": [], + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, "colorPermutations": { - "1161751207457516161751": [] + "1161751207457516161751": [ + { + "f": 1 + }, + { + "f": 1 + } + ] } }, { diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.eot b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.eot index ec6e7b74a3..c40c2939f5 100755 Binary files a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.eot and b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.eot differ diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg index ad47f27eaa..ae3d015e1e 100755 --- a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg +++ b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg @@ -54,9 +54,9 @@ - - - + + + diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.ttf b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.ttf index b380c5ff12..c7cbd72c80 100755 Binary files a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.ttf and b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.ttf differ diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.woff b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.woff index 277c9060d2..949ca37b4e 100755 Binary files a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.woff and b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.woff differ diff --git a/platform/commonUI/general/res/sass/forms/_filter.scss b/platform/commonUI/general/res/sass/forms/_filter.scss index 2544f9e982..d657b075f7 100644 --- a/platform/commonUI/general/res/sass/forms/_filter.scss +++ b/platform/commonUI/general/res/sass/forms/_filter.scss @@ -87,7 +87,6 @@ $iconD: $formInputH - ($iconEdgeM * 2); @extend .icon-magnify; // Adds a magnifying glass before, holds an input and a clear button - display: inline-block; position: relative; input[type="search"] { @@ -97,6 +96,7 @@ .menu-icon, &:before { box-sizing: border-box; + color: $colorInputIcon; display: inline-block; line-height: inherit; position: absolute; @@ -107,11 +107,16 @@ &:before { // Magnify glass icon + opacity: 0.7; left: $interiorMargin; - @include trans-prop-nice(color, 250ms); + @include trans-prop-nice(opacity, 250ms); pointer-events: none; } + &:hover:before { + opacity: 1; + } + .clear-icon { right: $iconEdgeM; // Icon is visible only when there is text input diff --git a/platform/commonUI/general/res/sass/lists/_tabular.scss b/platform/commonUI/general/res/sass/lists/_tabular.scss index c43441fca4..5ffaa31218 100644 --- a/platform/commonUI/general/res/sass/lists/_tabular.scss +++ b/platform/commonUI/general/res/sass/lists/_tabular.scss @@ -118,7 +118,8 @@ table { tbody, .tbody { top: $tabularHeaderH * 2; } - input[type="text"] { + input[type="text"], + input[type="search"] { box-sizing: border-box; width: 100%; } diff --git a/platform/commonUI/general/res/sass/search/_search.scss b/platform/commonUI/general/res/sass/search/_search.scss index c14404c42c..e6a7b2cb48 100644 --- a/platform/commonUI/general/res/sass/search/_search.scss +++ b/platform/commonUI/general/res/sass/search/_search.scss @@ -46,14 +46,10 @@ .clear-input, .menu-icon { // :before is magnify glass icon - box-sizing: border-box; - color: $colorInputIcon; height: $iconD; width: $iconD; line-height: $iconD; - position: absolute; text-align: center; - top: $iconEdgeM; } .search-input { @@ -71,16 +67,10 @@ &:before { // Magnify glass icon left: $interiorMarginSm; - @include trans-prop-nice(color, 250ms); pointer-events: none; z-index: 1; } - // Make icon lighten when hovering over search bar - &:hover:before { - color: pullForward($colorInputIcon, 10%); - } - .clear-input { // Hiding for now with addition of Cancel button right: $iconD + $interiorMargin; diff --git a/platform/features/table/res/templates/mct-table.html b/platform/features/table/res/templates/mct-table.html index f8074e5de7..2fa5b9a57c 100644 --- a/platform/features/table/res/templates/mct-table.html +++ b/platform/features/table/res/templates/mct-table.html @@ -43,8 +43,11 @@ width: columnWidths[$index] + 'px', 'max-width': columnWidths[$index] + 'px', }"> - +
+ + +
diff --git a/platform/search/res/templates/search.html b/platform/search/res/templates/search.html index de7e2403bc..9cf25c216c 100644 --- a/platform/search/res/templates/search.html +++ b/platform/search/res/templates/search.html @@ -21,7 +21,7 @@ -->
-