Skip to content

N
nexpie-grafana-theme
Commit 6be50c95 by Torkel Ödegaard Committed by GitHub
Options

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

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