Commit b7255723 by Torkel Ödegaard

ux: style tweaks, trying out non italic headers

parent 876bb08b
......@@ -4,9 +4,6 @@
<div class="search-container" ng-if="ctrl.isOpen">
<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"
ng-keydown="ctrl.keyDown($event)"
......
......@@ -30,15 +30,17 @@ export class SearchCtrl {
closeSearch() {
this.isOpen = this.ignoreClose;
this.openCompleted = false;
this.contextSrv.isSearching = this.isOpen;
}
openSearch(evt, payload) {
if (this.isOpen) {
this.isOpen = false;
this.closeSearch();
return;
}
this.isOpen = true;
this.contextSrv.isSearching = true;
this.giveSearchFocus = 0;
this.selectedIndex = -1;
this.results = [];
......
......@@ -4,7 +4,7 @@
</h2>
<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}">
{{::tab}}
</a>
......@@ -38,13 +38,6 @@
</bootstrap-tagsinput>
</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"
initial-title="dashboardMeta.folderTitle"
on-change="onFolderChange($folder)"
......@@ -53,8 +46,14 @@
</div>
<div class="section">
<h5 class="section-heading">Toggles</h5>
<h5 class="section-heading">Options</h5>
<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"
label="Editable"
tooltip="Uncheck, then save and reload to disable all dashboard editing"
......
......@@ -70,7 +70,7 @@ h1, h2, h3, h4, h5, h6,
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; }
h3, .h3 { font-size: $font-size-h3; }
h4, .h4 { font-size: $font-size-h4; }
......
......@@ -47,7 +47,6 @@
}
.modal-header-title {
font-style: italic;
font-size: $font-size-h3;
float: left;
padding-top: $spacer * 0.75;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment