Commit 6be50c95 by Torkel Ödegaard Committed by GitHub

Merge pull request #15400 from grafana/removed-icons-in-buttons

Removed some icons in action button
parents 960fa560 f195459b
......@@ -4,8 +4,7 @@
<div class="page-action-bar">
<div class="page-action-bar__spacer"></div>
<a class="page-header__cta btn btn-primary" href="org/new">
<i class="fa fa-plus"></i>
New Org
New org
</a>
</div>
......
......@@ -8,8 +8,7 @@
</label>
<div class="page-action-bar__spacer"></div>
<a class="btn btn-primary" href="admin/users/create">
<i class="fa fa-plus"></i>
Add new user
New user
</a>
</div>
......
......@@ -8,7 +8,7 @@
</div>
<a href="alerting/notification/new" class="btn btn-primary">
New Channel
New channel
</a>
</div>
......
......@@ -198,7 +198,7 @@ export class ApiKeysPage extends PureComponent<Props, any> {
<div className="page-action-bar__spacer" />
<button className="btn btn-primary pull-right" onClick={this.onToggleAdding} disabled={isAdding}>
Add API Key
Add API key
</button>
</div>
......
......@@ -11,14 +11,12 @@
<div class="dashboard-settings__aside-actions">
<button class="btn btn-primary" ng-click="ctrl.saveDashboard()" ng-show="ctrl.canSave">
<i class="fa fa-save"></i> Save
Save
</button>
<button class="btn btn-inverse" ng-click="ctrl.openSaveAsModal()" ng-show="ctrl.canSaveAs">
<i class="fa fa-copy"></i>
Save As...
</button>
<button class="btn btn-danger" ng-click="ctrl.deleteDashboard()" ng-show="ctrl.canDelete">
<i class="fa fa-trash"></i>
Delete
</button>
</div>
......@@ -101,7 +99,7 @@
<div class="gf-form-button-row">
<button class="btn btn-primary" ng-click="ctrl.saveDashboardJson()" ng-show="ctrl.canSave">
<i class="fa fa-save"></i> Save Changes
Save Changes
</button>
</div>
</div>
......
......@@ -82,10 +82,10 @@ export class FolderSettingsPage extends PureComponent<Props, State> {
</div>
<div className="gf-form-button-row">
<button type="submit" className="btn btn-primary" disabled={!folder.canSave || !folder.hasChanged}>
<i className="fa fa-save" /> Save
Save
</button>
<button className="btn btn-danger" onClick={this.onDelete} disabled={!folder.canSave}>
<i className="fa fa-trash" /> Delete
Delete
</button>
</div>
</form>
......
......@@ -42,9 +42,6 @@ exports[`Render should enable save button 1`] = `
disabled={false}
type="submit"
>
<i
className="fa fa-save"
/>
Save
</button>
<button
......@@ -52,9 +49,6 @@ exports[`Render should enable save button 1`] = `
disabled={false}
onClick={[Function]}
>
<i
className="fa fa-trash"
/>
Delete
</button>
</div>
......@@ -106,9 +100,6 @@ exports[`Render should render component 1`] = `
disabled={true}
type="submit"
>
<i
className="fa fa-save"
/>
Save
</button>
<button
......@@ -116,9 +107,6 @@ exports[`Render should render component 1`] = `
disabled={false}
onClick={[Function]}
>
<i
className="fa fa-trash"
/>
Delete
</button>
</div>
......
......@@ -5,7 +5,7 @@
<div class="page-action-bar">
<div class="page-action-bar__spacer"></div>
<a class="btn btn-primary pull-right" href="playlists/create">
New Playlist
New playlist
</a>
</div>
......
......@@ -102,7 +102,7 @@ export class TeamMembers extends PureComponent<Props, State> {
<div className="page-action-bar__spacer" />
<button className="btn btn-primary pull-right" onClick={this.onToggleAdding} disabled={isAdding}>
<i className="fa fa-plus" /> Add a member
Add member
</button>
</div>
......@@ -111,7 +111,7 @@ export class TeamMembers extends PureComponent<Props, State> {
<button className="cta-form__close btn btn-transparent" onClick={this.onToggleAdding}>
<i className="fa fa-close" />
</button>
<h5>Add Team Member</h5>
<h5>Add team member</h5>
<div className="gf-form-inline">
<UserPicker onSelected={this.onUserSelected} className="min-width-30" />
{this.state.newTeamMember && (
......
......@@ -24,10 +24,7 @@ exports[`Render should render component 1`] = `
disabled={false}
onClick={[Function]}
>
<i
className="fa fa-plus"
/>
Add a member
Add member
</button>
</div>
<Component
......@@ -45,7 +42,7 @@ exports[`Render should render component 1`] = `
/>
</button>
<h5>
Add Team Member
Add team member
</h5>
<div
className="gf-form-inline"
......@@ -111,10 +108,7 @@ exports[`Render should render team members 1`] = `
disabled={false}
onClick={[Function]}
>
<i
className="fa fa-plus"
/>
Add a member
Add member
</button>
</div>
<Component
......@@ -132,7 +126,7 @@ exports[`Render should render team members 1`] = `
/>
</button>
<h5>
Add Team Member
Add team member
</h5>
<div
className="gf-form-inline"
......@@ -324,10 +318,7 @@ exports[`Render should render team members when sync enabled 1`] = `
disabled={false}
onClick={[Function]}
>
<i
className="fa fa-plus"
/>
Add a member
Add member
</button>
</div>
<Component
......@@ -345,7 +336,7 @@ exports[`Render should render team members when sync enabled 1`] = `
/>
</button>
<h5>
Add Team Member
Add team member
</h5>
<div
className="gf-form-inline"
......
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