rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Permission modal fixes, progress styles

Browse Source
This commit is contained in:
Mo Bitar
2018-12-07 21:30:20 -06:00
parent c0e702805c
commit 19b018c29f
5 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/app/services/actionsManager.js
View File

@@ -202,7 +202,7 @@ class ActionsManager {
var scope = this.$rootScope.$new(true); var scope = this.$rootScope.$new(true);
scope.uuid = uuid; scope.uuid = uuid;
scope.content = content; scope.content = content;
var el = this.$compile( "<revision-preview-modal uuid='uuid' content='content' class='modal'></revision-preview-modal>" )(scope); var el = this.$compile( "<revision-preview-modal uuid='uuid' content='content' class='sk-modal'></revision-preview-modal>" )(scope);
angular.element(document.body).append(el); angular.element(document.body).append(el);
} }

4
app/assets/javascripts/app/services/componentManager.js
View File

@@ -765,14 +765,14 @@ class ComponentManager {
var permissions = dialog.permissions; var permissions = dialog.permissions;
var component = dialog.component; var component = dialog.component;
var callback = dialog.callback; var callback = dialog.callback;
var el = this.$compile( "<permissions-modal component='component' permissions='permissions' callback='callback' class='modal'></permissions-modal>" )(dialog); var el = this.$compile( "<permissions-modal component='component' permissions='permissions' callback='callback' class='sk-modal'></permissions-modal>" )(dialog);
angular.element(document.body).append(el); angular.element(document.body).append(el);
} }
openModalComponent(component) { openModalComponent(component) {
var scope = this.$rootScope.$new(true); var scope = this.$rootScope.$new(true);
scope.component = component; scope.component = component;
var el = this.$compile( "<component-modal component='component' class='modal'></component-modal>" )(scope); var el = this.$compile( "<component-modal component='component' class='sk-modal'></component-modal>" )(scope);
angular.element(document.body).append(el); angular.element(document.body).append(el);
} }

2
app/assets/javascripts/app/services/syncManager.js
View File

@@ -11,7 +11,7 @@ class SyncManager extends SFSyncManager {
scope.item1 = items[0]; scope.item1 = items[0];
scope.item2 = items[1]; scope.item2 = items[1];
scope.callback = callback; scope.callback = callback;
var el = this.$compile( "<conflict-resolution-modal item1='item1' item2='item2' callback='callback' class='modal'></conflict-resolution-modal>" )(scope); var el = this.$compile( "<conflict-resolution-modal item1='item1' item2='item2' callback='callback' class='sk-modal'></conflict-resolution-modal>" )(scope);
angular.element(document.body).append(el); angular.element(document.body).append(el);
} }

27
app/assets/stylesheets/app/_notes.scss
View File

@@ -153,6 +153,19 @@
opacity: 0.6; opacity: 0.6;
} }
progress {
background-color: var(--sn-stylekit-contrast-background-color);
color: var(--sn-stylekit-info-color);
}
progress::-webkit-progress-bar {
background-color: var(--sn-stylekit-contrast-background-color);
}
progress::-webkit-progress-value {
background-color: var(--sn-stylekit-info-color);
}
&.selected { &.selected {
background-color: var(--sn-stylekit-info-color); background-color: var(--sn-stylekit-info-color);
color: var(--sn-stylekit-info-contrast-color); color: var(--sn-stylekit-info-contrast-color);
@@ -160,7 +173,19 @@
.pinned { .pinned {
color: var(--sn-stylekit-info-contrast-color); color: var(--sn-stylekit-info-contrast-color);
} }
}
progress {
background-color: var(--sn-stylekit-secondary-foreground-color);
color: var(--sn-stylekit-secondary-background-color);
}
progress::-webkit-progress-bar {
background-color: var(--sn-stylekit-secondary-foreground-color);
}
progress::-webkit-progress-value {
background-color: var(--sn-stylekit-secondary-background-color);
}
}
} }
} }

6
app/assets/templates/directives/permissions-modal.html.haml
View File

@@ -4,18 +4,18 @@
.sn-component .sn-component
.sk-panel .sk-panel
.sk-panel-header .sk-panel-header
%h1.sk-panel-header-title Activate Extension .sk-panel-header-title Activate Extension
%a.sk-a.info.close-button{"ng-click" => "deny()"} Cancel %a.sk-a.info.close-button{"ng-click" => "deny()"} Cancel
.sk-panel-content .sk-panel-content
.sk-panel-section .sk-panel-section
.sk-panel-row .sk-panel-row
%h3 .sk-h3
%strong {{component.name}} %strong {{component.name}}
would like to interact with your would like to interact with your
{{permissionsString()}} {{permissionsString()}}
.sk-panel-row .sk-panel-row
%p %p.sk-p
Extensions use an offline messaging system to communicate. Learn more at Extensions use an offline messaging system to communicate. Learn more at
%a.sk-a.info{"href" => "https://standardnotes.org/permissions", "target" => "_blank"} https://standardnotes.org/permissions. %a.sk-a.info{"href" => "https://standardnotes.org/permissions", "target" => "_blank"} https://standardnotes.org/permissions.
.sk-panel-footer .sk-panel-footer