Skip to content

Commit

Permalink
[hotfix] Fix tooltip overflow to be visible outside widget
Browse files Browse the repository at this point in the history
  • Loading branch information
mistercrunch committed Mar 27, 2016
1 parent a898c27 commit 5be7b03
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 67 deletions.
38 changes: 0 additions & 38 deletions dashed/assets/stylesheets/dashed.css
Original file line number Diff line number Diff line change
Expand Up @@ -155,42 +155,6 @@ legend {
.panel.panel-primary {
margin: 10px;
}

.index .carousel img {
max-height: 500px;
}
.index .carousel {
overflow: hidden;
height: 500px;
}
.index .carousel-caption h1 {
font-size: 80px;
}
.index .carousel-caption p {
font-size: 20px;
}
.index div.carousel-caption{
background: rgba(0,0,0,0.5);
border-radius: 20px;
top: 150px;
bottom: auto !important;
}
.index .carousel-inner > .item > img {
margin: 0 auto;
}
.index {
margin: -20px;
}
.index .carousel-indicators li {
background-color: #AAA;
border: 1px solid black;
}

.index .carousel-indicators .active {
background-color: #000;
border: 5px solid black;
}

.datasource form div.form-control {
margin-bottom: 5px !important;
}
Expand All @@ -203,7 +167,6 @@ legend {
img.loading {
width: 40px;
}

.dashboard a i {
cursor: pointer;
}
Expand All @@ -223,7 +186,6 @@ img.loading {
margin: 5px;
border: 1px solid #ccc;
box-shadow: 2px 1px 5px -2px #aaa;
overflow: hidden;
background-color: #fff;
}
.dashboard .gridster .dragging,
Expand Down
59 changes: 30 additions & 29 deletions dashed/templates/dashed/dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,39 +82,40 @@ <h2>
data-col="{{ pos.col or loop.index }}"
data-sizex="{{ pos.size_x or 4 }}"
data-sizey="{{ pos.size_y or 4 }}">

<div class="row chart-header">

<div class="col-md-12 text-center header">
{{ slice.slice_name }}
</div>
<div class="col-md-12 chart-controls">
<div class="pull-left">
<a title="Move chart" data-toggle="tooltip">
<i class="fa fa-arrows drag"></i>
</a>
<a class="refresh" title="Force refresh data" data-toggle="tooltip">
<i class="fa fa-repeat"></i>
</a>

<div class="chart-header">
<div class="row">
<div class="col-md-12 text-center header">
{{ slice.slice_name }}
</div>
<div class="pull-right">
{% if slice.description %}
<a title="Toggle chart description">
<i class="fa fa-info-circle slice_info" slice_id="{{ slice.id }}" title="{{ slice.description }}" data-toggle="tooltip"></i>
<div class="col-md-12 chart-controls">
<div class="pull-left">
<a title="Move chart" data-toggle="tooltip">
<i class="fa fa-arrows drag"></i>
</a>
<a class="refresh" title="Force refresh data" data-toggle="tooltip">
<i class="fa fa-repeat"></i>
</a>
</div>
<div class="pull-right">
{% if slice.description %}
<a title="Toggle chart description">
<i class="fa fa-info-circle slice_info" slice_id="{{ slice.id }}" title="{{ slice.description }}" data-toggle="tooltip"></i>
</a>
{% endif %}
<a href="{{ slice.edit_url }}" title="Edit chart" data-toggle="tooltip">
<i class="fa fa-pencil"></i>
</a>
{% endif %}
<a href="{{ slice.edit_url }}" title="Edit chart" data-toggle="tooltip">
<i class="fa fa-pencil"></i>
</a>
<a href="{{ slice.slice_url }}" title="Explore chart" data-toggle="tooltip">
<i class="fa fa-share"></i>
</a>
<a class="remove-chart" title="Remove chart from dashboard" data-toggle="tooltip">
<i class="fa fa-close"></i>
</a>
<a href="{{ slice.slice_url }}" title="Explore chart" data-toggle="tooltip">
<i class="fa fa-share"></i>
</a>
<a class="remove-chart" title="Remove chart from dashboard" data-toggle="tooltip">
<i class="fa fa-close"></i>
</a>
</div>
</div>
</div>

</div>
</div>
<div
class="slice_description bs-callout bs-callout-default"
Expand Down

0 comments on commit 5be7b03

Please sign in to comment.