Skip to content

Commit 249bf34

Browse files
juliusknorrblizzz
authored andcommitted
Use primary class also for ui-button elements
Signed-off-by: Julius Härtl <jus@bitgrid.net>
1 parent d96282c commit 249bf34

5 files changed

Lines changed: 10 additions & 12 deletions

File tree

apps/user_ldap/css/settings.css

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -209,14 +209,6 @@ select[multiple=multiple] + button {
209209
color: #777;
210210
}
211211

212-
.ldap_primary {
213-
border: 1px solid #0082c9 !important;
214-
background-color: rgba(0, 130, 201, .7) !important;
215-
background-image: none !important;
216-
color: #fff !important;
217-
cursor: pointer;
218-
}
219-
220212
#ldapSettings {
221213
background-color: white;
222214
padding: 0;

apps/user_ldap/js/wizard/wizardTabElementary.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ OCA = OCA || {};
214214
onConfigSwitch: function(view, configuration) {
215215
this.baseDNTestTriggered = false;
216216
view.disableElement(view.managedItems.ldap_port.$relatedElements);
217-
view.managedItems.ldap_dn.$saveButton.removeClass('ldap_primary');
217+
view.managedItems.ldap_dn.$saveButton.removeClass('primary');
218218
view.onConfigLoaded(view, configuration);
219219
},
220220

apps/user_ldap/js/wizard/wizardTabGeneric.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,10 @@ OCA = OCA || {};
359359
item.$saveButton.click(function(event) {
360360
event.preventDefault();
361361
view._requestSave(item.$element);
362-
item.$saveButton.removeClass('ldap_primary');
362+
item.$saveButton.removeClass('primary');
363363
});
364364
item.$element.change(function () {
365-
item.$saveButton.addClass('ldap_primary');
365+
item.$saveButton.addClass('primary');
366366
});
367367
})(this.managedItems[id]);
368368
}

apps/user_ldap/templates/part.wizardcontrols.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
type="button">
66
<?php p($l->t('Back'));?>
77
</button>
8-
<button class="ldap_action_continue ldap_primary" name="ldap_action_continue" type="button">
8+
<button class="ldap_action_continue primary" name="ldap_action_continue" type="button">
99
<?php p($l->t('Continue'));?>
1010
</button>
1111
<a href="<?php p(link_to_docs('admin-ldap')); ?>"

core/css/jquery-ui-fixes.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,3 +193,9 @@
193193
color: $color-primary-element;
194194
}
195195
}
196+
197+
.ui-button.primary {
198+
background-color: $color-primary;
199+
color: $color-primary-text;
200+
border: 1px solid $color-primary-text;
201+
}

0 commit comments

Comments
 (0)