From ed395de27a8e664fdac5a46e89ed9f92c28a093e Mon Sep 17 00:00:00 2001
From: senza <maximesenzamici@gmail.com>
Date: Sat, 8 Aug 2020 13:58:07 +0200
Subject: [PATCH] remove icons & listing search css & convo tab css & remove
icons & gitignore
---
.gitignore | 2 ++
css/main.css | 63 ++++++++++++++++++++++++++-----------
fonts/material-design-icons | 1 -
index.html | 5 +--
js/polls-math.js | 3 +-
sib-polls.js | 31 ++++++++++--------
6 files changed, 69 insertions(+), 36 deletions(-)
delete mode 160000 fonts/material-design-icons
diff --git a/.gitignore b/.gitignore
index a3f6eba..4cf5e07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
node_modules
questions*
report*
+etuc-voting.html
+form.html
diff --git a/css/main.css b/css/main.css
index e6048e6..46c1ab0 100644
--- a/css/main.css
+++ b/css/main.css
@@ -51,13 +51,6 @@
/*=================
Global styling
=================*/
-
-html {
- font-size: 1rem;
- width: 80%;
- margin: auto;
-}
-
h1,h2{
color: var(--title-font-color);
}
@@ -246,12 +239,15 @@ solid-multiple[name="tags"] > div{
etuc-display-votetags[name="tags"]{
width: 30%;
margin: 0.2rem;
+ display: flex;
+ justify-content: center;
}
etuc-display-votetags[name="tags"] div{
background-color: grey;
text-align: center;
border-radius: 55px;
+ justify-content: center;
}
etuc-display-votetags[name="tags"] div p{
@@ -285,21 +281,49 @@ solid-set-default[name="orgLine"] solid-display-value[name="hostingOrganisation"
Polls Listing page
*************************************/
+#pollListing .headline{
+ display: flex;
+ flex-direction: row;
+}
+#pollListing .headline >h2,#pollListing .headline >div{
+ width: 50%;
+ align-self: center;
+}
+
#pollListing .add-poll{
display: flex;
- place-content: flex-end;
- width: 100%;
+ justify-content: flex-end;
}
#pollListing .add-poll solid-link{
border-radius: var(--button-radius);
padding: var(--buttons-padding);
background-color: var(--second-color);
color: var(--light-text-color);
- width: 10%;
+ width: 186px;
text-align: center;
cursor: pointer;
}
+#pollListing .add-poll solid-link p {
+ align-self: center;
+}
+/*style tags above listing*/
+
+/*label*/
+#pollListing solid-display.all-polls solid-form-placeholder-text[name="tags"] div{
+
+}
+
+/*input*/
+#pollListing solid-display.all-polls solid-form-placeholder-text[name="tags"] input[name="tags"]{
+ height: 37px;
+ width: 299px;
+ background-color: #FFFFFF;
+ box-shadow: 0 0 5px 0 rgba(133,140,148,0.09);
+}
+
+
+/*poll listing*/
#pollListing solid-display.all-polls >div{
justify-content: space-around;
margin: 2rem 0;
@@ -539,36 +563,37 @@ vote side
debate side
***/
-#pollPage solid-conversation{
- width: 100%;
+#pollPage sib-conversation{
+ width: 90%;
+ margin: auto;
}
-#pollPage div.solid-conversation{
+#pollPage div.sib-conversation{
display: flex;
flex-direction: column;
}
-#pollPage div.solid-conversation solid-ac-checker{
+#pollPage div.sib-conversation solid-ac-checker{
order: 2;
width: 100%;
}
-#pollPage div.solid-conversation solid-display.conversation{
+#pollPage div.sib-conversation solid-display.conversation{
order: 1;
flex-direction: column;
}
-#pollPage div.solid-conversation solid-display.conversation div {
+#pollPage div.sib-conversation solid-display.conversation div {
flex-direction: column;
}
-#pollPage div.solid-conversation solid-display.conversation div solid-display{
+#pollPage div.sib-conversation solid-display.conversation div solid-display{
width: 100%;
}
-#pollPage .solid-conversation .conversation-item,#pollPage .solid-conversation .conversation-form {
- border: 0px solid white !important; /*important to override the default componant css*/
+#pollPage .sib-conversation .conversation-item,#pollPage .sib-conversation .conversation-form {
+ border: 0px solid transparent !important; /*important to override the default componant css*/
}
diff --git a/fonts/material-design-icons b/fonts/material-design-icons
deleted file mode 160000
index 224895a..0000000
--- a/fonts/material-design-icons
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 224895a86501195e7a7ff3dde18e39f00b8e3d5a
diff --git a/index.html b/index.html
index f84342b..11c7de9 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,8 @@
<script type="module" src="https://unpkg.com/@startinblox/router"></script>
<link rel="stylesheet" href="/css/main.css">
- <!-- get js dependencies-->
+ <!-- get js dependencies
+ data-src="http://92.222.75.16:85/"-->
<script type="module" src="index.js"></script>
<style>
@@ -22,7 +23,7 @@
<body>
<h1>Demo of the polls component</h1>
<solid-poll
- data-src="http://localhost:8000/"
+ data-src="http://127.0.0.1:8000/"
>
</solid-poll>
diff --git a/js/polls-math.js b/js/polls-math.js
index 6abfe18..f2d7581 100644
--- a/js/polls-math.js
+++ b/js/polls-math.js
@@ -60,6 +60,7 @@ window.addEventListener('load', () => {
const currentPollValues = currentPage.querySelectorAll("[id=poll-votes-values]")[0];
//add the poll number
const currentPollSrc = dataSourceDomain + "/polls/total_votes/" + currentId + "/";
+ console.log("the domaine here is : ", dataSourceDomain,currentPollSrc);
//push the reconstructed data src to the HTML
currentPage.querySelector("[id=poll-votes-values]").dataset.src = currentPollSrc;
}
@@ -76,7 +77,7 @@ window.addEventListener('load', () => {
}
//get the range for option choices
const newOptionRange = dataSourceDomain+"/polls/"+currentId+"/pollOptions/";
- //push new URL
+ //push new
formContent.setAttribute('range-chosenoption',newOptionRange);
}
diff --git a/sib-polls.js b/sib-polls.js
index 06f4eda..a47e79e 100644
--- a/sib-polls.js
+++ b/sib-polls.js
@@ -76,28 +76,33 @@ export class SolidPoll extends SolidTemplateElement {
<solid-route use-id name="add-survey"></solid-route>
</solid-router>
<div id="pollListing" hidden>
- <h2>Research a survey</h2>
- <div class="add-poll">
- <solid-link next="add-survey">Add Poll</solid-link>
+ <div class="headline">
+ <h2>Research a survey</h2>
+ <div class="add-poll">
+ <solid-link next="add-survey">Add Poll</solid-link>
+ </div>
</div>
- <solid-display
+ <solid-display
class="all-polls"
+
+ search-fields="tags"
+ multiple-tags
+ search-widget-tags="solid-form-placeholder-text"
+ search-label-tags="Keyword"
+
data-src="${sourceUrl}polls/"
fields="banner(image),topline(title,orgLine(orgImage,hostingOrganisation),dateLine(dateImage,endDate)),
body(shortDescription,tags)"
widget-orgImage="solid-display-div"
- value-orgImage="<i class='material-icons'>language</i>"
+ value-orgImage="<i class='material-icons'></i>"
widget-dateImage="solid-display-div"
- value-dateImage="<i class='material-icons'>update</i>"
+ value-dateImage="<i class='material-icons'></i>"
widget-image="solid-display-img"
widget-endDate="solid-display-date"
- search-fields="tags"
- multiple-tags
-
widget-tags="etuc-display-votetags"
widget-shortDescription="solid-display-div"
@@ -143,11 +148,11 @@ export class SolidPoll extends SolidTemplateElement {
widget-hostingOrganisation="solid-display-div"
widget-orgImage="solid-display-div"
- value-orgImage="<i class='material-icons'>language</i>"
+ value-orgImage="<i class='material-icons'></i>"
widget-endDate="solid-display-date"
widget-dateImage="solid-display-div"
- value-dateImage="<i class='material-icons'>update</i>"
+ value-dateImage="<i class='material-icons'></i>"
>
</solid-display>
@@ -242,7 +247,7 @@ export class SolidPoll extends SolidTemplateElement {
</div>
</section>
<div class="poll-footer">
- <sib-link next="pollListing" class="back-to-list">back to survey list</sib-link>
+ <solid-link next="pollListing" class="back-to-list">back to survey list</solid-link>
<div class="share-poll">
<p>Share</p>
</div>
@@ -267,7 +272,7 @@ export class SolidPoll extends SolidTemplateElement {
widget-title="solid-form-label-text"
label-title="Survey title*"
- widget-titleNote="sib-display-div"
+ widget-titleNote="solid-display-div"
value-titleNote="Be clear on your survey title to helps users understand what is it about"
class-titleNote="form-tips"
--
GitLab