Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrading buttons. #1480

Merged
merged 2 commits into from
Oct 12, 2020
Merged

Upgrading buttons. #1480

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
d8987b2
updating
noone0212 Apr 21, 2020
536bf83
Merge branch 'develop' into upgrading-buttons
AmTryingMyBest Oct 12, 2020
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
2 changes: 1 addition & 1 deletion app/common/auth/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</div>
<div class="modal-actions">
<div class="form-field">
<button type="button" class="button-link" ng-click="cancel()" ng-show="showCancel" translate="app.cancel">Cancel</button>
<button type="button" class="button-beta" ng-click="cancel()" ng-show="showCancel" translate="app.cancel">Cancel</button>
<button type="submit" class="button-alpha" ng-disabled="loginForm.$invalid || processing" translate="nav.login">Login</button>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/common/auth/register.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

<div class="modal-actions">
<div class="form-field">
<button type="button" class="button-link" ng-click="cancel()" translate="app.cancel">Cancel</button>
<button type="button" class="button-beta" ng-click="cancel()" translate="app.cancel">Cancel</button>
<button type="submit" class="button-alpha" ng-disabled="form.$invalid || processing" translate="nav.register">Sign up</button>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/common/user-profile/notifications.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ <h2 class="listing-item-title">{{notification.name}}</h2>

<div class="modal-actions">
<div class="form-field">
<button type="button" class="button-link" ng-click="cancel()" translate>user_profile.button.cancel</button>
<button type="button" class="button-beta" ng-click="cancel()" translate>user_profile.button.cancel</button>
<button type="button" class="button-alpha"
ng-disabled="!canAdd() && !canUpdate()"
ng-click="saveContacts()">
Expand Down
2 changes: 1 addition & 1 deletion app/common/user-profile/user-profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

<div class="modal-actions">
<div class="form-field">
<button ng-if="!adminUserSetup" type="button" class="button-link" ng-click="cancel()" translate>
<button ng-if="!adminUserSetup" type="button" class="button-beta" ng-click="cancel()" translate>
user_profile.button.cancel
</button>

Expand Down
2 changes: 1 addition & 1 deletion app/main/activity/activity.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ <h1 class="mode-context-title"><a href="/" ng-bind="nav.site.name"></a></h1>
</div>

<div class="form-field">
<button type="button" class="button-link" ng-click="cancelChangeFilters()" translate="app.cancel">Cancel</button>
<button type="button" class="button-beta" ng-click="cancelChangeFilters()" translate="app.cancel">Cancel</button>
<button type="submit" class="button-alpha" translate="app.apply_filters">Apply filter</button>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/main/posts/collections/editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

<div class="modal-actions">
<div class="form-field">
<button type="button" class="button-link modal-trigger" ng-click="cancel()" translate>app.cancel</button>
<button type="button" class="button-beta modal-trigger" ng-click="cancel()" translate>app.cancel</button>
<button type="button" class="button-alpha modal-trigger" ng-click="saveCollection(cpyCollection)" translate>app.save_and_close</button>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/main/posts/savedsearches/saved-search-list-editor-modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</div>
<div class="modal-actions">
<div class="form-field">
<button type="button" class="button-link" ng-click="close()" translate>modal.button.close</button>
<button type="button" class="button-beta" ng-click="close()" translate>modal.button.close</button>
<button type="button" class="button-alpha" ng-show="processing">
<div class="loading">
<div class="line"></div>
Expand Down
2 changes: 1 addition & 1 deletion app/main/posts/savedsearches/savedsearch-editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<role-selector model="savedSearch" title="'app.who_can_see_this'"></role-selector>
<div class="modal-actions">
<div class="form-field">
<button type="button" class="button-link modal-trigger" ng-click="cancel()" translate>app.cancel</button>
<button type="button" class="button-beta modal-trigger" ng-click="cancel()" translate>app.cancel</button>
<button type="button" class="button-alpha modal-trigger" ng-show="!isSaving" ng-click="save(cpySavedSearch)" translate>app.save_and_close</button>
<button ng-click="saveSearch()" ng-show="isSaving" disabled class="button-beta" type="button">
<div class="loading">
Expand Down
2 changes: 1 addition & 1 deletion app/settings/surveys/task-create.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div>
</div>
<div class="form-field">
<button type="button" class="button-link modal-trigger" ng-click="closeModal()" translate="app.cancel">Cancel</button>
<button type="button" class="button-beta modal-trigger" ng-click="closeModal()" translate="app.cancel">Cancel</button>
<button type="button" class="button-alpha modal-trigger" ng-click="addNewTask(newTask)" translate="app.add_and_close">Add &amp; close</button>
</div>
</div>
4 changes: 2 additions & 2 deletions app/settings/user-settings/user-settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ <h2 class="form-sheet-title" translate="settings.settings_list.user_settings">
</div>

<div class="form-field" ng-show="!hxlMaintainerSet">
<button ng-show="showCancel" type="button" class="button-link" ng-click="cancelMaintainerSet()" translate="app.cancel">Cancel</button>
<button ng-show="showCancel" type="button" class="button-beta" ng-click="cancelMaintainerSet()" translate="app.cancel">Cancel</button>
<button class="button button-alpha" translate="app.save" ng-click="saveKey()">Save</button>
</div>

Expand Down Expand Up @@ -95,7 +95,7 @@ <h2 class="form-sheet-title" translate="settings.settings_list.user_settings">
</div>

<div class="form-field" ng-show="!hxlApiKeySet">
<button ng-show="showCancel" type="button" class="button-link" ng-click="cancelApiKeySet()" translate="app.cancel">Cancel</button>
<button ng-show="showCancel" type="button" class="button-beta" ng-click="cancelApiKeySet()" translate="app.cancel">Cancel</button>
<button class="button button-alpha" translate="app.save" ng-click="saveKey()">Save</button>
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/settings/users/filter-users.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</div>

<div class="form-field filter-actions">
<button type="button" class="button-link" ng-click="cancel()" translate>app.cancel</button>
<button type="button" class="button-beta" ng-click="cancel()" translate>app.cancel</button>
<button type="submit" class="button-alpha" ng-disabled="applyEnabled" translate>app.apply_filters</button>
</div>
</div>
Expand Down