update: uniformisation events/resources

This commit is contained in:
Marjolaine Le Bon 2020-08-19 18:23:18 +02:00
parent 55b23ee8b2
commit eb07bebdd1
5 changed files with 847 additions and 912 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,304 +1,256 @@
#main__menu { #main__menu {
background-color: var(--color-menu-background); background-color: var(--color-menu-background);
color: var(--color-menu-text); color: var(--color-menu-text);
/*transition: flex-basis 0.5s ease-in-out;*/ /*transition: flex-basis 0.5s ease-in-out;*/
&.open {
&.open { transform: translateX(0);
transform: translateX(0);
}
.unread {
font-weight: bolder;
}
solid-router {
.menu-wrapper {
&.is-closed {
.sub-menu {
display: none;
}
.menu-chevron {
transform: rotate(180deg);
}
}
} }
.unread {
solid-link { font-weight: bolder;
width: 100%;
} }
solid-router {
.menu { .menu-wrapper {
cursor: pointer; &.is-closed {
display: flex; .sub-menu {
flex-direction: row-reverse; display: none;
font-weight: bold; }
padding: 1.2rem; .menu-chevron {
transform: rotate(180deg);
&[active] { }
background-color: var(--color-menu-highlight-primary);
.menu-icon:before {
background-color: var(--color-menu-icon-background-active);
}
.menu-notification>solid-display>div:first-child {
background-color: var(--color-menu-badge-background);
}
}
&[name="resources"][active] .menu-icon:before,
&[name="polls"][active] .menu-icon:before,
&[name="events"][active] .menu-icon:before {
background-color: transparent;
}
.menu-icon {
align-items: center;
display: flex;
justify-content: center;
flex-grow: 0;
flex-shrink: 0;
font-size: 1.7rem;
width: 3.2em;
&:before {
border-radius: 100%;
height: 1.9em;
line-height: 1.9em;
width: 1.9em;
}
}
.menu-label {
display: flex;
flex-direction: column;
flex-grow: 1;
flex-shrink: 0;
font-weight: 600;
justify-content: center;
letter-spacing: 0.017rem;
text-transform: uppercase;
width: 8em;
}
.menu-chevron {
align-items: center;
display: flex;
flex-grow: 0;
flex-shrink: 0;
justify-content: center;
width: 2em;
}
>solid-display {
display: block;
}
&[name="events"], &[name="resources"] {
.menu-label {
width: 9.9em;
}
}
}
.sub-menu {
/* Ellipsis for project tab */
.project-tab>div>solid-display>div:nth-child(1) {
solid-set-default[name='project'] {
flex: 3;
.project-customer,
.project-name {
box-sizing: border-box;
display: block;
width: calc(80vw - 96px); /*96px = padding of the element + width and margin of counter */
@include breakpoint(lg) {
width: 150px;
} }
}
.project-customer,
.project-name>div {
@include breakpoint(lg) {
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
} }
} solid-link {
width: 100%;
/* Ellipsis for circle tab */
.circle-tab>div>solid-display>div {
solid-display-div[name='name'] {
flex: 3;
>div[name='name'] {
box-sizing: border-box;
padding-left: 0.2em;
width: calc(80vw - 96px); /*96px = padding of the element + width and margin of counter */
@include breakpoint(lg) {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 150px;
}
}
} }
} .menu {
/* Ellipsis for message tab */
.message-tab>div>solid-display>div>solid-display-div>div {
box-sizing: border-box;
width: calc(80vw - 96px); /*96px = padding of the element + width and margin of counter */
@include breakpoint(lg) {
width: 150px;
}
}
solid-display.nosub>solid-form[fields="name"]>hubl-search-users>input {
margin-left: 30px;
margin-bottom: 10px;
width: calc(80vw - 71px);
display: block;
background-color: var(--color-secondary);
color: var(--color-grey-6);
border: 1px solid var(--color-grey-4);
border-radius: 3px;
padding: 4px;
@include breakpoint(lg) {
margin: auto;
margin-bottom: 10px;
width: auto;
}
}
solid-display.nosub>nav {
text-align: center;
overflow: hidden;
display: grid;
grid-template-columns: auto 50% auto;
grid-template-areas: "left middle right";
>* {
color: var(--color-grey-6);
}
>[data-id="prev"] {
grid-area: left;
}
>[data-id="next"] {
grid-area: right;
}
>span {
grid-area: middle;
}
}
hubl-menu-publicprivate {
display: inline-block;
text-align: center;
div {
font-family: simple-line-icons;
width: 20px;
font-size: 0.8em;
padding-top: 0.1em;
}
}
>solid-display.nosub>div>solid-display>div {
padding: 1rem 1rem 1rem 3rem;
}
solid-display>div {
.create {
color: var(--color-white);
margin: 1rem 1rem 2.2rem 3.2rem;
}
&>solid-display {
&:last-child>div {
margin-bottom: 2.2rem;
}
>div {
color: var(--color-grey-6);
cursor: pointer; cursor: pointer;
display: flex;
>hubl-menu-fix-url-circle>solid-display>div, flex-direction: row-reverse;
>hubl-menu-fix-url-project>solid-display>div { font-weight: bold;
padding: 1rem 1rem 1rem 3rem; padding: 1.2rem;
&[active] {
background-color: var(--color-menu-highlight-primary);
.menu-icon:before {
background-color: var(--color-menu-icon-background-active);
}
.menu-notification>solid-display>div:first-child {
background-color: var(--color-menu-badge-background);
}
}
&[name="resources"][active] .menu-icon:before,
&[name="polls"][active] .menu-icon:before,
&[name="events"][active] .menu-icon:before {
background-color: transparent;
}
.menu-icon {
align-items: center;
display: flex;
justify-content: center;
flex-grow: 0;
flex-shrink: 0;
font-size: 1.7rem;
width: 3.2em;
&:before {
border-radius: 100%;
height: 1.9em;
line-height: 1.9em;
width: 1.9em;
}
}
.menu-label {
display: flex;
flex-direction: column;
flex-grow: 1;
flex-shrink: 0;
font-weight: 600;
justify-content: center;
letter-spacing: 0.017rem;
text-transform: uppercase;
width: 8em;
}
.menu-chevron {
align-items: center;
display: flex;
flex-grow: 0;
flex-shrink: 0;
justify-content: center;
width: 2em;
}
>solid-display {
display: block;
}
&[name="events"],
&[name="resources"],
&[name="polls"] {
.menu-label {
width: 9.9em;
}
} }
}
&[fields="project(customer.name, name), badge"]>div {
padding: 0;
}
} }
.sub-menu {
&>solid-display[active]>div, /* Ellipsis for project tab */
&>solid-display>div>hubl-menu-fix-url-circle>solid-display[active]>div, .project-tab>div>solid-display>div:nth-child(1) {
&>solid-display>div>hubl-menu-fix-url-project>solid-display[active]>div { solid-set-default[name='project'] {
background-color: var(--color-menu-highlight-primary); flex: 3;
color: var(--color-menu-text-active); .project-customer,
font-weight: bold; .project-name {
box-sizing: border-box;
display: block;
width: calc(80vw - 96px);
/*96px = padding of the element + width and margin of counter */
@include breakpoint(lg) {
width: 150px;
}
}
.project-customer,
.project-name>div {
@include breakpoint(lg) {
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
}
}
/* Ellipsis for circle tab */
.circle-tab>div>solid-display>div {
solid-display-div[name='name'] {
flex: 3;
>div[name='name'] {
box-sizing: border-box;
padding-left: 0.2em;
width: calc(80vw - 96px);
/*96px = padding of the element + width and margin of counter */
@include breakpoint(lg) {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 150px;
}
}
}
}
/* Ellipsis for message tab */
.message-tab>div>solid-display>div>solid-display-div>div {
box-sizing: border-box;
width: calc(80vw - 96px);
/*96px = padding of the element + width and margin of counter */
@include breakpoint(lg) {
width: 150px;
}
}
solid-display.nosub>solid-form[fields="name"]>hubl-search-users>input {
margin-left: 30px;
margin-bottom: 10px;
width: calc(80vw - 71px);
display: block;
background-color: var(--color-secondary);
color: var(--color-grey-6);
border: 1px solid var(--color-grey-4);
border-radius: 3px;
padding: 4px;
@include breakpoint(lg) {
margin: auto;
margin-bottom: 10px;
width: auto;
}
}
solid-display.nosub>nav {
text-align: center;
overflow: hidden;
display: grid;
grid-template-columns: auto 50% auto;
grid-template-areas: "left middle right";
>* {
color: var(--color-grey-6);
}
>[data-id="prev"] {
grid-area: left;
}
>[data-id="next"] {
grid-area: right;
}
>span {
grid-area: middle;
}
}
hubl-menu-publicprivate {
display: inline-block;
text-align: center;
div {
font-family: simple-line-icons;
width: 20px;
font-size: 0.8em;
padding-top: 0.1em;
}
}
>solid-display.nosub>div>solid-display>div {
padding: 1rem 1rem 1rem 3rem;
}
solid-display>div {
.create {
color: var(--color-white);
margin: 1rem 1rem 2.2rem 3.2rem;
}
&>solid-display {
&:last-child>div {
margin-bottom: 2.2rem;
}
>div {
color: var(--color-grey-6);
cursor: pointer;
>hubl-menu-fix-url-circle>solid-display>div,
>hubl-menu-fix-url-project>solid-display>div {
padding: 1rem 1rem 1rem 3rem;
}
}
&[fields="project(customer.name, name), badge"]>div {
padding: 0;
}
}
&>solid-display[active]>div,
&>solid-display>div>hubl-menu-fix-url-circle>solid-display[active]>div,
&>solid-display>div>hubl-menu-fix-url-project>solid-display[active]>div {
background-color: var(--color-menu-highlight-primary);
color: var(--color-menu-text-active);
font-weight: bold;
}
}
&.menu-notification {
>solid-display>div>solid-display>div>hubl-menu-fix-url-circle,
>solid-display>div>solid-display>div>hubl-menu-fix-url-project {
flex: 1;
}
>solid-display>div>solid-display>div,
>solid-display>div>solid-display>div>hubl-menu-fix-url-circle>solid-display>div,
>solid-display>div>solid-display>div>hubl-menu-fix-url-project>solid-display>div {
display: flex;
justify-content: space-between;
}
hubl-counter {
height: 20px;
width: 20px;
margin-right: 1em;
div.counter:not([data-nb-unread="0"]) {
text-align: center;
display: block;
background-color: var(--sib-notifications-theme, gray);
border-radius: 50%;
font-size: 12px;
line-height: 20px;
width: 20px;
height: 20px;
padding-bottom: 0;
color: var(--color-secondary);
}
}
}
} }
} .divider {
height: 1px;
&.menu-notification { background-color: var(--color-grey-11);
opacity: 0.2;
>solid-display>div>solid-display>div>hubl-menu-fix-url-circle,
>solid-display>div>solid-display>div>hubl-menu-fix-url-project {
flex: 1;
} }
>solid-display>div>solid-display>div,
>solid-display>div>solid-display>div>hubl-menu-fix-url-circle>solid-display>div,
>solid-display>div>solid-display>div>hubl-menu-fix-url-project>solid-display>div {
display: flex;
justify-content: space-between;
}
hubl-counter {
height: 20px;
width: 20px;
margin-right: 1em;
div.counter:not([data-nb-unread="0"]) {
text-align: center;
display: block;
background-color: var(--sib-notifications-theme, gray);
border-radius: 50%;
font-size: 12px;
line-height: 20px;
width: 20px;
height: 20px;
padding-bottom: 0;
color: var(--color-secondary);
}
}
}
} }
.divider {
height: 1px;
background-color: var(--color-grey-11);
opacity: 0.2;
}
}
} }

View File

@ -1,4 +1,5 @@
#events, #circle-events { #events,
#circle-events {
width: 100%; width: 100%;
font-family: "Facit"; font-family: "Facit";
font-weight: 400; font-weight: 400;
@ -16,12 +17,13 @@
.event-place-name { .event-place-name {
font-weight: 700; font-weight: 700;
} }
#listevents, #circle-listevents { #listevents,
#circle-listevents {
[name="name"], [name="name"],
solid-display-link-event .mdi::before { solid-display-link-event .mdi::before {
color: #C4262E; color: #C4262E;
}
} }
}
.event-place-name, .event-place-name,
.nextevent-startdate, .nextevent-startdate,
solid-display-link-event { solid-display-link-event {
@ -39,14 +41,14 @@
} }
#listevents, #listevents,
#circle-listevents { #circle-listevents {
.newtype .button{ .newtype .button {
font-size: 1.2rem; font-size: 1.2rem;
width: max-content; width: max-content;
height: max-content; height: max-content;
padding: 5px 20px; padding: 5px 20px;
color: #063B5C; color: #063B5C;
} }
solid-form solid-form-dropdown{ sib-form sib-form-dropdown {
label div { label div {
height: 2.5rem; height: 2.5rem;
} }
@ -80,15 +82,26 @@
} }
} }
#eventdetail { #eventdetail {
.mdi::before {
margin: 0 5px 0 20px;
}
[name="infotext"] {
text-align: left;
}
[name="name"] { [name="name"] {
font-family: "RefrigeratorDelxW01Bold"; font-family: "RefrigeratorDelxW01Bold";
font-size: 3.2rem; font-size: 3.2rem;
line-height: 3.8rem; line-height: 3.8rem;
}
color: #063B5C; color: #063B5C;
solid-display div .event-type { }
color: #063B5C;
.event-type {
width: max-content; width: max-content;
padding: 5px 20px; padding: 5px 20px;
font-size: 1.1rem;
line-height: 1.3rem;
height: 13px;
margin: 10px 20px;
} }
[name="longDescription"] p { [name="longDescription"] p {
font-size: 1.6rem; font-size: 1.6rem;
@ -111,7 +124,8 @@
} }
} }
} }
.with-sidebar nav > solid-router > ul [name="circle-events"]{
.with-sidebar nav>solid-router>ul [name="circle-events"] {
li::before { li::before {
content: ''; content: '';
height: 40px; height: 40px;

View File

@ -1,52 +1,58 @@
#polls{ #polls {
h2{ h2 {
text-transform: inherit; text-transform: inherit;
} }
/*style of poll listing*/ /*style of poll listing*/
#pollListing{ #pollListing {
width: 90%; width: 90%;
margin: auto; margin: auto;
.all-polls{ .headline h2 {
/*make 3 polls per line*/ font-family: "RefrigeratorDelxW01Bold";
div:first-of-type{ font-size: 2.4rem;
solid-display{ line-height: 3.8rem;
width: 330px; color: #063B5C;
>div:first-of-type{ }
*[name="body"]{ .all-polls {
/*size of tags of poll card*/ /*make 3 polls per line*/
etuc-display-votetags{ div:first-of-type {
>div{ solid-display {
width: 64px; width: 330px;
height: 24px; >div:first-of-type {
p{ *[name="body"] {
font-size: 11px; /*size of tags of poll card*/
} etuc-display-votetags {
>div {
width: 64px;
height: 24px;
p {
font-size: 11px;
}
}
}
}
}
} }
}
} }
}
} }
}
} }
} /*personnalise css on poll page*/
/*personnalise css on poll page*/ #pollPage {
#pollPage{ width: 85%;
width: 85%; margin: auto;
margin: auto; solid-display.topline {
solid-display.topline{ >div:first-of-type {
>div:first-of-type{ *[name="right"] {
*[name="right"]{ etuc-display-votetags {
etuc-display-votetags{ >div {
>div{ width: 64px;
width: 64px; height: 24px;
height: 24px; p {
p{ font-size: 11px;
font-size: 11px; }
} }
}
}
} }
}
} }
}
} }
}
} }

View File

@ -1,8 +1,8 @@
#resources{ #resources {
width: 100%; width: 100%;
font-family: "Facit"; font-family: "Facit";
font-weight: 400; font-weight: 400;
color: #3A3A3A; color: #7A7F85;
solid-resource { solid-resource {
background-color: #F0F3F6; background-color: #F0F3F6;
.sib-resource { .sib-resource {
@ -23,9 +23,31 @@
.lnk-newresource { .lnk-newresource {
margin-top: 30px; margin-top: 30px;
margin-right: 70px; margin-right: 70px;
z-index: 1;
position: relative;
} }
.resources sib-form::before { #listresources .lnk-newkeyword {
font-family: "RefrigeratorDelxW01Bold"; top: 133px;
left: 220px;
.button.thin-button.mdi {
padding: 5px 20px;
}
}
.resources {
margin-top: -35px;
sib-form {
&::before {
content: "Research a resource";
font-family: "RefrigeratorDelxW01Bold";
color: #063B5C;
font-size: 2.4rem;
line-height: 3.8rem;
top: -10px;
}
select {
width: 150px;
}
}
} }
#listresources { #listresources {
.lnk-newkeyword .button { .lnk-newkeyword .button {
@ -49,6 +71,30 @@
} }
} }
} }
#resourcedetail {
[name="name"] {
font-family: "RefrigeratorDelxW01Bold";
font-size: 3.2rem;
line-height: 3.8rem;
color: #063B5C;
}
[name="infotext"] {
justify-content: flex-start;
}
.event-type {
width: max-content;
padding: 5px 20px;
font-size: 1.1rem;
line-height: 1.3rem;
height: 13px;
margin: 0 20px 10px;
background-color: #C4262E;
color: white;
font-weight: 700;
text-transform: uppercase;
border-radius: 15px;
}
}
.resource-tag { .resource-tag {
font-family: Facilt; font-family: Facilt;
font-weight: 600; font-weight: 600;
@ -61,7 +107,8 @@
} }
} }
} }
.with-sidebar nav > solid-router > ul [name="circle-resources"]{
.with-sidebar nav>solid-router>ul [name="circle-resources"] {
li::before { li::before {
content: ''; content: '';
height: 40px; height: 40px;