From 57eb046836f1c878a9011a52a7f9e6757d0a9e83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 5 Sep 2017 23:26:28 +0200
Subject: [PATCH] Use primary class also for ui-button elements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/user_ldap/css/settings.css                  | 8 --------
 apps/user_ldap/js/wizard/wizardTabElementary.js  | 2 +-
 apps/user_ldap/js/wizard/wizardTabGeneric.js     | 4 ++--
 apps/user_ldap/templates/part.wizardcontrols.php | 2 +-
 core/css/jquery-ui-fixes.scss                    | 6 ++++++
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css
index 4288bdc2c2..54d0e2dbb0 100644
--- a/apps/user_ldap/css/settings.css
+++ b/apps/user_ldap/css/settings.css
@@ -209,14 +209,6 @@ select[multiple=multiple] + button {
 	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 {
 	background-color: white;
 	padding: 0;
diff --git a/apps/user_ldap/js/wizard/wizardTabElementary.js b/apps/user_ldap/js/wizard/wizardTabElementary.js
index ea40b7682a..3c6eb1adc4 100644
--- a/apps/user_ldap/js/wizard/wizardTabElementary.js
+++ b/apps/user_ldap/js/wizard/wizardTabElementary.js
@@ -214,7 +214,7 @@ OCA = OCA || {};
 		onConfigSwitch: function(view, configuration) {
 			this.baseDNTestTriggered = false;
 			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);
 		},
 
diff --git a/apps/user_ldap/js/wizard/wizardTabGeneric.js b/apps/user_ldap/js/wizard/wizardTabGeneric.js
index 375ec45066..9997d6e1b0 100644
--- a/apps/user_ldap/js/wizard/wizardTabGeneric.js
+++ b/apps/user_ldap/js/wizard/wizardTabGeneric.js
@@ -359,10 +359,10 @@ OCA = OCA || {};
 					item.$saveButton.click(function(event) {
 						event.preventDefault();
 						view._requestSave(item.$element);
-						item.$saveButton.removeClass('ldap_primary');
+						item.$saveButton.removeClass('primary');
 					});
 					item.$element.change(function () {
-						item.$saveButton.addClass('ldap_primary');
+						item.$saveButton.addClass('primary');
 					});
 				})(this.managedItems[id]);
 			}
diff --git a/apps/user_ldap/templates/part.wizardcontrols.php b/apps/user_ldap/templates/part.wizardcontrols.php
index 8ef6e88840..bd84b23c76 100644
--- a/apps/user_ldap/templates/part.wizardcontrols.php
+++ b/apps/user_ldap/templates/part.wizardcontrols.php
@@ -5,7 +5,7 @@
 			type="button">
 		<?php p($l->t('Back'));?>
 	</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'));?>
 	</button>
 	<a href="<?php p(link_to_docs('admin-ldap')); ?>"
diff --git a/core/css/jquery-ui-fixes.scss b/core/css/jquery-ui-fixes.scss
index 8716710081..fcc4c75080 100644
--- a/core/css/jquery-ui-fixes.scss
+++ b/core/css/jquery-ui-fixes.scss
@@ -193,3 +193,9 @@
 		color: $color-primary-element;
 	}
 }
+
+.ui-button.primary {
+	background-color: $color-primary;
+	color: $color-primary-text;
+	border: 1px solid $color-primary-text;
+}
\ No newline at end of file