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

ux: style tweaks, trying out non italic headers

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-06-23 09:18:39 -04:00
parent 876bb08b05
commit b7255723ea
5 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/core/components/search/search.html
View File

@@ -4,9 +4,6 @@
<div class="search-container" ng-if="ctrl.isOpen"> <div class="search-container" ng-if="ctrl.isOpen">
<div class="search-field-wrapper"> <div class="search-field-wrapper">
<!-- <div class="search&#45;field&#45;icon pointer" ng&#45;click="ctrl.closeSearch()"> -->
<!-- <i class="fa fa&#45;search"></i> -->
<!-- </div> -->
<input type="text" placeholder="Find dashboards by name" give-focus="ctrl.giveSearchFocus" tabindex="1" <input type="text" placeholder="Find dashboards by name" give-focus="ctrl.giveSearchFocus" tabindex="1"
ng-keydown="ctrl.keyDown($event)" ng-keydown="ctrl.keyDown($event)"

4
public/app/core/components/search/search.ts
View File

@@ -30,15 +30,17 @@ export class SearchCtrl {
closeSearch() { closeSearch() {
this.isOpen = this.ignoreClose; this.isOpen = this.ignoreClose;
this.openCompleted = false; this.openCompleted = false;
this.contextSrv.isSearching = this.isOpen;
} }
openSearch(evt, payload) { openSearch(evt, payload) {
if (this.isOpen) { if (this.isOpen) {
this.isOpen = false; this.closeSearch();
return; return;
} }
this.isOpen = true; this.isOpen = true;
this.contextSrv.isSearching = true;
this.giveSearchFocus = 0; this.giveSearchFocus = 0;
this.selectedIndex = -1; this.selectedIndex = -1;
this.results = []; this.results = [];

17
public/app/features/dashboard/partials/settings.html
View File

@@ -4,7 +4,7 @@
</h2> </h2>
<ul class="gf-tabs"> <ul class="gf-tabs">
<li class="gf-tabs-item" ng-repeat="tab in ::['General', 'Rows', 'Links', 'Time picker']"> <li class="gf-tabs-item" ng-repeat="tab in ::['General', 'Links', 'Time picker']">
<a class="gf-tabs-link" ng-click="editor.index = $index" ng-class="{active: editor.index === $index}"> <a class="gf-tabs-link" ng-click="editor.index = $index" ng-class="{active: editor.index === $index}">
{{::tab}} {{::tab}}
</a> </a>
@@ -38,13 +38,6 @@
</bootstrap-tagsinput> </bootstrap-tagsinput>
</div> </div>
<div class="gf-form">
<label class="gf-form-label width-7">Timezone</label>
<div class="gf-form-select-wrapper">
<select ng-model="dashboard.timezone" class='gf-form-input' ng-options="f.value as f.text for f in [{value: '', text: 'Default'}, {value: 'browser', text: 'Local browser time'},{value: 'utc', text: 'UTC'}]" ng-change="timezoneChanged()"></select>
</div>
</div>
<folder-picker ng-if="!dashboardMeta.isFolder" <folder-picker ng-if="!dashboardMeta.isFolder"
initial-title="dashboardMeta.folderTitle" initial-title="dashboardMeta.folderTitle"
on-change="onFolderChange($folder)" on-change="onFolderChange($folder)"
@@ -53,8 +46,14 @@
</div> </div>
<div class="section"> <div class="section">
<h5 class="section-heading">Toggles</h5> <h5 class="section-heading">Options</h5>
<div class="gf-form-group"> <div class="gf-form-group">
<div class="gf-form">
<label class="gf-form-label width-11">Timezone</label>
<div class="gf-form-select-wrapper">
<select ng-model="dashboard.timezone" class='gf-form-input' ng-options="f.value as f.text for f in [{value: '', text: 'Default'}, {value: 'browser', text: 'Local browser time'},{value: 'utc', text: 'UTC'}]" ng-change="timezoneChanged()"></select>
</div>
</div>
<gf-form-switch class="gf-form" <gf-form-switch class="gf-form"
label="Editable" label="Editable"
tooltip="Uncheck, then save and reload to disable all dashboard editing" tooltip="Uncheck, then save and reload to disable all dashboard editing"

2
public/sass/base/_type.scss
View File

@@ -70,7 +70,7 @@ h1, h2, h3, h4, h5, h6,
color: $headings-color; color: $headings-color;
} }
h1, .h1 { font-size: $font-size-h1; font-style: italic; } h1, .h1 { font-size: $font-size-h1; }
h2, .h2 { font-size: $font-size-h2; } h2, .h2 { font-size: $font-size-h2; }
h3, .h3 { font-size: $font-size-h3; } h3, .h3 { font-size: $font-size-h3; }
h4, .h4 { font-size: $font-size-h4; } h4, .h4 { font-size: $font-size-h4; }

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

@@ -47,7 +47,6 @@
} }
.modal-header-title { .modal-header-title {
font-style: italic;
font-size: $font-size-h3; font-size: $font-size-h3;
float: left; float: left;
padding-top: $spacer * 0.75; padding-top: $spacer * 0.75;