[SDC-29] catalog 1707 rebase commit.

Change-Id: I43c3dc5cf44abf5da817649bc738938a3e8388c1
Signed-off-by: Michael Lando <ml636r@att.com>

2 files changed, 0 insertions, 34 deletions

diff --git a/catalog-ui/app/scripts/view-models/component-viewer/activity-log/activity-log-view.html b/catalog-ui/app/scripts/view-models/component-viewer/activity-log/activity-log-view.html
deleted file mode 100644
index ac51e9014c..0000000000
--- a/catalog-ui/app/scripts/view-models/component-viewer/activity-log/activity-log-view.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div ng-repeat="activityDate in  activityDateArray " class="w-sdc-component-viewer-right-activity-log" >
-   <div class="w-sdc-component-viewer-right-activity-log-date" >{{activityDate | date: 'longDate'}}</div>
-    <div ng-repeat="activity in activityLog[activityDate] | orderBy: '-TIMESTAMP'">
-       <div  class="w-sdc-component-viewer-right-activity-log-time">{{activity.TIMESTAMP.replace(" UTC", '') | stringToDateFilter | date: 'mediumTime':'UTC'}}</div>
-       <div class="w-sdc-component-viewer-right-activity-log-content">{{"Action: " + parseAction(activity.ACTION) + " Performed by: " + activity.MODIFIER + " Status: " + activity.STATUS}}</div>
-    </div>
-   </div>
-</div>
-
-
-
-
-
-
-
-
diff --git a/catalog-ui/app/scripts/view-models/component-viewer/activity-log/activity-log-view.less b/catalog-ui/app/scripts/view-models/component-viewer/activity-log/activity-log-view.less
deleted file mode 100644
index 4a7676b6e2..0000000000
--- a/catalog-ui/app/scripts/view-models/component-viewer/activity-log/activity-log-view.less
+++ /dev/null
@@ -1,18 +0,0 @@
-.w-sdc-component-viewer-right-activity-log{
-
-    .w-sdc-component-viewer-right-activity-log-date{
-        .backgroundColor.n;
-        .font-color.g;
-        padding: 4px 11px
-    }
-    .w-sdc-component-viewer-right-activity-log-time{
-        .g_3;
-        padding: 12px 0px 0px 11px;
-    }
-
-    .w-sdc-component-viewer-right-activity-log-content{
-        .g_1;
-        padding: 0px 0px 12px 11px;
-        border-bottom: 1px solid rgba(0, 0, 0, 0.17);
-    }
-}