IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-09 23:16:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(panel): fixed text panel issue due to recent style changes, fixes #4095

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-02-21 08:51:01 +01:00
parent 1a412378db
commit ac45ccbad7
5 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
public/app/plugins/panel/text/editor.html
View File

@ -1,17 +1,26 @@
<div>
<div class="row-fluid">
<div class="span4">
<label class="small">Mode</label> <select class="input-medium" ng-model="ctrl.panel.mode" ng-options="f for f in ['html','markdown','text']"></select>
</div>
<div class="span2" ng-show="ctrl.panel.mode == 'text'">
<label class="small">Font Size</label> <select class="input-mini" ng-model="ctrl.panel.style['font-size']" ng-options="f for f in ['6pt','7pt','8pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select>
</div>
</div>
<div class="gf-form-group">
<div class="gf-form-inline">
<div class="gf-form">
<span class="gf-form-label">Mode</span>
<span class="gf-form-select-wrapper">
<select class="gf-form-input" ng-model="ctrl.panel.mode" ng-options="f for f in ['html','markdown','text']"></select>
</span>
</div>
<label class=small>Content
<span ng-show="ctrl.panel.mode == 'markdown'">(This area uses <a target="_blank" href="http://en.wikipedia.org/wiki/Markdown">Markdown</a>. HTML is not supported)</span>
</label>
<textarea ng-model="ctrl.panel.content" rows="20" style="width:95%" ng-change="ctrl.render()" ng-model-onblur>
</textarea>
<div class="gf-form" ng-show="ctrl.panel.mode == 'text'">
<span class="gf-form-label">Font Size</span>
<span class="gf-form-select-wrapper">
<select class="gf-form-input" ng-model="ctrl.panel.style['font-size']" ng-options="f for f in ['6pt','7pt','8pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select>
</span>
</div>
</div>
</div>
<h3 class="page-heading">Content</h3>
<span ng-show="ctrl.panel.mode == 'markdown'">
(This area uses <a target="_blank" href="http://en.wikipedia.org/wiki/Markdown">Markdown</a>. HTML is not supported)
</span>
<textarea class="gf-form-input" ng-model="ctrl.panel.content" rows="20" style="width:95%" ng-change="ctrl.render()" ng-model-onblur>
</textarea>

3
public/app/plugins/panel/text/module.html
View File

@ -1 +1,2 @@
<p ng-bind-html="ctrl.content" ng-show="ctrl.content"></p>
<p class="panel-text-content" ng-bind-html="ctrl.content" ng-show="ctrl.content">
</p>

1
public/sass/_grafana.scss
View File

@ -40,6 +40,7 @@
@import "components/panel_dashlist";
@import "components/panel_singlestat";
@import "components/panel_table";
@import "components/panel_text";
@import "components/tagsinput";
@import "components/tables_lists";
@import "components/search";

1
public/sass/base/_forms.scss
View File

@ -32,6 +32,7 @@ input,
button,
select,
textarea {
background-color: $input-bg;
@include font-shorthand($font-size-base,normal,$line-height-base); // Set size, weight, line-height here
}
input,

6
public/sass/components/_panel_text.scss Normal file
View File

@ -0,0 +1,6 @@
.panel-text-content {
ul {
margin: 0 0 $spacer $spacer * 1.5;
}
}