summaryrefslogtreecommitdiffstats
path: root/catalog-ui/src/assets/styles
diff options
context:
space:
mode:
authorTal Gitelman <tg851x@intl.att.com>2017-12-10 18:55:03 +0200
committerTal Gitelman <tg851x@intl.att.com>2017-12-10 19:33:38 +0200
commit51d50f0ef642e0f996a1c8b8d2ef4838bdfec892 (patch)
tree3ac236a864d74d19b0f5c9020891a7a7e5c31b44 /catalog-ui/src/assets/styles
parentb5cc2e0695f195716d6ccdc65e73807a6632ec70 (diff)
Final commit to master merge from
Change-Id: Ib464f9a8828437c86fe6def8af238aaf83473507 Issue-ID: SDC-714 Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Diffstat (limited to 'catalog-ui/src/assets/styles')
-rw-r--r--catalog-ui/src/assets/styles/app.less2
-rw-r--r--catalog-ui/src/assets/styles/images/resource-icons/dcae_machineLearning.pngbin0 -> 3710 bytes
-rw-r--r--catalog-ui/src/assets/styles/images/resource-icons/networkrules.pngbin2920 -> 2907 bytes
-rw-r--r--catalog-ui/src/assets/styles/images/resource-icons/pmc.pngbin0 -> 1453 bytes
-rw-r--r--catalog-ui/src/assets/styles/images/resource-icons/securityrules.pngbin2965 -> 2980 bytes
-rw-r--r--catalog-ui/src/assets/styles/images/service-proxy-icons/call_controll.pngbin0 -> 3929 bytes
-rw-r--r--catalog-ui/src/assets/styles/images/service-proxy-icons/collaboration.pngbin0 -> 4443 bytes
-rw-r--r--catalog-ui/src/assets/styles/images/service-proxy-icons/compute.pngbin0 -> 3834 bytes
-rw-r--r--catalog-ui/src/assets/styles/images/service-proxy-icons/defaulticon.pngbin0 -> 2879 bytes
-rw-r--r--catalog-ui/src/assets/styles/images/service-proxy-icons/messaging.pngbin0 -> 3147 bytes
-rw-r--r--catalog-ui/src/assets/styles/images/service-proxy-icons/mobility.pngbin0 -> 3771 bytes
-rw-r--r--catalog-ui/src/assets/styles/images/service-proxy-icons/network_l_1-3.pngbin0 -> 3761 bytes
-rw-r--r--catalog-ui/src/assets/styles/images/service-proxy-icons/network_l_4.pngbin0 -> 3662 bytes
-rw-r--r--catalog-ui/src/assets/styles/images/service-proxy-icons/notification.pngbin0 -> 3379 bytes
-rw-r--r--catalog-ui/src/assets/styles/images/service-proxy-icons/platform.pngbin0 -> 4309 bytes
-rw-r--r--catalog-ui/src/assets/styles/images/service-proxy-icons/storage.pngbin0 -> 3841 bytes
-rw-r--r--catalog-ui/src/assets/styles/images/service-proxy-icons/uncertified.pngbin0 -> 1503 bytes
-rw-r--r--catalog-ui/src/assets/styles/images/sprites/sprite-global.pngbin98178 -> 100635 bytes
-rw-r--r--catalog-ui/src/assets/styles/images/sprites/sprite-resource-icons.pngbin476775 -> 490295 bytes
-rw-r--r--catalog-ui/src/assets/styles/images/sprites/sprite-services-icons.pngbin127233 -> 154466 bytes
-rw-r--r--catalog-ui/src/assets/styles/layout/main.less11
-rw-r--r--catalog-ui/src/assets/styles/mixins.less2
-rw-r--r--catalog-ui/src/assets/styles/modal.less6
-rw-r--r--catalog-ui/src/assets/styles/sprite-proxy-services-icons.less40
-rw-r--r--catalog-ui/src/assets/styles/sprite-resource-icons.less15
-rw-r--r--catalog-ui/src/assets/styles/sprite.less11
-rw-r--r--catalog-ui/src/assets/styles/tooltips.less13
27 files changed, 89 insertions, 11 deletions
diff --git a/catalog-ui/src/assets/styles/app.less b/catalog-ui/src/assets/styles/app.less
index c19ace5823..8042c0e7b7 100644
--- a/catalog-ui/src/assets/styles/app.less
+++ b/catalog-ui/src/assets/styles/app.less
@@ -37,7 +37,6 @@
@import 'notification-template.less';
// Less insides specific files.
-@import '../../app/directives/ecomp-footer/ecomp-footer.less';
@import '../../app/directives/ecomp-header/ecomp-header.less';
@import '../../app/directives/edit-name-popover/edit-name-popover.less';
@import '../../app/directives/elements/checkbox/checkbox.less';
@@ -53,7 +52,6 @@
@import '../../app/directives/info-tooltip/info-tooltip.less';
@import '../../app/directives/inputs-and-properties/inputs/input-row.less';
@import '../../app/directives/inputs-and-properties/properties/property-row-view.less';
-@import '../../app/directives/layout/top-nav/top-nav.less';
@import '../../app/directives/layout/top-progress/top-progress.less';
@import '../../app/directives/loader/loader-directive.less';
@import '../../app/directives/modal/sdc-modal.less';
diff --git a/catalog-ui/src/assets/styles/images/resource-icons/dcae_machineLearning.png b/catalog-ui/src/assets/styles/images/resource-icons/dcae_machineLearning.png
new file mode 100644
index 0000000000..792ff7f239
--- /dev/null
+++ b/catalog-ui/src/assets/styles/images/resource-icons/dcae_machineLearning.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/resource-icons/networkrules.png b/catalog-ui/src/assets/styles/images/resource-icons/networkrules.png
index 4fe91fa7e5..afce3016db 100644
--- a/catalog-ui/src/assets/styles/images/resource-icons/networkrules.png
+++ b/catalog-ui/src/assets/styles/images/resource-icons/networkrules.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/resource-icons/pmc.png b/catalog-ui/src/assets/styles/images/resource-icons/pmc.png
new file mode 100644
index 0000000000..01af644b16
--- /dev/null
+++ b/catalog-ui/src/assets/styles/images/resource-icons/pmc.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/resource-icons/securityrules.png b/catalog-ui/src/assets/styles/images/resource-icons/securityrules.png
index 520ab278cb..cae7569238 100644
--- a/catalog-ui/src/assets/styles/images/resource-icons/securityrules.png
+++ b/catalog-ui/src/assets/styles/images/resource-icons/securityrules.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/service-proxy-icons/call_controll.png b/catalog-ui/src/assets/styles/images/service-proxy-icons/call_controll.png
new file mode 100644
index 0000000000..6370c46604
--- /dev/null
+++ b/catalog-ui/src/assets/styles/images/service-proxy-icons/call_controll.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/service-proxy-icons/collaboration.png b/catalog-ui/src/assets/styles/images/service-proxy-icons/collaboration.png
new file mode 100644
index 0000000000..bab66d4c61
--- /dev/null
+++ b/catalog-ui/src/assets/styles/images/service-proxy-icons/collaboration.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/service-proxy-icons/compute.png b/catalog-ui/src/assets/styles/images/service-proxy-icons/compute.png
new file mode 100644
index 0000000000..a9716113d9
--- /dev/null
+++ b/catalog-ui/src/assets/styles/images/service-proxy-icons/compute.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/service-proxy-icons/defaulticon.png b/catalog-ui/src/assets/styles/images/service-proxy-icons/defaulticon.png
new file mode 100644
index 0000000000..4d8c3aedaf
--- /dev/null
+++ b/catalog-ui/src/assets/styles/images/service-proxy-icons/defaulticon.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/service-proxy-icons/messaging.png b/catalog-ui/src/assets/styles/images/service-proxy-icons/messaging.png
new file mode 100644
index 0000000000..61cc46d88b
--- /dev/null
+++ b/catalog-ui/src/assets/styles/images/service-proxy-icons/messaging.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/service-proxy-icons/mobility.png b/catalog-ui/src/assets/styles/images/service-proxy-icons/mobility.png
new file mode 100644
index 0000000000..29baf1e8d6
--- /dev/null
+++ b/catalog-ui/src/assets/styles/images/service-proxy-icons/mobility.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/service-proxy-icons/network_l_1-3.png b/catalog-ui/src/assets/styles/images/service-proxy-icons/network_l_1-3.png
new file mode 100644
index 0000000000..f759a66f4d
--- /dev/null
+++ b/catalog-ui/src/assets/styles/images/service-proxy-icons/network_l_1-3.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/service-proxy-icons/network_l_4.png b/catalog-ui/src/assets/styles/images/service-proxy-icons/network_l_4.png
new file mode 100644
index 0000000000..655b3da304
--- /dev/null
+++ b/catalog-ui/src/assets/styles/images/service-proxy-icons/network_l_4.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/service-proxy-icons/notification.png b/catalog-ui/src/assets/styles/images/service-proxy-icons/notification.png
new file mode 100644
index 0000000000..18e4804960
--- /dev/null
+++ b/catalog-ui/src/assets/styles/images/service-proxy-icons/notification.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/service-proxy-icons/platform.png b/catalog-ui/src/assets/styles/images/service-proxy-icons/platform.png
new file mode 100644
index 0000000000..6eb4fab77b
--- /dev/null
+++ b/catalog-ui/src/assets/styles/images/service-proxy-icons/platform.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/service-proxy-icons/storage.png b/catalog-ui/src/assets/styles/images/service-proxy-icons/storage.png
new file mode 100644
index 0000000000..523213743d
--- /dev/null
+++ b/catalog-ui/src/assets/styles/images/service-proxy-icons/storage.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/service-proxy-icons/uncertified.png b/catalog-ui/src/assets/styles/images/service-proxy-icons/uncertified.png
new file mode 100644
index 0000000000..35d747a7d0
--- /dev/null
+++ b/catalog-ui/src/assets/styles/images/service-proxy-icons/uncertified.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/sprites/sprite-global.png b/catalog-ui/src/assets/styles/images/sprites/sprite-global.png
index 87e5d43b4d..2cf0bd7757 100644
--- a/catalog-ui/src/assets/styles/images/sprites/sprite-global.png
+++ b/catalog-ui/src/assets/styles/images/sprites/sprite-global.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/sprites/sprite-resource-icons.png b/catalog-ui/src/assets/styles/images/sprites/sprite-resource-icons.png
index 27e96f3ba2..7f21e24223 100644
--- a/catalog-ui/src/assets/styles/images/sprites/sprite-resource-icons.png
+++ b/catalog-ui/src/assets/styles/images/sprites/sprite-resource-icons.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/images/sprites/sprite-services-icons.png b/catalog-ui/src/assets/styles/images/sprites/sprite-services-icons.png
index ac19fa186b..1f8d12329d 100644
--- a/catalog-ui/src/assets/styles/images/sprites/sprite-services-icons.png
+++ b/catalog-ui/src/assets/styles/images/sprites/sprite-services-icons.png
Binary files differ
diff --git a/catalog-ui/src/assets/styles/layout/main.less b/catalog-ui/src/assets/styles/layout/main.less
index 54f6b87d7c..2992b1d9d0 100644
--- a/catalog-ui/src/assets/styles/layout/main.less
+++ b/catalog-ui/src/assets/styles/layout/main.less
@@ -8,7 +8,7 @@
top: @header_height + @top_nav_height;
left: 0;
right: 0;
- bottom: @footer_height;
+ bottom: 0;
.w-sdc-main-right-container {
.bg_n;
@@ -24,8 +24,15 @@
padding-bottom: 80px;
}
- .sdc-tile-catalog {
+ .sdc-tile {
margin: 10px;
+ .sdc-tile-content {
+ .sdc-tile-content-info {
+ .sdc-tile-info-line {
+ display: inline-block;
+ }
+ }
+ }
}
}
diff --git a/catalog-ui/src/assets/styles/mixins.less b/catalog-ui/src/assets/styles/mixins.less
index fbc5f83df1..b55d4fd794 100644
--- a/catalog-ui/src/assets/styles/mixins.less
+++ b/catalog-ui/src/assets/styles/mixins.less
@@ -192,7 +192,7 @@
.view-mode {
opacity: 1;
border: solid 1px @main_color_o;
- background-color: #f8f8f8;
+ background-color: #f8f8f8 !important;
cursor: auto;
& + &:not(.icons-text), &.no-border-top {
diff --git a/catalog-ui/src/assets/styles/modal.less b/catalog-ui/src/assets/styles/modal.less
index 3307bfc56a..263b33f027 100644
--- a/catalog-ui/src/assets/styles/modal.less
+++ b/catalog-ui/src/assets/styles/modal.less
@@ -185,7 +185,7 @@ NEW DESIGN MODAL
.w-sdc-modal-head {
flex-grow: 1;
- .s_18_m;
+ .s_18_r;
height: 48px;
line-height: 48px;
display: flex;
@@ -194,7 +194,7 @@ NEW DESIGN MODAL
align-items: center;
.w-sdc-modal-head-text {
- .s_18_m;
+ .s_18_r;
flex-grow: 999;
}
@@ -256,7 +256,7 @@ NEW DESIGN MODAL
align-items: center;
.w-sdc-modal-head-text {
- .s_18_m;
+ .s_18_r;
flex-grow: 999;
}
diff --git a/catalog-ui/src/assets/styles/sprite-proxy-services-icons.less b/catalog-ui/src/assets/styles/sprite-proxy-services-icons.less
new file mode 100644
index 0000000000..6eab667647
--- /dev/null
+++ b/catalog-ui/src/assets/styles/sprite-proxy-services-icons.less
@@ -0,0 +1,40 @@
+.sprite-proxy-services-icons {
+ background-image: url('images/sprites/sprite-services-icons.png');
+ display: inline-block;
+}
+
+.sprite-proxy-services-icons.disable { opacity:0.5;}
+
+
+.sprite-proxy-services-icons.compute.large { background-position: -611px -41px; width: 61px; height: 60px;}
+.sprite-proxy-services-icons.compute.medium { background-position: -693px -60px; width: 41px; height: 41px;}
+
+.sprite-proxy-services-icons.platform.large { background-position: -611px -109px; width: 61px; height: 60px;}
+.sprite-proxy-services-icons.platform.medium { background-position: -693px -128px; width: 41px; height: 41px;}
+
+.sprite-proxy-services-icons.storage.large { background-position: -611px -178px; width: 61px; height: 61px;}
+.sprite-proxy-services-icons.storage.medium { background-position: -693px -198px; width: 41px; height: 41px;}
+
+.sprite-proxy-services-icons.call_controll.large { background-position: -611px -248px;; width: 61px; height: 61px;}
+.sprite-proxy-services-icons.call_controll.medium { background-position: -693px -268px; width: 41px; height: 41px;}
+
+.sprite-proxy-services-icons.collaboration.large { background-position: -611px -318px; width: 61px; height: 61px;}
+.sprite-proxy-services-icons.collaboration.medium { background-position: -693px -338px; width: 41px; height: 41px;}
+
+.sprite-proxy-services-icons.messaging.large { background-position: -611px -458px; width: 61px; height: 61px;}
+.sprite-proxy-services-icons.messaging.medium { background-position: -693px -478px; width: 41px; height: 41px;}
+
+.sprite-proxy-services-icons.notification.large { background-position: -611px -529px; width: 60px; height: 60px;}
+.sprite-proxy-services-icons.notification.medium { background-position: -693px -548px; width: 41px; height: 41px;}
+
+.sprite-proxy-services-icons.mobility.large { background-position: -611px -601px; width: 60px; height: 60px;}
+.sprite-proxy-services-icons.mobility.medium { background-position: -693px -620px; width: 41px; height: 41px;}
+
+.sprite-proxy-services-icons.network_l_1-3.large { background-position: -611px -669px; width: 60px; height: 60px;}
+.sprite-proxy-services-icons.network_l_1-3.medium { background-position: -693px -688px; width: 41px; height: 41px;}
+
+.sprite-proxy-services-icons.network_l_4.large { background-position: -611px -739px; width: 61px; height: 61px;}
+.sprite-proxy-services-icons.network_l_4.medium { background-position: -693px -758px; width: 41px; height: 41px;}
+
+.sprite-proxy-services-icons.defaulticon.large { background-position: -611px -810px; width: 60px; height: 60px;}
+.sprite-proxy-services-icons.defaulticon.medium { background-position: -695px -829px; width: 41px; height: 41px;}
diff --git a/catalog-ui/src/assets/styles/sprite-resource-icons.less b/catalog-ui/src/assets/styles/sprite-resource-icons.less
index 2c19ee3291..96993d5171 100644
--- a/catalog-ui/src/assets/styles/sprite-resource-icons.less
+++ b/catalog-ui/src/assets/styles/sprite-resource-icons.less
@@ -98,7 +98,7 @@
.sprite-resource-icons.defaulticon { background-position: -282px -2069px; width: 60px; height: 60px;}
.sprite-resource-icons.defaulticon.small { background-position: -210px -2101px; width: 28px; height: 28px;}
.sprite-resource-icons.defaulticon.medium { background-position: -141px -2089px; width: 40px; height: 40px;}
-.sprite-resource-icons.defaulticon.large { background-position: -70px -2069px; width: 60px; height: 60px;}
+.sprite-resource-icons.defaulticon.large { background-position: -70px -2069px; width: 61px; height: 60px;}
.sprite-resource-icons.fortinet { background-position: -282px -1419px; width: 94px; height: 10px;}
.sprite-resource-icons.fortinet.small { background-position: -210px -1401px; width: 28px; height: 28px;}
@@ -212,12 +212,12 @@
.sprite-resource-icons.networkrules { background-position: -282px -4731px; width: 49px; height: 58px;}
.sprite-resource-icons.networkrules.small { background-position: -210px -4749px; width: 31px; height: 36px;}
-.sprite-resource-icons.networkrules.medium { background-position: -141px -4737px; width: 42px; height: 47px;}
+.sprite-resource-icons.networkrules.medium { background-position: -141px -4737px; width: 42px; height: 42px;}
.sprite-resource-icons.networkrules.large { background-position: -70px -4718px; width: 60px; height: 67px;}
.sprite-resource-icons.securityrules { background-position: -282px -4651px; width: 49px; height: 58px;}
.sprite-resource-icons.securityrules.small { background-position: -210px -4669px; width: 31px; height: 36px;}
-.sprite-resource-icons.securityrules.medium { background-position: -141px -4657px; width: 42px; height: 47px;}
+.sprite-resource-icons.securityrules.medium { background-position: -141px -4657px; width: 42px; height: 42px;}
.sprite-resource-icons.securityrules.large { background-position: -70px -4638px; width: 60px; height: 67px;}
.sprite-resource-icons.dcae_source { background-position: -282px -4563px; width: 60px; height: 60px;}
@@ -267,3 +267,12 @@
.sprite-resource-icons.allotted_resource.large { background-position: -70px -4879px; width: 60px; height: 60px;}
.sprite-resource-icons.vnfconfiguration.large { background-position: -70px -4959px; width: 60px; height: 60px;}
+
+.sprite-resource-icons.pmc.small {background-position: -214px -5238px; width: 21px; height: 21px;}
+//.sprite-resource-icons.pmc.medium {background-position: -204px -5044px; width: 40px; height: 40px;}
+//.sprite-resource-icons.pmc.large {background-position: -214px -5035px; width: 60px; height: 60px;}
+
+.sprite-resource-icons.dcae_machineLearning { background-position: -284px -5296px; width: 47px; height: 48px;}
+.sprite-resource-icons.dcae_machineLearning.small { background-position: -210px -5315px; width: 29px; height: 29px;}
+.sprite-resource-icons.dcae_machineLearning.medium { background-position: -141px -5303px; width: 41px; height: 41px;}
+.sprite-resource-icons.dcae_machineLearning.large { background-position: -70px -5284px; width: 60px; height: 60px;} \ No newline at end of file
diff --git a/catalog-ui/src/assets/styles/sprite.less b/catalog-ui/src/assets/styles/sprite.less
index 3f82e488db..107cb815ee 100644
--- a/catalog-ui/src/assets/styles/sprite.less
+++ b/catalog-ui/src/assets/styles/sprite.less
@@ -32,6 +32,10 @@
.delete-icon { background-position: -675px -231px; width: 11px; height: 13px;}
.delete-icon-hover { background-position: -702px -231px; width: 11px; height: 13px;}
+.view-icon { background-position: -671px -252px; width: 18px; height: 10px; }
+.view-icon-hover { background-position: -699px -252px; width: 18px; height: 10px; }
+.view-icon:hover:extend(.view-icon-hover) {}
+
.arrow-up { background-position: -350px -236px; width: 12px; height: 7px;}
.arrow-up-hover { background-position: -400px -236px; width: 12px; height: 7px;}
@@ -280,3 +284,10 @@
.sprite-new.canvas-fit-all { background-position: -208px -1326px; width: 30px; height: 30px;}
.sprite-new.canvas-fit-all:hover { background-position: -128px -1326px; }
.sprite-new.canvas-fit-all:active { background-position: -47px -1325px;}
+
+.blue-arrow-next{ background-position: -734px -878px; width: 23px; height: 23px;}
+.blue-arrow-back{ background-position: -767px -878px; width: 23px; height: 23px;}
+.white-arrow-next{ background-position: -734px -918px; width: 23px; height: 23px;}
+.white-arrow-back{ background-position: -767px -918px; width: 23px; height: 23px;}
+.link-tooltip-arrow{background-position:-746px -961px; width: 20px; height: 14px;}
+
diff --git a/catalog-ui/src/assets/styles/tooltips.less b/catalog-ui/src/assets/styles/tooltips.less
index 4528aea5d2..1a8710e9a7 100644
--- a/catalog-ui/src/assets/styles/tooltips.less
+++ b/catalog-ui/src/assets/styles/tooltips.less
@@ -70,6 +70,19 @@ div.tooltips {
border-color:rgb(80, 99, 113);
color: white;
font-size:13px;
+ max-width: 350px;
+}
+
+.link-qtip{
+ .line{
+ margin-bottom: 5px;
+ }
+ .req-cap-label{
+ font-family: @font-opensans-regular;
+ }
+ .link-tooltip-arrow{
+ margin-right: 5px;
+ }
}
.tooltip-custom {