Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #7194 Editor errors on Visualize are broken #7702

Merged
merged 6 commits into from
Jul 27, 2016
Merged

fix #7194 Editor errors on Visualize are broken #7702

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c7e89a9
fix #7194 Editor errors on Visualize are broken
ppisljar Jul 11, 2016
be4a47f
- fixing styles to reduce specificity
ppisljar Jul 16, 2016
d019a5e
- adding comment
ppisljar Jul 16, 2016
5a91329
updating to follow new html style guide
ppisljar Jul 26, 2016
7c47e13
updating style
ppisljar Jul 26, 2016
380aafc
fixing typos
ppisljar Jul 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 35 additions & 11 deletions src/core_plugins/kibana/public/visualize/editor/sidebar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<div class="sidebar-container">
<form class="sidebar-list"
ng-submit="visualizeEditor.$invalid ? dontApply() : stageEditableVis()"
name="visualizeEditor"
novalidate><!-- see http://goo.gl/9kgz5w -->
<form
class="sidebar-list"
ng-submit="visualizeEditor.$invalid ? dontApply() : stageEditableVis()"
name="visualizeEditor"
novalidate
><!-- see http://goo.gl/9kgz5w -->

<div css-truncate title="{{indexPattern.id}}" ng-if="vis.type.requiresSearch" class="index-pattern">
{{ indexPattern.id }}
Expand All @@ -14,31 +16,53 @@
<!-- tabs -->
<ul class="nav navbar-nav">
<li ng-class="{active: sidebar.section == 'data'}" ng-show="sidebar.showData">
<a class="navbar-link active" ng-click="sidebar.section='data'">Data</a>
<a
class="vis-editor-subnav-link"
g-class="{'is-vis-editor-sub-nav-link-selected': sidebar.section == 'data'}"
g-click="sidebar.section='data'"
>Data</a>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this will be more maintainable if we separate the opening and closing tags from the content:

>
  Data
</a>

I think this consistency will let us change the content, e.g. adding more text, adding new elements, without having to add and remove new lines depending on how much content there is. What do you think?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i agree

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh wait, I found a couple typos here... on lines 21 and 22, it looks like ng-class and ng-click got turned into g-class and g-click.

</li>
<li ng-class="{active: sidebar.section == 'options'}">
<a class="navbar-link" ng-click="sidebar.section='options'">Options</a>
<a
class="vis-editor-subnav-link"
g-class="{'is-vis-editor-sub-nav-link-selected': sidebar.section == 'options'}"
g-click="sidebar.section='options'"
>Options</a>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same typos here.

</li>
</ul>

<!-- controls -->
<ul class="nav navbar-nav navbar-right">
<li ng-if="visualizeEditor.softErrorCount() > 0"
<li
ng-if="visualizeEditor.softErrorCount() > 0"
disabled
tooltip="{{ visualizeEditor.describeErrors() }}" tooltip-placement="bottom" tooltip-popup-delay="400" tooltip-append-to-body="1">
<a class="danger navbar-link">
tooltip="{{ visualizeEditor.describeErrors() }}"
tooltip-placement="bottom"
tooltip-popup-delay="400"
tooltip-append-to-body="1"
>
<a class="vis-editor-subnav-link vis-editor-subnav-link--danger">
<i class="fa fa-warning"></i>
</a>
</li>
<li tooltip="Apply changes" tooltip-placement="bottom" tooltip-popup-delay="400" tooltip-append-to-body="1">
<li
tooltip="Apply changes"
tooltip-placement="bottom"
tooltip-popup-delay="400" tooltip-append-to-body="1"
>
<button class="btn-success navbar-btn-link"
type="submit"
ng-disabled="!vis.dirty">

<i class="fa fa-play"></i>
</button>
</li>
<li tooltip="Discard changes" tooltip-placement="bottom" tooltip-popup-delay="400" tooltip-append-to-body="1">
<li
tooltip="Discard changes"
tooltip-placement="bottom"
tooltip-popup-delay="400"
tooltip-append-to-body="1"
>
<button class="btn-default navbar-btn-link"
ng-disabled="!vis.dirty"
ng-click="resetEditableVis()">
Expand Down
64 changes: 34 additions & 30 deletions src/core_plugins/kibana/public/visualize/editor/styles/_editor.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,6 @@
.vis-editor {
.flex-parent();

// For the vis-editor sidebar nav
.navbar-default .navbar-nav {
&> .active > a {
border-bottom: 2px solid @kibanaGray2;
color: @kibanaGray1;
&:before {
display: none;
}
&:hover {
background-color: transparent;
}
}

> li {
> a {
padding: 4px 0;
margin: 0 10px;
color: @kibanaGray2;
}
> a:hover {
border-bottom: 2px solid @kibanaGray2;
}
}

.danger {
color: @vis-editor-navbar-error-state-color;
background-color: @vis-editor-navbar-error-state-bg;
}
}

.btn-xs {
line-height: 1.3;
}
Expand Down Expand Up @@ -382,6 +352,40 @@ vis-editor-vis-options > * {
.flex-parent();
}

/**
* 1. TODO: Override bootstrap styles. Remove !important once we're rid of bootstrap.
*/
.vis-editor-subnav-link {
padding: 4px 10px 5px 10px !important; /* 1 */
color: @kibanaGray2 !important; /* 1 */

&.is-vis-editor-sub-nav-link-selected {
border-bottom: 2px solid @kibanaGray2;
color: @kibanaGray1;
background-color: #f6f6f6;

&:before {
display: none;
}

&:hover {
background-color: transparent;
}
}
}

/**
* 1. TODO: Override bootstrap styles. Remove !important once we're rid of bootstrap.
*/
.vis-editor-subnav-link--danger {
color: @vis-editor-navbar-error-state-color !important; /* 1 */
background-color: @vis-editor-navbar-error-state-bg;

&:hover {
background-color: darken(@vis-editor-navbar-error-state-bg, 12%) !important; /* 1 */
}
}

form.vis-share {
div.form-control {
height: inherit;
Expand Down