diff --git a/app/assets/javascripts/app/directives/views/privilegesAuthModal.js b/app/assets/javascripts/app/directives/views/privilegesAuthModal.js index c677da92b..8440fd849 100644 --- a/app/assets/javascripts/app/directives/views/privilegesAuthModal.js +++ b/app/assets/javascripts/app/directives/views/privilegesAuthModal.js @@ -1,8 +1,3 @@ -/* - The purpose of the conflict resoltion modal is to present two versions of a conflicted item, - and allow the user to choose which to keep (or to keep both.) -*/ - class PrivilegesAuthModal { constructor() { diff --git a/app/assets/javascripts/app/services/authManager.js b/app/assets/javascripts/app/services/authManager.js index d92e9d1e5..379617ca1 100644 --- a/app/assets/javascripts/app/services/authManager.js +++ b/app/assets/javascripts/app/services/authManager.js @@ -135,7 +135,6 @@ class AuthManager extends SFAuthManager { let contentTypePredicate = new SFPredicate("content_type", "=", prefsContentType); this.singletonManager.registerSingleton([contentTypePredicate], (resolvedSingleton) => { - // console.log("Loaded existing user prefs", resolvedSingleton.uuid); this.userPreferences = resolvedSingleton; this.userPreferencesDidChange(); }, (valueCallback) => { diff --git a/app/assets/javascripts/app/services/singletonManager.js b/app/assets/javascripts/app/services/singletonManager.js index 6c4ce588b..4d7969eb7 100644 --- a/app/assets/javascripts/app/services/singletonManager.js +++ b/app/assets/javascripts/app/services/singletonManager.js @@ -29,7 +29,7 @@ class SingletonManager { /* If an item alternates its uuid on registration, singletonHandlers might need to update - their local refernece to the object, since the object reference will change on uuid alternation + their local reference to the object, since the object reference will change on uuid alternation */ modelManager.addModelUuidChangeObserver("singleton-manager", (oldModel, newModel) => { for(var handler of this.singletonHandlers) { diff --git a/app/assets/stylesheets/app/_main.scss b/app/assets/stylesheets/app/_main.scss index 514b8843a..a63f25de2 100644 --- a/app/assets/stylesheets/app/_main.scss +++ b/app/assets/stylesheets/app/_main.scss @@ -74,8 +74,8 @@ a { } ::-moz-selection { - background: var(--sn-stylekit-text-selection-color) !important; /* WebKit/Blink Browsers */ - color: white; + background: var(--sn-stylekit-info-color) !important; + color: var(--sn-stylekit-info-contrast-color); } p {