From a5445100050e49e83f73424198d73cd72d672a4d Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 4 Mar 2018 14:53:33 +0200 Subject: Sync Integ to Master Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74 Issue-ID: SDC-977 Signed-off-by: Gitelman, Tal (tg851x) --- catalog-ui/src/assets/styles/app.less | 3 ++ .../styles/images/canvas-tagging-icons/adding.svg | 48 ++++++++++++++++++ .../images/canvas-tagging-icons/adding_group.svg | 33 +++++++++++++ .../images/canvas-tagging-icons/adding_policy.svg | 33 +++++++++++++ .../images/canvas-tagging-icons/group_added.svg | 33 +++++++++++++ .../images/canvas-tagging-icons/indication.svg | 26 ++++++++++ .../images/canvas-tagging-icons/policy_added.svg | 33 +++++++++++++ .../images/resource-icons/monitoring_template.png | Bin 0 -> 16351 bytes .../images/sprites/sprite-policy-groups-icons.png | Bin 0 -> 13071 bytes .../src/assets/styles/sprite-group-icons.less | 11 +++++ .../src/assets/styles/sprite-policy-icons.less | 12 +++++ .../src/assets/styles/sprite-resource-icons.less | 8 +-- catalog-ui/src/assets/styles/sprite.less | 4 +- catalog-ui/src/assets/styles/tables.less | 54 +++++++++++++++++++++ 14 files changed, 292 insertions(+), 6 deletions(-) create mode 100644 catalog-ui/src/assets/styles/images/canvas-tagging-icons/adding.svg create mode 100644 catalog-ui/src/assets/styles/images/canvas-tagging-icons/adding_group.svg create mode 100644 catalog-ui/src/assets/styles/images/canvas-tagging-icons/adding_policy.svg create mode 100644 catalog-ui/src/assets/styles/images/canvas-tagging-icons/group_added.svg create mode 100644 catalog-ui/src/assets/styles/images/canvas-tagging-icons/indication.svg create mode 100644 catalog-ui/src/assets/styles/images/canvas-tagging-icons/policy_added.svg create mode 100644 catalog-ui/src/assets/styles/images/resource-icons/monitoring_template.png create mode 100644 catalog-ui/src/assets/styles/images/sprites/sprite-policy-groups-icons.png create mode 100644 catalog-ui/src/assets/styles/sprite-group-icons.less create mode 100644 catalog-ui/src/assets/styles/sprite-policy-icons.less create mode 100644 catalog-ui/src/assets/styles/tables.less (limited to 'catalog-ui/src/assets/styles') diff --git a/catalog-ui/src/assets/styles/app.less b/catalog-ui/src/assets/styles/app.less index 8042c0e7b7..f48fd864ef 100644 --- a/catalog-ui/src/assets/styles/app.less +++ b/catalog-ui/src/assets/styles/app.less @@ -14,6 +14,8 @@ @import 'sprite.less'; @import 'sprite-resource-icons.less'; @import 'sprite-services-icons.less'; +@import 'sprite-group-icons.less'; +@import 'sprite-policy-icons.less'; @import 'animation.less'; @import 'buttons.less'; @@ -35,6 +37,7 @@ @import 'welcome-sprite.less'; @import 'welcome-style.less'; @import 'notification-template.less'; +@import 'tables.less'; // Less insides specific files. @import '../../app/directives/ecomp-header/ecomp-header.less'; diff --git a/catalog-ui/src/assets/styles/images/canvas-tagging-icons/adding.svg b/catalog-ui/src/assets/styles/images/canvas-tagging-icons/adding.svg new file mode 100644 index 0000000000..1a9a507948 --- /dev/null +++ b/catalog-ui/src/assets/styles/images/canvas-tagging-icons/adding.svg @@ -0,0 +1,48 @@ + + + + Group 12 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/catalog-ui/src/assets/styles/images/canvas-tagging-icons/adding_group.svg b/catalog-ui/src/assets/styles/images/canvas-tagging-icons/adding_group.svg new file mode 100644 index 0000000000..90920e9001 --- /dev/null +++ b/catalog-ui/src/assets/styles/images/canvas-tagging-icons/adding_group.svg @@ -0,0 +1,33 @@ + + + + Group 12 Copy + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/catalog-ui/src/assets/styles/images/canvas-tagging-icons/adding_policy.svg b/catalog-ui/src/assets/styles/images/canvas-tagging-icons/adding_policy.svg new file mode 100644 index 0000000000..217d92c654 --- /dev/null +++ b/catalog-ui/src/assets/styles/images/canvas-tagging-icons/adding_policy.svg @@ -0,0 +1,33 @@ + + + + Group 12 Copy + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/catalog-ui/src/assets/styles/images/canvas-tagging-icons/group_added.svg b/catalog-ui/src/assets/styles/images/canvas-tagging-icons/group_added.svg new file mode 100644 index 0000000000..d88e7ca343 --- /dev/null +++ b/catalog-ui/src/assets/styles/images/canvas-tagging-icons/group_added.svg @@ -0,0 +1,33 @@ + + + + Group 13 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/catalog-ui/src/assets/styles/images/canvas-tagging-icons/indication.svg b/catalog-ui/src/assets/styles/images/canvas-tagging-icons/indication.svg new file mode 100644 index 0000000000..7581d0447e --- /dev/null +++ b/catalog-ui/src/assets/styles/images/canvas-tagging-icons/indication.svg @@ -0,0 +1,26 @@ + + + + Group 4 Copy 10 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/catalog-ui/src/assets/styles/images/canvas-tagging-icons/policy_added.svg b/catalog-ui/src/assets/styles/images/canvas-tagging-icons/policy_added.svg new file mode 100644 index 0000000000..9ff39019c7 --- /dev/null +++ b/catalog-ui/src/assets/styles/images/canvas-tagging-icons/policy_added.svg @@ -0,0 +1,33 @@ + + + + Group 13 Copy + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/catalog-ui/src/assets/styles/images/resource-icons/monitoring_template.png b/catalog-ui/src/assets/styles/images/resource-icons/monitoring_template.png new file mode 100644 index 0000000000..f5b73989a6 Binary files /dev/null and b/catalog-ui/src/assets/styles/images/resource-icons/monitoring_template.png differ diff --git a/catalog-ui/src/assets/styles/images/sprites/sprite-policy-groups-icons.png b/catalog-ui/src/assets/styles/images/sprites/sprite-policy-groups-icons.png new file mode 100644 index 0000000000..fe1723e2fa Binary files /dev/null and b/catalog-ui/src/assets/styles/images/sprites/sprite-policy-groups-icons.png differ diff --git a/catalog-ui/src/assets/styles/sprite-group-icons.less b/catalog-ui/src/assets/styles/sprite-group-icons.less new file mode 100644 index 0000000000..47340adbb3 --- /dev/null +++ b/catalog-ui/src/assets/styles/sprite-group-icons.less @@ -0,0 +1,11 @@ +.sprite-group-icons { + background-image: url('images/sprites/sprite-policy-groups-icons.png'); + display: inline-block; +} + +.sprite-group-icons.disable { opacity:0.5;} +.sprite-group-icons.group { background-position: -43px -42px; width: 40px; height: 40px;} +.sprite-group-icons.group-border { background-position: -123px -36px; width: 55px; height: 55px;} + +sprite-group-icons.group-empty { background-position: -40px -274px; width: 47px; height: 47px;} +sprite-group-icons.group-empty-border { background-position: -123px -270px; width: 55px; height: 55px;} \ No newline at end of file diff --git a/catalog-ui/src/assets/styles/sprite-policy-icons.less b/catalog-ui/src/assets/styles/sprite-policy-icons.less new file mode 100644 index 0000000000..154cf0b6a3 --- /dev/null +++ b/catalog-ui/src/assets/styles/sprite-policy-icons.less @@ -0,0 +1,12 @@ +.sprite-policy-icons { + background-image: url('images/sprites/sprite-policy-groups-icons.png'); + display: inline-block; +} + +.sprite-policy-icons.disable { opacity:0.5;} + +.sprite-policy-icons.policy { background-position: -42px -130px; width: 40px; height: 40px;} +.sprite-policy-icons.policy-border { background-position: -123px -123px; width: 55px; height: 55px;} + +.sprite-policy-icons.policy-empty { background-position: -40px -546px; width: 47px; height: 47px;} +.sprite-policy-icons.policy-empty-border { background-position: -123px -542px; width: 55px; height: 55px;} diff --git a/catalog-ui/src/assets/styles/sprite-resource-icons.less b/catalog-ui/src/assets/styles/sprite-resource-icons.less index 96993d5171..2f542d661c 100644 --- a/catalog-ui/src/assets/styles/sprite-resource-icons.less +++ b/catalog-ui/src/assets/styles/sprite-resource-icons.less @@ -195,10 +195,10 @@ .sprite-resource-icons.ucpe.medium { background-position: -141px -3137px; width: 41px; height: 41px;} .sprite-resource-icons.ucpe.large { background-position: -70px -3119px; width: 60px; height: 60px;} -.sprite-resource-icons.vrouter { background-position: -282px -3066px; width: 69px; height: 43px;} -.sprite-resource-icons.vrouter.small { background-position: -210px -3080px; width: 29px; height: 29px;} -.sprite-resource-icons.vrouter.medium { background-position: -141px -3068px; width: 41px; height: 41px;} -.sprite-resource-icons.vrouter.large { background-position: -70px -3049px; width: 60px; height: 60px;} +.sprite-resource-icons.vRouter { background-position: -282px -3066px; width: 69px; height: 43px;} +.sprite-resource-icons.vRouter.small { background-position: -210px -3080px; width: 29px; height: 29px;} +.sprite-resource-icons.vRouter.medium { background-position: -141px -3068px; width: 41px; height: 41px;} +.sprite-resource-icons.vRouter.large { background-position: -70px -3049px; width: 60px; height: 60px;} .sprite-resource-icons.wanx { background-position: -283px -2992px; width: 58px; height: 47px;} .sprite-resource-icons.wanx.small { background-position: -210px -3009px; width: 30px; height: 30px;} diff --git a/catalog-ui/src/assets/styles/sprite.less b/catalog-ui/src/assets/styles/sprite.less index 107cb815ee..aaf4f5529a 100644 --- a/catalog-ui/src/assets/styles/sprite.less +++ b/catalog-ui/src/assets/styles/sprite.less @@ -231,8 +231,8 @@ .asc{background-position: -924px -71px; width: 8px; height: 12px;} .desc{background-position: -924px -101px; width: 8px; height: 12px;} -.delete-item-icon { background-position: -140px -1119px; width: 11px; height: 15px; } -.delete-item-icon:hover { background-position: -167px -1119px; width: 11px; height: 15px; } +.delete-item-icon { background-position: -140px -1118px; width: 11px; height: 15px; } +.delete-item-icon:hover { background-position: -167px -1118px; width: 11px; height: 15px; } .filter-icon { background-position: -48px -1040px; width: 19px; height: 20px;} .filter-icon:hover { background-position: -99px -1040px; width: 19px; height: 20px;} .filled-checkbox-icon { background-position: -100px -1079px; width: 14px; height: 14px;} diff --git a/catalog-ui/src/assets/styles/tables.less b/catalog-ui/src/assets/styles/tables.less new file mode 100644 index 0000000000..6bac2588a4 --- /dev/null +++ b/catalog-ui/src/assets/styles/tables.less @@ -0,0 +1,54 @@ +.generic-table { + border: solid 1px @main_color_o; + color: @main_color_m; + background-color: @func_color_r; + font-size: 13px; + font-family: @font-opensans-regular; + overflow-y: auto; + + .cell { + flex: 1; + padding: 10px; + border-right: @main_color_o solid 1px; + &:last-child { + margin: 0; + flex: 0.1; + border: none; + } + } + + .header-row { + display: flex; + flex-basis: 100%; + background-color: @func_color_r; + color: @func_color_s; + font-weight: bold; + border-bottom: @main_color_o solid 1px; + position: sticky; + top: 0; + z-index: 1; + .header-cell { + padding: 10px; + } + } + + .data-row { + display: flex; + flex-basis: 100%; + border-bottom: @main_color_o solid 1px; + background-color: @main_color_p; + &:last-child { + border-bottom: none; + } + } + + .no-row-text { + color: @main_color_m; + display: flex; + flex-basis: 100%; + background-color: @main_color_p; + padding: 20px; + justify-content: center; + font-size: 14px; + } +} \ No newline at end of file -- cgit 1.2.3-korg