Skip to content

Commit

Permalink
Vis LESS to SASS (cont.) (#23199)
Browse files Browse the repository at this point in the history
  • Loading branch information
cchaos authored and chrisronline committed Sep 21, 2018
1 parent 488829d commit 0e9329d
Show file tree
Hide file tree
Showing 42 changed files with 187 additions and 288 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@

<div id="gaugeOptionsRanges" ng-show="showColorRange" class="kuiSideBarCollapsibleSection">
<div class="kuiSideBarSection">
<table class="vis-editor-agg-editor-ranges form-group" ng-show="editorState.params.gauge.colorsRange.length">
<table class="visEditorAgg__rangesTable form-group" ng-show="editorState.params.gauge.colorsRange.length">
<tr>
<th scope="col">
<label id="gaugeOptionsCustomRangeFrom">From</label>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<div class="kuiSideBarSection">
<table
data-test-subj="heatmapCustomRangesTable"
class="vis-editor-agg-editor-ranges form-group"
class="visEditorAgg__rangesTable form-group"
ng-show="editorState.params.colorsRange.length">
<tr>
<th scope="col">
Expand Down
26 changes: 2 additions & 24 deletions src/core_plugins/markdown_vis/public/markdown_vis.less
Original file line number Diff line number Diff line change
@@ -1,30 +1,8 @@
@import (reference) "~ui/styles/mixins.less";

.markdown-vis {
padding: 1em;
width: 100%;
}

.visEditor {

&.visEditor--markdown {

.visualization-options {
.flex-parent();
flex: 1 1 auto;
}

.markdown-vis-options {
.flex-parent();
flex: 1 1 auto;

textarea {
flex: 1 1 auto;
resize: none;
}

}

}

#markdownVisInput {
resize: none;
}
10 changes: 5 additions & 5 deletions src/core_plugins/markdown_vis/public/markdown_vis_params.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<div class="kuiSideBarSection">
<div class="markdown-vis-options form-group">
<div>
<div class="form-group">
<div class="clearfix form-group">
<label
class="pull-left"
for="markdownVisInput"
i18n-id="markdownVis.params.markdownLabel"
i18n-default-message="Markdown"
>
</label>
></label>
<small class="pull-right">
<a target="_window" href="https://help.github.com/articles/github-flavored-markdown/">
<icon aria-hidden="true" size="'s'" type="'link'"></icon>
<span
i18n-id="markdownVis.params.helpLinkLabel"
i18n-default-message="Help"
>
</span>
<i aria-hidden="true" class="fa fa-link"></i>
</a>
</small>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/metric_vis/public/metric_vis_params.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

<div id="metricOptionsRanges" ng-show="showColorRange" class="kuiSideBarCollapsibleSection">
<div class="kuiSideBarSection">
<table class="vis-editor-agg-editor-ranges form-group" ng-show="editorState.params.metric.colorsRange.length">
<table class="visEditorAgg__rangesTable form-group" ng-show="editorState.params.metric.colorsRange.length">
<tr>
<th scope="col">
<label id="metricOptionsCustomRangeFrom">From</label>
Expand Down
7 changes: 7 additions & 0 deletions src/core_plugins/region_map/public/region_map.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,11 @@
left: 0;
width: 100%;
height: 100%;

}

region_map-vis-params {
.ems-hotlink {
font-size: 10px;
}
}
6 changes: 3 additions & 3 deletions src/core_plugins/region_map/public/region_map_vis_params.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
</div>
</div>

<div class="kuiSideBarFormRow" ng-hide="!editorState.params.emsHotLink">
<div class="form-group clearfix" ng-hide="!editorState.params.emsHotLink">
<a
class="ems-hotlink"
class="ems-hotlink pull-right"
target="_blank"
rel="noopener noreferrer"
ng-href="{{editorState.params.emsHotLink}}"
target="_blank"
title="Preview {{editorState.params.selectedLayer.name}} on the Elastic Maps Service"
>Preview on EMS
><icon aria-hidden size="'s'" type="'link'" /> Preview on EMS
</a>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<label>
Cluster size
</label>
<div class="vis-editor-agg-form-row">
<div class="visEditorAgg__formRow--flex">
<input
name="heatClusterSize"
ng-model="editorState.params.heatClusterSize"
Expand All @@ -44,7 +44,7 @@
max="3.0"
step="0.1"
>
<div class="vis-editor-agg-form-value">
<div class="visEditorAgg__sliderValue">
{{editorState.params.heatClusterSize}}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/agg_types/controls/date_ranges.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div>
<table class="vis-editor-agg-editor-ranges form-group" ng-show="agg.params.ranges.length">
<table class="visEditorAgg__rangesTable form-group" ng-show="agg.params.ranges.length">
<tr>
<th scope="col">
<label id="visEditorDateRangeFrom{{agg.id}}">From</label>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/agg_types/controls/extended_bounds.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
></icon-tip>
</label>
</div>
<div class="vis-editor-agg-form-row">
<div class="visEditorAgg__formRow--flex">
<div class="form-group">
<label
id="extendedBoundsMinLabel{{agg.id}}"
Expand Down
4 changes: 2 additions & 2 deletions src/ui/public/agg_types/controls/field.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
title="Aggregation Field"
name="field"
required
class="vis-editor-field-ui-select field-select"
class="visEditorAggSelect__select field-select"
ng-show="indexedFields.length"
ng-model="agg.params.field"
on-select="aggParam.onChange(agg)"
Expand All @@ -23,7 +23,7 @@
>
<div
data-test-subj="{{field.displayName}}"
class="vis-editor-field-ui-select__field-entry"
class="eui-textTruncate"
ng-bind-html="field.displayName | highlight: $select.search"
title="{{field.displayName}}"
></div>
Expand Down
6 changes: 3 additions & 3 deletions src/ui/public/agg_types/controls/filters.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<div class="form-group">
<div ng-repeat="filter in agg.params.filters">
<div class="vis-editor-agg-header">
<label for="visEditorFilterInput{{agg.id}}">
<div class="visEditorAggHeader">
<label class="visEditorAggHeader__title visEditorAggHeader__title--grow" for="visEditorFilterInput{{agg.id}}">
Filter {{$index + 1}}
<span ng-if="filter.label">- {{ filter.label }}</span>
</label>

<div class="kuiButtonGroup kuiButtonGroup--united">
<div class="visEditorAggHeader__controls kuiButtonGroup kuiButtonGroup--united">
<button
ng-click="showConfig = !showConfig"
type="button"
Expand Down
4 changes: 2 additions & 2 deletions src/ui/public/agg_types/controls/ip_ranges.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="euiSpacer euiSpacer--s"></div>

<div ng-show="agg.params.ipRangeType != 'mask'">
<table class="vis-editor-agg-editor-ranges form-group" ng-show="agg.params.ranges.fromTo.length">
<table class="visEditorAgg__rangesTable form-group" ng-show="agg.params.ranges.fromTo.length">
<tr>
<th scope="col">
<label id="visEditorIpRangeFromLabel{{agg.id}}">From</label>
Expand Down Expand Up @@ -66,7 +66,7 @@
</div>

<div ng-show="agg.params.ipRangeType == 'mask'">
<table class="vis-editor-agg-editor-ranges form-group" ng-show="agg.params.ranges.mask.length">
<table class="visEditorAgg__rangesTable form-group" ng-show="agg.params.ranges.mask.length">
<tr>
<th scope="col">
<label id="visEditorIpRangeCidrLabel{{agg.id}}">CIDR Mask</label>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/agg_types/controls/order_agg.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</option>
</select>
</div>
<div ng-show="agg.params.orderAgg" class="vis-editor-agg-order-agg">
<div ng-show="agg.params.orderAgg" class="visEditorAgg__subAgg">
<vis-editor-agg-params
index-pattern="agg.getIndexPattern()"
agg="agg.params.orderAgg"
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/agg_types/controls/order_and_size.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div>
<div class="vis-editor-agg-form-row">
<div class="visEditorAgg__formRow--flex">
<div ng-if="agg.type.params.byName.order" class="form-group">
<label for="visEditorOrderByOrder{{agg.id}}">Order</label>
<select
Expand Down
8 changes: 4 additions & 4 deletions src/ui/public/agg_types/controls/other_bucket.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div>
<div class="vis-editor-agg-form-row">
<div class="visEditorAgg__formRow--flex">
<div class="form-group">
<label>
<input
Expand All @@ -16,7 +16,7 @@
</label>
</div>
</div>
<div class="vis-editor-agg-form-row" ng-if="agg.params.otherBucket">
<div class="visEditorAgg__formRow--flex" ng-if="agg.params.otherBucket">
<div class="form-group">
<label>
Label for other bucket
Expand All @@ -30,7 +30,7 @@
</div>
</div>
</div>
<div class="vis-editor-agg-form-row">
<div class="visEditorAgg__formRow--flex">
<div class="form-group">
<label>
<input
Expand All @@ -48,7 +48,7 @@
</label>
</div>
</div>
<div class="vis-editor-agg-form-row" ng-show="agg.params.missingBucket">
<div class="visEditorAgg__formRow--flex" ng-show="agg.params.missingBucket">
<div class="form-group">
<label>
Label for missing values
Expand Down
12 changes: 6 additions & 6 deletions src/ui/public/agg_types/controls/precision.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="vis-editor-agg-form-row" ng-controller="agg.type.params.byName.precision.controller">
<div class="visEditorAgg__formRow--flex" ng-controller="agg.type.params.byName.precision.controller">
<div ng-if="!agg.params.autoPrecision" class="form-group">
<label for="visEditorMapPrecision{{agg.id}}">Precision</label>
<div class="vis-editor-agg-form-row">
<div class="visEditorAgg__formRow--flex">
<input
id="visEditorMapPrecision{{agg.id}}"
name="precision"
Expand All @@ -12,14 +12,14 @@
min="1"
max="{{config.get('visualization:tileMap:maxPrecision')}}"
>
<div class="form-group vis-editor-agg-form-value">
<div class="visEditorAgg__sliderValue">
{{agg.params.precision}}
</div>
</div>
</div>
</div>

<div class="vis-option-item">
<div>
<label>
<input type="checkbox"
name="autoPrecision"
Expand All @@ -28,7 +28,7 @@
</label>
</div>

<div class="vis-option-item">
<div>
<label>
<input type="checkbox"
name="useGeocentroid"
Expand All @@ -37,7 +37,7 @@
</label>
</div>

<div class="vis-option-item">
<div>
<label>
<input
type="checkbox"
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/agg_types/controls/ranges.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<table class="vis-editor-agg-editor-ranges form-group" ng-show="agg.params.ranges.length">
<table class="visEditorAgg__rangesTable form-group" ng-show="agg.params.ranges.length">
<tr>
<th scope="col">
<label id="visEditorRangeFrom{{agg.id}}">From</label>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/agg_types/controls/sub_agg.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</option>
</select>
</div>
<div ng-if="agg.params.metricAgg === 'custom'" class="vis-editor-agg-order-agg">
<div ng-if="agg.params.metricAgg === 'custom'" class="visEditorAgg__subAgg">
<ng-form name="customMetricForm">
<vis-editor-agg-params
index-pattern="agg.getIndexPattern()"
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/agg_types/controls/sub_metric.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div ng-controller="aggParam.controller">
<div class="form-group" ng-if="agg.params[aggType]">
<label>{{aggTitle}}</label>
<div class="vis-editor-agg-order-agg">
<div class="visEditorAgg__subAgg">
<ng-form name="{{aggType}}Form">
<vis-editor-agg-params
agg="agg.params[aggType]"
Expand Down
6 changes: 3 additions & 3 deletions src/ui/public/agg_types/controls/top_aggregate_and_size.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div ng-controller="aggParam.controller" class="vis-editor-agg-form-row">
<div class="form-group vis-editor-agg-form-row__even-split">
<div ng-controller="aggParam.controller" class="visEditorAgg__formRow--flex">
<div class="form-group visEditorAgg__formRow--split">
<label for="visEditorTopHitsAggregate{{agg.id}}">
Aggregate with
<icon-tip
Expand All @@ -16,7 +16,7 @@
class="form-control"
></select>
</div>
<div class="form-group vis-editor-agg-form-row__even-split">
<div class="form-group visEditorAgg__formRow--split">
<label for="visEditorTopHitsSize{{agg.id}}">
Size
<icon-tip
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/agg_types/controls/top_sort.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
name="field"
sortField
title="Sort on"
class="vis-editor-field-ui-select"
class="visEditorAggSelect__select"
ng-show="sortFieldOptions.length"
ng-model="agg.params.sortField"
uis-open-close="limit = 100"
Expand Down
1 change: 1 addition & 0 deletions src/ui/public/vis/_index.scss
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
@import './editors/components/index';
@import './editors/default/index';
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

exports[`<EditorOptionsGroup/> renders as expected 1`] = `
<div
class="euiPanel euiPanel--paddingMedium euiPanel--flexGrowZero editorOptionsGroup__panel"
class="euiPanel euiPanel--paddingMedium euiPanel--flexGrowZero visEditorOptionsGroup__panel"
>
<div
class="euiAccordion euiAccordion-isOpen"
Expand Down Expand Up @@ -84,7 +84,7 @@ exports[`<EditorOptionsGroup/> renders as expected 1`] = `

exports[`<EditorOptionsGroup/> renders as expected with actions 1`] = `
<div
class="euiPanel euiPanel--paddingMedium euiPanel--flexGrowZero editorOptionsGroup__panel"
class="euiPanel euiPanel--paddingMedium euiPanel--flexGrowZero visEditorOptionsGroup__panel"
>
<div
class="euiAccordion euiAccordion-isOpen"
Expand Down Expand Up @@ -193,7 +193,7 @@ exports[`<EditorOptionsGroup/> renders as expected with actions 1`] = `

exports[`<EditorOptionsGroup/> renders as expected with initial collapsed 1`] = `
<div
class="euiPanel euiPanel--paddingMedium euiPanel--flexGrowZero editorOptionsGroup__panel"
class="euiPanel euiPanel--paddingMedium euiPanel--flexGrowZero visEditorOptionsGroup__panel"
>
<div
class="euiAccordion"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.visEditorOptionsGroup__panel + .visEditorOptionsGroup__panel {
margin-top: $euiSizeS;
}
1 change: 1 addition & 0 deletions src/ui/public/vis/editors/components/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import './editor_options_group';
Loading

0 comments on commit 0e9329d

Please sign in to comment.