IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into query-editor-style

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-04-18 09:51:35 -04:00
commit 14ec69a160
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/plugins/partials/update_instructions.html
View File

@ -16,6 +16,6 @@
<pre><code>grafana-cli plugins update {{plugin.id}}</code></pre> <pre><code>grafana-cli plugins update {{plugin.id}}</code></pre>
<span class="small">Check out {{plugin.name}} on <a href="http://grafana/net/plugins/{{plugin.id}}">Grafana.net</a> for README and changelog. If you do not have access to the command line, ask your Grafana administator.</span> <span class="small">Check out {{plugin.name}} on <a href="http://grafana/net/plugins/{{plugin.id}}">Grafana.net</a> for README and changelog. If you do not have access to the command line, ask your Grafana administator.</span>
</div> </div>
<p class="pluginlist-none-installed code--line"><img class="pluginlist-inline-logo" src="public/img/grafana_icon.svg"><strong>Pro tip</strong>: To update all plugins at once, type <code class="code--small">grafana-cli plugins update-all</code> on the command line.</div> <p class="pluginlist-none-installed"><img class="pluginlist-inline-logo" src="public/img/grafana_icon.svg"><strong>Pro tip</strong>: To update all plugins at once, type <code class="code--small">grafana-cli plugins update-all</code> on the command line.</div>
</div> </div>
</div> </div>

6
public/sass/base/_code.scss
View File

@ -21,6 +21,8 @@ code {
background-color: $code-tag-bg; background-color: $code-tag-bg;
border: 1px solid darken($code-tag-bg, 15%); border: 1px solid darken($code-tag-bg, 15%);
white-space: nowrap; white-space: nowrap;
padding: 2px 5px;
margin: 0 2px;
} }
code.code--small { code.code--small {
@ -29,10 +31,6 @@ code.code--small {
margin: 0 2px; margin: 0 2px;
} }
p.code--line {
line-height: 1.8;
}
// Blocks of code // Blocks of code
pre { pre {
display: block; display: block;

1
public/sass/components/_panel_text.scss
View File

@ -3,4 +3,5 @@
ul { ul {
margin: 0 0 $spacer $spacer * 1.5; margin: 0 0 $spacer $spacer * 1.5;
} }
li {line-height: 2;}
} }