diff --git a/projects/capx/src/app/capx/components/common/critical-lane-volume-sum/critical-lane-volume-sum.component.scss b/projects/capx/src/app/capx/components/common/critical-lane-volume-sum/critical-lane-volume-sum.component.scss index 961015b..e964849 100644 --- a/projects/capx/src/app/capx/components/common/critical-lane-volume-sum/critical-lane-volume-sum.component.scss +++ b/projects/capx/src/app/capx/components/common/critical-lane-volume-sum/critical-lane-volume-sum.component.scss @@ -1,7 +1,7 @@ :host { position: absolute; right: 30px; - top: 60px; + top: 66px; } :host { diff --git a/projects/capx/src/app/capx/components/common/svg-viewer/svg-viewer.component.scss b/projects/capx/src/app/capx/components/common/svg-viewer/svg-viewer.component.scss index 5919701..33cbe5d 100644 --- a/projects/capx/src/app/capx/components/common/svg-viewer/svg-viewer.component.scss +++ b/projects/capx/src/app/capx/components/common/svg-viewer/svg-viewer.component.scss @@ -2,7 +2,10 @@ display: block; .container { - width: calc(100vw - 18rem); + width: calc(100vw - 17.4rem); height: calc(100vh - 9rem); + border: 1px solid #ccc; + margin: 10px 0; + border-radius: 3px; } } diff --git a/projects/capx/src/app/capx/components/junctions/intersections/conventional-junction/configuration/conventional-configuration.component.html b/projects/capx/src/app/capx/components/junctions/intersections/conventional-junction/configuration/conventional-configuration.component.html index effebff..86e1539 100644 --- a/projects/capx/src/app/capx/components/junctions/intersections/conventional-junction/configuration/conventional-configuration.component.html +++ b/projects/capx/src/app/capx/components/junctions/intersections/conventional-junction/configuration/conventional-configuration.component.html @@ -10,10 +10,10 @@ -
PEPCH
{{(capxStateService.masterParameters$ | async)!.south_bound_right}}
-
PEPCH
{{(capxStateService.masterParameters$ | async)!.south_bound_thru}}
-
PEPCH
{{(capxStateService.masterParameters$ | async)!.south_bound_left}}
-
PEPCH
{{(capxStateService.masterParameters$ | async)!.south_bound_u}}
+
PEPCH
{{(capxStateService.masterParameters$ | async)!.south_bound_right}}
+
PEPCH
{{(capxStateService.masterParameters$ | async)!.south_bound_thru}}
+
PEPCH
{{(capxStateService.masterParameters$ | async)!.south_bound_left}}
+
PEPCH
{{(capxStateService.masterParameters$ | async)!.south_bound_u}}
@@ -31,23 +31,23 @@ - + - + - + - +
{{(capxStateService.masterParameters$ | async)!.east_bound_u}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.east_bound_u}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.east_bound_left}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.east_bound_left}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.east_bound_thru}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.east_bound_thru}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.east_bound_right}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.east_bound_right}}
PEPCH
@@ -74,23 +74,23 @@ - + - + - + - +
PEPCH
{{(capxStateService.masterParameters$ | async)!.west_bound_right}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.west_bound_right}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.west_bound_thru}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.west_bound_thru}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.west_bound_left}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.west_bound_left}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.west_bound_u}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.west_bound_u}}
@@ -110,10 +110,10 @@ - {{(capxStateService.masterParameters$ | async)!.north_bound_u}}
PEPCH - {{(capxStateService.masterParameters$ | async)!.north_bound_left}}
PEPCH - {{(capxStateService.masterParameters$ | async)!.north_bound_thru}}
PEPCH - {{(capxStateService.masterParameters$ | async)!.north_bound_right}}
PEPCH + {{(capxStateService.masterParameters$ | async)!.north_bound_u}}
PEPCH + {{(capxStateService.masterParameters$ | async)!.north_bound_left}}
PEPCH + {{(capxStateService.masterParameters$ | async)!.north_bound_thru}}
PEPCH + {{(capxStateService.masterParameters$ | async)!.north_bound_right}}
PEPCH diff --git a/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/configuration/partial-displaced-left-turn-intersection-north-south-configuration.component.html b/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/configuration/partial-displaced-left-turn-intersection-north-south-configuration.component.html index ecda362..fabfdb2 100644 --- a/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/configuration/partial-displaced-left-turn-intersection-north-south-configuration.component.html +++ b/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/configuration/partial-displaced-left-turn-intersection-north-south-configuration.component.html @@ -1,5 +1,5 @@ -
- +
+
- + @@ -178,10 +178,10 @@ - - - - + + + + diff --git a/projects/capx/src/app/capx/components/junctions/junction.component.html b/projects/capx/src/app/capx/components/junctions/junction.component.html index 1831724..7e389b5 100644 --- a/projects/capx/src/app/capx/components/junctions/junction.component.html +++ b/projects/capx/src/app/capx/components/junctions/junction.component.html @@ -16,7 +16,7 @@ -
+
diff --git a/projects/capx/src/app/capx/components/junctions/junction.component.scss b/projects/capx/src/app/capx/components/junctions/junction.component.scss index 3184cc0..50a840b 100644 --- a/projects/capx/src/app/capx/components/junctions/junction.component.scss +++ b/projects/capx/src/app/capx/components/junctions/junction.component.scss @@ -3,4 +3,10 @@ width: 100%; height: 100%; display: flow-root; + + .container { + border: 1px solid #ccc; + margin: 10px 0; + border-radius: 3px; + } } diff --git a/projects/capx/src/styles.scss b/projects/capx/src/styles.scss index b7c559a..2ab4642 100644 --- a/projects/capx/src/styles.scss +++ b/projects/capx/src/styles.scss @@ -119,6 +119,11 @@ table { //background-color: hsl(198, 0%, 87%); } + &.pepch { + font-size: 10px; + line-height: 1.4; + } + img { width: 40px; height: 40px; @@ -188,3 +193,8 @@ capx-svg-viewer { height:100% } } + + +.nav { + box-shadow: none; +}
@@ -10,10 +10,10 @@ - - - - + + + + @@ -44,7 +44,7 @@ - + @@ -63,24 +63,24 @@
PEPCH
{{(capxStateService.masterParameters$ | async)!.south_bound_right}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.south_bound_thru}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.south_bound_left}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.south_bound_u}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.south_bound_right}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.south_bound_thru}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.south_bound_left}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.south_bound_u}}
{{form.get('north_bound_thru').value}}
{{(capxStateService.masterParameters$ | async)!.east_bound_left + (capxStateService.masterParameters$ | async)!.north_bound_thru}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.east_bound_left + (capxStateService.masterParameters$ | async)!.north_bound_thru}}
PEPCH
- + - + - + - +
{{(capxStateService.masterParameters$ | async)!.east_bound_u}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.east_bound_u}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.east_bound_left}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.east_bound_left}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.east_bound_thru}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.east_bound_thru}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.east_bound_right}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.east_bound_right}}
PEPCH
@@ -107,24 +107,24 @@ - + - + - + - +
PEPCH
{{(capxStateService.masterParameters$ | async)!.west_bound_right}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.west_bound_right}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.west_bound_thru}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.west_bound_thru}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.west_bound_left}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.west_bound_left}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.west_bound_u}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.west_bound_u}}
@@ -144,7 +144,7 @@
PEPCH
{{(capxStateService.masterParameters$ | async)!.south_bound_thru + (capxStateService.masterParameters$ | async)!.west_bound_left}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.south_bound_thru + (capxStateService.masterParameters$ | async)!.west_bound_left}}
{{form.get('south_bound_thru').value}}
{{(capxStateService.masterParameters$ | async)!.north_bound_u}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.north_bound_left}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.north_bound_thru}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.north_bound_right}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.north_bound_u}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.north_bound_left}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.north_bound_thru}}
PEPCH
{{(capxStateService.masterParameters$ | async)!.north_bound_right}}
PEPCH