Skip to content
This repository has been archived by the owner on Dec 8, 2022. It is now read-only.

Clean up button styles #1641

Merged
merged 2 commits into from
Apr 19, 2018
Merged

Clean up button styles #1641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc0861e
Clean up button styles
blackbaud-johnly Apr 19, 2018
abe0861
Remove icons in buttons
blackbaud-johnly Apr 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/demos/autocomplete/autocomplete-demo.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ <h3 class="sky-subsection-heading">
</div>

<button
class="sky-btn sky-btn-primary"
class="sky-btn sky-btn-default"
type="submit">
Submit
</button>
Expand Down Expand Up @@ -174,7 +174,7 @@ <h2 class="sky-section-heading">
</div>

<button
class="sky-btn sky-btn-primary"
class="sky-btn sky-btn-default"
type="submit">
Submit
</button>
Expand Down
2 changes: 1 addition & 1 deletion src/demos/colorpicker/colorpicker-demo.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,6 @@ <h3>
type="button"
class="sky-btn sky-btn-default"
(click)="toggleResetButton()">
Toggle Reset Button
Toggle reset button
</button>
</p>
10 changes: 3 additions & 7 deletions src/demos/confirm/confirm-demo.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,29 @@
<div style="margin-bottom: 20px;">
<button
type="button"
class="sky-btn sky-btn-primary"
class="sky-btn sky-btn-default"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove the icons from these buttons as well? In general buttons should not have icons except in some narrowly defined cases.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure thing. I just removed the options locally and will push them up to the PR in a sec.

(click)="openOKConfirm()">
<i class="fa fa-question-circle"></i>
OK confirm
</button>

<button
type="button"
class="sky-btn sky-btn-primary"
class="sky-btn sky-btn-default"
(click)="openYesCancelConfirm()">
<i class="fa fa-question-circle"></i>
Yes/cancel confirm
</button>

<button
type="button"
class="sky-btn sky-btn-primary"
class="sky-btn sky-btn-default"
(click)="openYesNoCancelConfirm()">
<i class="fa fa-question-circle"></i>
Yes/no/cancel confirm
</button>

<button
type="button"
class="sky-btn sky-btn-default"
(click)="openCustomConfirm()">
<i class="fa fa-cog"></i>
Custom confirm
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/demos/link-records/link-records-demo.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ <h3>
</sky-link-records>

<button
class="sky-btn sky-btn-primary"
class="sky-btn sky-btn-default"
(click)="showResults()">
Show Results
</button>
Expand Down Expand Up @@ -89,7 +89,7 @@ <h3>
</ng-template>

<button
class="sky-btn sky-btn-primary"
class="sky-btn sky-btn-default"
(click)="showResults()">
Show Results
</button>
2 changes: 1 addition & 1 deletion src/demos/list/list-demo.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<button
style="margin-bottom: 5px;"
class="sky-btn sky-btn-primary"
class="sky-btn sky-btn-default"
(click)="changeData()">
Change data
</button>
Expand Down
2 changes: 1 addition & 1 deletion src/demos/lookup/lookup-demo.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</div>

<button
class="sky-btn sky-btn-primary"
class="sky-btn sky-btn-default"
type="submit">
Submit
</button>
Expand Down
12 changes: 6 additions & 6 deletions src/demos/modal/modal-demo.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<button type="button" class="sky-btn sky-btn-primary" (click)="openModal('defaultModal')">
<button type="button" class="sky-btn sky-btn-default" (click)="openModal('defaultModal')">
Open modal
</button>

<button type="button" class="sky-btn sky-btn-primary" (click)="openModal('smallModal')">
<button type="button" class="sky-btn sky-btn-default" (click)="openModal('smallModal')">
Open small modal
</button>

<button type="button" class="sky-btn sky-btn-primary" (click)="openModal('largeModal')">
<button type="button" class="sky-btn sky-btn-default" (click)="openModal('largeModal')">
Open large modal
</button>

<button type="button" class="sky-btn sky-btn-primary" (click)="openModal('fullScreenModal')">
<button type="button" class="sky-btn sky-btn-default" (click)="openModal('fullScreenModal')">
Open full-screen modal
</button>

<button type="button" class="sky-btn sky-btn-primary" (click)="openModal('tiledModal')">
<button type="button" class="sky-btn sky-btn-default" (click)="openModal('tiledModal')">
Open tiled modal
</button>

<button type="button" class="sky-btn sky-btn-primary" (click)="openModal('withHelpHeader')">
<button type="button" class="sky-btn sky-btn-default" (click)="openModal('withHelpHeader')">
Open modal with help header
</button>
2 changes: 1 addition & 1 deletion src/demos/sectioned-form/sectioned-form-demo.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ <h3>Sectioned form — Index: {{ activeIndexDisplay }}</h3>
</div>

<h3>With a modal</h3>
<button type="button" class="sky-btn sky-btn-primary" (click)="openModal()">
<button type="button" class="sky-btn sky-btn-default" (click)="openModal()">
Open sectioned form
</button>
6 changes: 3 additions & 3 deletions src/demos/wait/wait-demo.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<button type="button" class="sky-btn sky-btn-primary" (click)="isWaiting = !isWaiting">Toggle element wait</button>
<button type="button" class="sky-btn sky-btn-default" (click)="isWaiting = !isWaiting">Toggle element wait</button>


<div style="height: 200px; width: 200px; margin-top: 10px;">
Expand All @@ -7,6 +7,6 @@
</sky-wait>
</div>

<button type="button" class="sky-btn sky-btn-primary" (click)="showPageWait(true)">Show page wait</button>
<button type="button" class="sky-btn sky-btn-default" (click)="showPageWait(true)">Show page wait</button>

<button type="button" class="sky-btn sky-btn-primary" (click)="showPageWait(false)">Show non-blocking page wait</button>
<button type="button" class="sky-btn sky-btn-default" (click)="showPageWait(false)">Show non-blocking page wait</button>
2 changes: 1 addition & 1 deletion src/demos/wizard/wizard-demo.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<button
type="button"
class="sky-btn sky-btn-primary"
class="sky-btn sky-btn-default"
(click)="openWizard()">
Open wizard
</button>