diff --git a/app/app/models/user-activity.js b/app/app/models/user-activity.js new file mode 100644 index 00000000..6f60729c --- /dev/null +++ b/app/app/models/user-activity.js @@ -0,0 +1,32 @@ +// Copyright 2016 Documize Inc. . All rights reserved. +// +// This software (Documize Community Edition) is licensed under +// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html +// +// You can operate outside the AGPL restrictions by purchasing +// Documize Enterprise Edition and obtaining a commercial license +// by contacting . +// +// https://documize.com + +import Model from 'ember-data/model'; +import attr from 'ember-data/attr'; +import Ember from 'ember'; + +export default Model.extend({ + documentName: attr('string'), + folderId: attr('string'), + contributed: attr('string'), + viewed: attr('string'), + created: attr('string'), + + hasContributed: Ember.computed('contributed', function () { + return this.get('contributed').length > 0; + }), + hasViewed: Ember.computed('viewed', function () { + return this.get('viewed').length > 0; + }), + hasCreated: Ember.computed('created', function () { + return this.get('created').length > 0; + }) +}); diff --git a/app/app/styles/color.scss b/app/app/styles/color.scss index 2a115d72..9664e62e 100644 --- a/app/app/styles/color.scss +++ b/app/app/styles/color.scss @@ -32,7 +32,6 @@ $color-toast: #4c4c4c; $color-checkbox: #2667af; $color-card-active: #f7fcff; -$color-chip: #98A2AB; $color-chip: #dff0f9; $color-chip-border: #daeaf3; $color-chip-text: #1b88e3; @@ -40,42 +39,36 @@ $color-chip-text: #1b88e3; $color-symbol-box: #dce5e8; $color-symbol-icon: #a4b8be; +$color-table-border: #e1e1e1; +$color-table-header: #f5f5f5; + .color-white { color: $color-white !important; } - .color-off-white { color: $color-off-white !important; } - .color-black { color: $color-black !important; } - .color-off-black { color: $color-off-black !important; } - .color-primary { color: $color-primary !important; } - .color-link { color: $color-link !important; } - .color-blue { color: $color-blue !important; } - .color-red { color: $color-red !important; } - .color-green { color: $color-green !important; } - .color-gray { color: $color-gray !important; } @@ -83,7 +76,9 @@ $color-symbol-icon: #a4b8be; .background-color-white { background-color: $color-white !important; } - .background-color-primary { background-color: $color-primary !important; } +.background-color-green { + background-color: $color-green !important; +} diff --git a/app/app/styles/widget/widget-dropdown.scss b/app/app/styles/widget/widget-dropdown.scss index 38dfc147..fd810795 100644 --- a/app/app/styles/widget/widget-dropdown.scss +++ b/app/app/styles/widget/widget-dropdown.scss @@ -97,6 +97,10 @@ } } + > .right { + text-align: right; + } + > li.danger { color: $color-red;