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 pull request #15400 from grafana/removed-icons-in-buttons

Browse Source 
Removed some icons in action button
This commit is contained in:
Torkel Ödegaard 2019-02-13 08:05:11 +01:00 committed by GitHub
commit 6be50c952c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 21 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/features/admin/partials/orgs.html
View File

@ -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>

3
public/app/features/admin/partials/users.html
View File

@ -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>

2
public/app/features/alerting/partials/notifications_list.html
View File

@ -8,7 +8,7 @@
</div>
<a href="alerting/notification/new" class="btn btn-primary">
New Channel
New channel
</a>
</div>

2
public/app/features/api-keys/ApiKeysPage.tsx
View File

@ -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>

6
public/app/features/dashboard/components/DashboardSettings/template.html
View File

@ -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>

4
public/app/features/folders/FolderSettingsPage.tsx
View File

@ -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>

20
public/app/features/folders/__snapshots__/FolderSettingsPage.test.tsx.snap
View File

@ -42,20 +42,14 @@ exports[`Render should enable save button 1`] = `
disabled={false}
type="submit"
>
<i
className="fa fa-save"
/>
Save
Save
</button>
<button
className="btn btn-danger"
disabled={false}
onClick={[Function]}
>
<i
className="fa fa-trash"
/>
Delete
Delete
</button>
</div>
</form>
@ -106,20 +100,14 @@ exports[`Render should render component 1`] = `
disabled={true}
type="submit"
>
<i
className="fa fa-save"
/>
Save
Save
</button>
<button
className="btn btn-danger"
disabled={false}
onClick={[Function]}
>
<i
className="fa fa-trash"
/>
Delete
Delete
</button>
</div>
</form>

2
public/app/features/playlist/partials/playlists.html
View File

@ -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>

4
public/app/features/teams/TeamMembers.tsx
View File

@ -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 && (

21
public/app/features/teams/__snapshots__/TeamMembers.test.tsx.snap
View File

@ -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"