From b8eda48aa720038247f3f5b86915efd016544e08 Mon Sep 17 00:00:00 2001 From: cyber-dream Date: Sun, 7 May 2023 04:24:46 +0300 Subject: [PATCH] pers props app update --- .../personal-properies.css | 55 +++++++++++++------ .../personal-properties.js | 2 +- templates/personal-properties/app.tmpl | 45 +++++++-------- 3 files changed, 63 insertions(+), 39 deletions(-) diff --git a/resources/sys/personal-properties/personal-properies.css b/resources/sys/personal-properties/personal-properies.css index 8f6174a..cf59790 100644 --- a/resources/sys/personal-properties/personal-properies.css +++ b/resources/sys/personal-properties/personal-properies.css @@ -22,7 +22,23 @@ width: 0; height: 0; } */ +.PersPropsContent{ + width: 100%; + height: 100%; + /* Auto layout */ + display: flex; + flex-direction: row; + justify-content: center; + align-items: flex-start; + padding: 0px; +} + +.PersPropsContent .PropsView{ + /* background-color: rebeccapurple; */ + width: 100%; + height: auto; +} .PropertiesList{ /* width: 100%; height: auto; */ @@ -41,7 +57,7 @@ } -.Personal-properties-bio{ +.PropertiesList .ShortBio{ /* width: 100%; height: auto; */ /* margin-right: -20px; */ @@ -61,9 +77,7 @@ gap:15px; } - - -.Personal-properties-textbio{ +.ShortBio .Text{ /* width: 100%; height: auto; */ @@ -81,8 +95,14 @@ gap:1px; } +.ShortBio .Name{ + font-family: "Virtue"; + /* FIXME */ + letter-spacing: 0.35px; +} -.Personal-properties-prop{ + +.PropertiesList .Island{ width: 100%; height: auto; border: 1px solid #888888; @@ -97,12 +117,10 @@ gap:1px; */ } - - - -.Personal-properties-prop-title{ +.Island .Title { font-family: "Virtue"; - letter-spacing: 0.35px; + /* FIXME */ + letter-spacing: 0.35px; position:relative; display: inline-block; max-width: 100%; @@ -111,7 +129,11 @@ top: -9px; } -.Personal-properties-prop-content{ +.Focused .Island .Title{ + background-color: #CCCCCC; +} + +.Island .Content{ width: 100%; /* top: 0px; */ /* Auto layout */ @@ -122,7 +144,7 @@ gap: 12px; } -.Personal-properties-prop-row{ +.Island .Row{ margin-left: 12px; margin-right: 12px; /* Auto layout */ @@ -132,7 +154,7 @@ padding: 0px; gap: 5px; } -.Personal-properties-prop-key{ +.Island .Key{ position: relative; font-family: "Virtue"; font-size: 11px; @@ -145,7 +167,7 @@ /* font-weight: bold; */ } -.Personal-properties-prop-key-comments{ +.Island .KeyComment{ /* color: rgb(129, 129, 129); TODO*/ color: #646464; font-size: 9px; @@ -154,7 +176,8 @@ white-space:normal; /* filter: drop-shadow(-.5px -.5px 0px #616161); */ } -.Personal-properties-prop-values{ + +.Island .Values{ width: 55%; display: flex; flex-direction: column; @@ -164,7 +187,7 @@ } -.Personal-properties-prop-value{ +.Values .Value{ /* width: 55%; */ } \ No newline at end of file diff --git a/resources/sys/personal-properties/personal-properties.js b/resources/sys/personal-properties/personal-properties.js index 2fb89d3..9c48f7c 100644 --- a/resources/sys/personal-properties/personal-properties.js +++ b/resources/sys/personal-properties/personal-properties.js @@ -23,7 +23,7 @@ class PersonalProperties{ newWindow.innerHTML = html - let scrollBar = new WdeScrollBar(newWindow.querySelector('.ScrollBarScrollElement'), newWindow.querySelector('.ScrollContent')) + let scrollBar = new WdeScrollBar(newWindow.querySelector('.ScrollBarScrollElement'), newWindow.querySelector('.PropsView')) newWindow.querySelector("#closeWindowButton").addEventListener('click', () => { console.log("qewqweqweqweqwe") diff --git a/templates/personal-properties/app.tmpl b/templates/personal-properties/app.tmpl index bbc0364..c0c567f 100644 --- a/templates/personal-properties/app.tmpl +++ b/templates/personal-properties/app.tmpl @@ -7,37 +7,37 @@
-
-
-
-
- My Photo -
- {{ .headerProps.IconPath }} -
{{ .headerProps.Name }}
-
{{ .headerProps.Info1 }}
-
{{ .headerProps.Info2 }}
-
-
- {{ range $propIsland := .allprops }} -
-
+
+
+
+
+
+ My Photo +
+
{{ .headerProps.Name }}
+
{{ .headerProps.Info1 }}
+
{{ .headerProps.Info2 }}
+
+
+ {{ range $propIsland := .allprops }} +
+
{{$propIsland.Header}}:
-
+
{{range $prop := $propIsland.Props}} -
-
+
+
{{$prop.Key}}: {{ range $value := $prop.KeyComments }} -
+
{{ $value }}
{{ end }}
-
+
{{ range $value := $prop.Values }} -
+
{{ $value }}
{{ end }} @@ -47,9 +47,10 @@
{{ end }} +
+ {{template "wde-widgets/scrollbar.tmpl" .}}
- {{template "wde-widgets/scrollbar.tmpl" .}}
{{ end }}