diff --git a/package.json b/package.json index 1c2a16e..6792cec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pcp-design", - "version": "1.4.0", + "version": "1.4.1", "description": "", "main": "index.js", "scripts": { diff --git a/src/component_content-tabs.html b/src/component_content-tabs.html index fcde594..8f3df89 100644 --- a/src/component_content-tabs.html +++ b/src/component_content-tabs.html @@ -59,6 +59,10 @@

Justified

{% include: 'includes/pcp-content-tabs__justified.html' %} +

Justified Equal

+ + {% include: 'includes/pcp-content-tabs__justified-equal.html' %} +

Samples

Mapping

diff --git a/src/includes/pcp-adjust__state.html b/src/includes/pcp-adjust__state.html index a36d457..6e3e56f 100644 --- a/src/includes/pcp-adjust__state.html +++ b/src/includes/pcp-adjust__state.html @@ -6,48 +6,48 @@

{{ title }}

- - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + +
StateMktChgAdjustStateMarketAdjustChg
KSGLF0.01{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__55sefj9fa' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}KSGLF{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__55sefj9fa' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}
OKGLF0.01{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5shod21a' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}OKGLF{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5shod21a' @VALUE:'-0.03' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}
COGLF-0.01{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5sssthi9' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}COGLF{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5sssthi9' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}-0.08
NEGLF0.02{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5ss66h' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}NEGLF{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5ss66h' @VALUE:'-0.05' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}
SDGLF0.00{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5sssssh' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}SDGLF{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5sssssh' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}
CAGLF0.07{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5s553fdgsh' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}CAGLF{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5s553fdgsh' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}
diff --git a/src/includes/pcp-adjust__state__adjustments-change.html b/src/includes/pcp-adjust__state__adjustments-change.html deleted file mode 100644 index 1e4853f..0000000 --- a/src/includes/pcp-adjust__state__adjustments-change.html +++ /dev/null @@ -1,63 +0,0 @@ -
-
-

{{ title }}

-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
StMktChgAdjustChg
KSGLF0.01{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__55sefj9fa' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}9.99
OKGLF0.01{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5shod21a' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}9.99
COGLF-0.01{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5sssthi9' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}9.99
NEGLF0.02{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5ss66h' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}9.99
SDGLF0.00{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5sssssh' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}9.99
CAGLF0.07{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5s553fdgsh' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}9.99
-
-
-
diff --git a/src/includes/pcp-adjust__terminal.html b/src/includes/pcp-adjust__terminal.html index 3ebdc21..d6ebe60 100644 --- a/src/includes/pcp-adjust__terminal.html +++ b/src/includes/pcp-adjust__terminal.html @@ -6,48 +6,55 @@

{{ title }}

- - - - + + + + + - - - - + + + + + - - - - + + + + + - - - - + + + + + - - - - + + + + + - - - - + + + + + - - - - + + + + +
MktPriceChgAdjustMktPriceChgAdjustChg
AMA3.13-0.01{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__55s5g89s5sssa' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}AMA3.13-0.01{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__55s5g89s5sssa' @VALUE:'-0.07' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}-0.02
KCM4.490.01{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__55s5ssgsaa' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}KCM4.490.01{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__55s5ssgsaa' @VALUE:'-1.06' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}
GLF4.630.00{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__55s5hh7jaa' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}GLF4.630.00{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__55s5hh7jaa' @VALUE:'-0.73' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}
MIN4.18-0.02{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__555d5d63jaa' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}MIN4.18-0.02{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__555d5d63jaa' @VALUE:'-0.67' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}
PWN4.810.00{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__sshggaai' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}PWN4.810.00{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__sshggaai' @VALUE:'-1.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}
WCD4.840.04{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__ssswsgsaai' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}WCD4.840.04{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__ssswsgsaai' @VALUE:'-1.28' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}
diff --git a/src/includes/pcp-adjust__terminal__adjustments-change.html b/src/includes/pcp-adjust__terminal__adjustments-change.html deleted file mode 100644 index efd906a..0000000 --- a/src/includes/pcp-adjust__terminal__adjustments-change.html +++ /dev/null @@ -1,63 +0,0 @@ -
-
-

{{ title }}

-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
MktPriceChgAdjustChg
AMA3.13-0.01{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__55s5g89s5sssa' @VALUE:'-0.07' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}0.00
KCM4.490.01{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__55s5ssgsaa' @VALUE:'-1.06' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}0.00
GLF4.630.00{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__55s5hh7jaa' @VALUE:'-0.73' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}0.00
MIN4.18-0.02{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__555d5d63jaa' @VALUE:'-0.67' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}0.00
PWN4.810.00{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__sshggaai' @VALUE:'-1.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}0.00
WCD4.840.04{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__ssswsgsaai' @VALUE:'-1.28' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}0.00
-
-
-
diff --git a/src/includes/pcp-content-tabs__justified-equal.html b/src/includes/pcp-content-tabs__justified-equal.html new file mode 100644 index 0000000..47fa78c --- /dev/null +++ b/src/includes/pcp-content-tabs__justified-equal.html @@ -0,0 +1,10 @@ +
+
+
  • Lorem
    • +
  • Ipsum
    • +
  • Dolor
    • +
  • Sit
    • +
  • Amet
    • +
    +
    +
    diff --git a/src/includes/pcp-mapping_adjustments-change.html b/src/includes/pcp-mapping_adjustments-change.html deleted file mode 100644 index b741f50..0000000 --- a/src/includes/pcp-mapping_adjustments-change.html +++ /dev/null @@ -1,82 +0,0 @@ -
    -
    - {% include: 'includes/pcp-content-tabs__map.html' %} -
    -
    - -
    - -
    - -
    - -
    - -
    - -
    - {% include: 'includes/pcp-card__hrw.html' %} -
    -
    -
    - {% include: 'includes/pcp-adjust__terminal__adjustments-change.html' @title:'Terminal Adjustments' %} -
    -
    -
    - {% include: 'includes/pcp-adjust__state__adjustments-change.html' @title:'State Adjustments' %} -
    -
    -
    - -
    - -
    -
    -
    -0.03
    -
    -
    -
    - -
    -
    -
    -0.76
    -
    -
    -
    - -
    -
    -
    -0.08
    -
    -
    -
    - -
    - {% include: 'includes/rift-detail.html' %} -
    - -
    - {% include: 'includes/rift-detail__example-76883776994975.html' %} -
    - -
    - {% include: 'includes/rift-detail__example-445S5545545558.html' %} -
    - -
    - -
    - -
    - (zoom, threshold, layers, etc) -
    - -
    -
    -
    - -

    - - - -

    diff --git a/src/includes/prototype-list.html b/src/includes/prototype-list.html index e667212..588d0e1 100644 --- a/src/includes/prototype-list.html +++ b/src/includes/prototype-list.html @@ -2,7 +2,6 @@
  • Index
  • Prototype: Workflow > Mapping
    • -
  • Prototype: Workflow > Mapping (Change column)
  • Prototype: Markets
  • Prototype: Markets, Add Success
  • Prototype: Markets, Edit Error
    • diff --git a/src/stylesheets/components/_pcp.adjust.scss b/src/stylesheets/components/_pcp.adjust.scss index 6409eb1..2b5c918 100644 --- a/src/stylesheets/components/_pcp.adjust.scss +++ b/src/stylesheets/components/_pcp.adjust.scss @@ -1,3 +1,4 @@ + .pcp-adjust { $padding: $size-base; @@ -36,11 +37,9 @@ @include font-size(2); - text-align: right; - padding: $padding; + padding: $padding ($padding * 2); &--first { - text-align: left; padding-left: ($padding * 3); } @@ -52,36 +51,33 @@ background-color: $color-fsa-site-bg; padding-left: ($padding * 3); - text-align: left; &.pcp-adjust__th--last, &.pcp-adjust__td--last { - padding-left: $padding; - text-align: right; - padding-right: $padding; + padding-left: 0; + padding-right: ($padding * 2); } &.pcp-adjust__th--last { - text-align: center; } - & + & { - padding-left: 0; - padding-right: ($padding * 3); - } + } + &--number { + text-align: right; } &--bisect { border-right: 1px solid $color-fsa-tertiary-200; padding-right: ($padding * 3); + padding-left: 0; } } &__th { - @include font-size(0); + font-size: $font-size-0 - .1rem; padding-top: $padding * 2; text-transform: uppercase; @@ -94,7 +90,7 @@ &--adj {} &--editable { - padding-left: $padding; + padding-left: ($padding * 2); } } diff --git a/src/stylesheets/components/_pcp.content-tabs.scss b/src/stylesheets/components/_pcp.content-tabs.scss index 44f6280..67e237d 100644 --- a/src/stylesheets/components/_pcp.content-tabs.scss +++ b/src/stylesheets/components/_pcp.content-tabs.scss @@ -1,5 +1,7 @@ .pcp-content-tabs { + $tab-padding: $size-small; + display: flex; &--justified {} @@ -14,6 +16,10 @@ // scss-lint:disable SelectorFormat .pcp-content-tabs--justified & { width: 100%; + } + + .pcp-content-tabs--justified-equal & { + width: 100%; table-layout: fixed; } @@ -22,12 +28,13 @@ &__aside { display: block; - flex: 2; + flex: 10; content: ''; border-bottom: 1px solid $color-fsa-tertiary-200; // scss-lint:disable SelectorFormat - .pcp-content-tabs--justified & { + .pcp-content-tabs--justified &, + .pcp-content-tabs--justified-equal & { display: none; } @@ -43,7 +50,7 @@ @include font-size(4); display: block; text-decoration: none; - padding: $size-small $size-medium; + padding: $tab-padding ($tab-padding * 2); border: solid transparent; border-bottom-color: $color-fsa-tertiary-200; border-width: $size-base 1px 1px; @@ -70,22 +77,35 @@ color: $color-fsa-tertiary-300; font-size: 24px; line-height: 1; - margin-left: $size-small; + margin-left: $tab-padding; } } &--small { + @include font-size(3); + padding-left: ($tab-padding + $size-base); + padding-right: ($tab-padding + $size-base); + } &--large { + @include font-size(5); + padding-left: ($tab-padding * 3); + padding-right: ($tab-padding * 3); + } &--contrast { background-color: $color-fsa-white; } + .pcp-content-tabs--justified & { + padding-left: ($tab-padding / 2); + padding-right: ($tab-padding / 2); + } + } } diff --git a/src/stylesheets/components/_pcp.mapping.scss b/src/stylesheets/components/_pcp.mapping.scss index acf5212..3881777 100644 --- a/src/stylesheets/components/_pcp.mapping.scss +++ b/src/stylesheets/components/_pcp.mapping.scss @@ -9,7 +9,7 @@ } } -$mapPanelWidth: ($size-base * 66); +$mapPanelWidth: ($size-base * 75); $mapPanelIconHeight: $size-large; $mapPanelIconWidth: $size-medium; @@ -256,7 +256,7 @@ $mapPanelIconWidth: $size-medium; display: none; position: absolute; - left: 292px; + left: $mapPanelWidth + $size-medium; bottom: $size-medium; width: 220px; diff --git a/src/stylesheets/components/_pcp.spinbox.scss b/src/stylesheets/components/_pcp.spinbox.scss index 9243805..4368bdc 100644 --- a/src/stylesheets/components/_pcp.spinbox.scss +++ b/src/stylesheets/components/_pcp.spinbox.scss @@ -55,7 +55,7 @@ .pcp-adjust__spinbox & { background-color: transparent; - border-color: transparent; + border-color: transparentize($form-outline-color, .5); &:hover, &:focus { @@ -63,10 +63,6 @@ border-color: $button-border-color-hover; } - &:focus { - border-color: $form-focus-color; - } - } .pcp-adjust__spinbox--focused & { @@ -84,11 +80,13 @@ bottom: 0; .pcp-adjust__spinbox & { - display: none; + opacity: .4; + pointer-events: none; } .pcp-adjust__spinbox--focused & { - display: block; + opacity: 1; + pointer-events: initial; } } diff --git a/src/workflow_mapping-adjustments-change.html b/src/workflow_mapping-adjustments-change.html deleted file mode 100644 index 1a66fdc..0000000 --- a/src/workflow_mapping-adjustments-change.html +++ /dev/null @@ -1,53 +0,0 @@ -{% include: 'includes/html.html' %} - -{% include: 'includes/head.html' @title:'Mapping' %} - - - - {% include: 'includes/fsa-browser-upgrade.html' %} - - {% include: 'includes/skipnav.html' %} - - {% include: 'includes/fsa-disclaimer.html' %} - -
    - {% include: 'includes/pcp-header.html' %} -
    - -
    - -
    - -
    - - {% include: 'includes/pcp-stepped-tabs__mapping.html' %} - - {% include: 'includes/pcp-title-action-bar.html' @title:'Adjustments' @action:'Finalize' %} - - {% include: 'includes/pcp-mapping_adjustments-change.html' %} - -
    - -
    - -
    - - - - {% include: 'includes/scripts.html' %} - - {% include: 'includes/whiteout.html' @CLASS:'pcp-whiteout--hidden' %} - -
    - {% include: 'includes/growl_map-reset-confirm.html' @ID:'unique-id-55sssss55om' %} - {% include: 'includes/growl_map-save.html' @ID:'unique-id-55s55h55from' %} -
    -
    - {% include: 'includes/growl_map-reset.html' @ID:'unique-id-556847000om' %} -
    - - - -