mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use primary class also for ui-button elements 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2017-09-05 23:26:28 +02:00 committed by Arthur Schiwon
parent 5603d9a5ea
commit 57eb046836
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
5 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/user_ldap/css/settings.css
View File

@ -209,14 +209,6 @@ select[multiple=multiple] + button {
color: #777; color: #777;
} }
.ldap_primary {
border: 1px solid #0082c9 !important;
background-color: rgba(0, 130, 201, .7) !important;
background-image: none !important;
color: #fff !important;
cursor: pointer;
}
#ldapSettings { #ldapSettings {
background-color: white; background-color: white;
padding: 0; padding: 0;

2
apps/user_ldap/js/wizard/wizardTabElementary.js
View File

@ -214,7 +214,7 @@ OCA = OCA || {};
onConfigSwitch: function(view, configuration) { onConfigSwitch: function(view, configuration) {
this.baseDNTestTriggered = false; this.baseDNTestTriggered = false;
view.disableElement(view.managedItems.ldap_port.$relatedElements); view.disableElement(view.managedItems.ldap_port.$relatedElements);
view.managedItems.ldap_dn.$saveButton.removeClass('ldap_primary'); view.managedItems.ldap_dn.$saveButton.removeClass('primary');
view.onConfigLoaded(view, configuration); view.onConfigLoaded(view, configuration);
}, },

4
apps/user_ldap/js/wizard/wizardTabGeneric.js
View File

@ -359,10 +359,10 @@ OCA = OCA || {};
item.$saveButton.click(function(event) { item.$saveButton.click(function(event) {
event.preventDefault(); event.preventDefault();
view._requestSave(item.$element); view._requestSave(item.$element);
item.$saveButton.removeClass('ldap_primary'); item.$saveButton.removeClass('primary');
}); });
item.$element.change(function () { item.$element.change(function () {
item.$saveButton.addClass('ldap_primary'); item.$saveButton.addClass('primary');
}); });
})(this.managedItems[id]); })(this.managedItems[id]);
} }

2
apps/user_ldap/templates/part.wizardcontrols.php
View File

@ -5,7 +5,7 @@
type="button"> type="button">
<?php p($l->t('Back'));?> <?php p($l->t('Back'));?>
</button> </button>
<button class="ldap_action_continue ldap_primary" name="ldap_action_continue" type="button"> <button class="ldap_action_continue primary" name="ldap_action_continue" type="button">
<?php p($l->t('Continue'));?> <?php p($l->t('Continue'));?>
</button> </button>
<a href="<?php p(link_to_docs('admin-ldap')); ?>" <a href="<?php p(link_to_docs('admin-ldap')); ?>"

6
core/css/jquery-ui-fixes.scss
View File

@ -193,3 +193,9 @@
color: $color-primary-element; color: $color-primary-element;
} }
} }
.ui-button.primary {
background-color: $color-primary;
color: $color-primary-text;
border: 1px solid $color-primary-text;
}