Skip to content
Snippets Groups Projects
Commit caf0f2db authored by Bastien DUMONT's avatar Bastien DUMONT :angel:
Browse files

Merge branch 'v3-update-colors' into 'dev' 

chore:(ui): update colors

See merge request !609
parents 2577e53b e48fa01f
No related branches found
No related tags found
3 merge requests!635V2.5.0,!622V2.5.0,!609chore:(ui): update colors
Hide whitespace changes
Inline Side-by-side
Showing
with 34 additions and 34 deletions
src/app/annuaire/result-list/result-list.component.scss
+ 3
− 3
View file @ caf0f2db
......@@ -102,16 +102,16 @@
height: 75px;
}
&:hover {
background: $grey-8;
background: $grey-9;
}
&:not(:last-child) {
border-bottom: solid 1px $grey-8;
border-bottom: solid 1px $grey-9;
}
.avatar-container {
width: 40px;
height: 44px;
border-radius: 4px;
background: $grey-8;
background: $grey-9;
}
.identity {
max-width: 330px;
......
src/app/carto/carto.component.scss
+ 1
− 1
View file @ caf0f2db
......@@ -31,7 +31,7 @@
width: 600px;
min-width: 600px;
overflow-y: auto;
border-right: 1px solid $grey-4;
border-right: 1px solid $grey-5;
@media #{$tablet} {
width: 100%;
min-width: unset;
......
src/app/form/form-view/profile-form/profile-employer-selection/profile-employer-selection.component.scss
+ 1
− 1
View file @ caf0f2db
......@@ -43,7 +43,7 @@
.filet {
border-width: 0px 0px 1px 0px;
border-style: solid;
border-color: $grey-8;
border-color: $grey-9;
}
.form-list {
......
src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.scss
+ 3
− 3
View file @ caf0f2db
......@@ -58,7 +58,7 @@ h2 {
.filet {
border-width: 0px 0px 1px 0px;
border-style: solid;
border-color: $grey-8;
border-color: $grey-9;
}
.form-list {
......@@ -83,8 +83,8 @@ h2 {
}
&.already-selected {
background: $grey-8;
border-color: $grey-8;
background: $grey-9;
border-color: $grey-9;
.sticker {
@include lato-regular-10;
......
src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.scss
+ 1
− 1
View file @ caf0f2db
......@@ -25,7 +25,7 @@
svg {
width: 32px;
height: 32px;
background-color: $grey-8;
background-color: $grey-9;
border-radius: 50%;
cursor: pointer;
&.hide.disabled {
......
src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.scss
+ 2
− 2
View file @ caf0f2db
......@@ -12,7 +12,7 @@
}
&.notCollapsed {
margin-bottom: 8px;
background: $grey-8;
background: $grey-9;
.logo {
.hide {
display: none;
......@@ -118,7 +118,7 @@
border-radius: 4px 0 0 4px;
border-right: 0;
padding-left: 16px;
background: $grey-8;
background: $grey-9;
}
}
.titleCollapse {
......
src/app/form/orientation-form-view/global-components/multi-radio-form/multi-radio-form.component.scss
+ 1
− 1
View file @ caf0f2db
......@@ -7,7 +7,7 @@
align-items: center;
gap: 1rem;
height: 85px;
background-color: $grey-8;
background-color: $grey-9;
border: solid 3px transparent;
font-size: 1rem;
padding: 1.5rem 1rem;
......
src/app/form/orientation-form-view/global-components/orientation-recap/orientation-recap.component.scss
+ 2
− 2
View file @ caf0f2db
......@@ -52,7 +52,7 @@
.title {
@include lato-bold-18;
padding-bottom: 1em;
border-bottom: 1px solid $grey-7;
border-bottom: 1px solid $grey-8;
}
h3 {
@include lato-bold-14;
......@@ -63,7 +63,7 @@
}
.header {
background-color: $grey-7;
background-color: $grey-8;
padding: 1rem 1.5rem;
.content {
......
src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.scss
+ 2
− 2
View file @ caf0f2db
......@@ -11,7 +11,7 @@
@include lato-regular-13;
}
&.border {
border: solid 2px $grey-8;
border: solid 2px $grey-9;
}
.structure-item {
cursor: pointer;
......@@ -21,7 +21,7 @@
align-items: center;
justify-content: space-between;
border: solid 2px transparent;
border-top-color: $grey-8;
border-top-color: $grey-9;
&:hover {
.name {
......
src/app/header/header.component.scss
+ 1
− 1
View file @ caf0f2db
......@@ -190,7 +190,7 @@ a {
flex-shrink: 0;
width: 40px;
height: 44px;
background: $grey-8;
background: $grey-9;
border-radius: 4px;
}
.name {
......
src/app/post/components/post-header/post-header.component.scss
+ 1
− 1
View file @ caf0f2db
......@@ -42,7 +42,7 @@ h1 {
background: $white;
height: 40px;
width: 210px;
border: 1px solid $grey-4;
border: 1px solid $grey-5;
padding: 3px 16px 3px 16px;
outline: none;
border-radius: 4px;
......
src/app/post/components/post-modal-filters/post-modal-filters.component.scss
+ 2
− 2
View file @ caf0f2db
......@@ -34,7 +34,7 @@
padding: 0;
}
@include background-hash($grey-2);
border: 1px solid $grey-4;
border: 1px solid $grey-5;
.body-wrap {
@media #{$large-phone} {
height: 100vh;
......@@ -63,7 +63,7 @@
width: 100%;
margin: 0 32px;
padding: 40px 0;
border-bottom: 1px dashed $grey-4;
border-bottom: 1px dashed $grey-5;
&:last-child {
padding-bottom: 32px;
......
src/app/profile/edit/edit.component.scss
+ 2
− 2
View file @ caf0f2db
......@@ -73,7 +73,7 @@
justify-content: flex-start;
overflow-x: auto;
white-space: nowrap;
border-bottom: 1px solid $grey-4;
border-bottom: 1px solid $grey-5;
&::-webkit-scrollbar {
height: 8px;
......@@ -155,7 +155,7 @@
gap: 24px;
justify-content: center;
flex-wrap: wrap;
border-top: 1px solid $grey-4;
border-top: 1px solid $grey-5;
//To fit border to parent div
margin: 0 -40px;
@media #{$tablet} {
......
src/app/profile/personal-offer-edition/personal-offer-edition.component.scss
+ 2
− 2
View file @ caf0f2db
......@@ -78,7 +78,7 @@
overflow-x: auto;
white-space: nowrap;
border-bottom: 1px solid $grey-4;
border-bottom: 1px solid $grey-5;
&::-webkit-scrollbar {
height: 8px;
......@@ -111,7 +111,7 @@
gap: 24px;
justify-content: center;
flex-wrap: wrap;
border-top: 1px solid $grey-4;
border-top: 1px solid $grey-5;
//To fit border to parent div
margin: 0 -40px;
@media #{$tablet} {
......
src/app/profile/profile-structure/personal-offer/personal-offer.component.scss
+ 2
− 2
View file @ caf0f2db
......@@ -37,7 +37,7 @@
}
}
.collapseContent {
background-color: $grey-7;
background-color: $grey-8;
border-radius: 8px;
ul {
margin: 0;
......@@ -50,7 +50,7 @@
}
}
&:not(:last-child) {
border-bottom: 1px solid $grey-8;
border-bottom: 1px solid $grey-9;
}
}
}
......
src/app/profile/profile-structure/profile-structure-member/profile-structure-member.component.scss
+ 1
− 1
View file @ caf0f2db
......@@ -12,7 +12,7 @@
.avatar {
display: flex;
align-items: center;
background-color: $grey-8;
background-color: $grey-9;
border-radius: 4px;
}
......
src/app/profile/profile-structure/profile-structure.component.scss
+ 2
− 2
View file @ caf0f2db
......@@ -10,8 +10,8 @@
overflow: hidden;
transition: all 0.3s;
&.fold {
background-color: $grey-8;
border: 1px solid $grey-8;
background-color: $grey-9;
border: 1px solid $grey-9;
}
&.pending {
border: 1px solid $orange-warning;
......
src/app/profile/profile.component.scss
+ 1
− 1
View file @ caf0f2db
......@@ -61,7 +61,7 @@ section {
.avatar {
height: 112px;
width: 112px;
background: $grey-8;
background: $grey-9;
border-radius: 8px;
margin-right: 16px;
@media #{$tablet} {
......
src/app/profile/structure-edition-summary/structure-edition-summary.component.scss
+ 3
− 3
View file @ caf0f2db
......@@ -107,7 +107,7 @@
width: 95% !important;
}
&.notCollapsed {
border-bottom: 2px solid $grey-8;
border-bottom: 2px solid $grey-9;
.logo {
.hide {
display: none;
......@@ -147,7 +147,7 @@
.detailsContainer {
margin: 8px 0px;
padding: 8px 0;
background-color: $grey-8;
background-color: $grey-9;
overflow: hidden;
border-radius: 4px;
}
......@@ -160,7 +160,7 @@
}
}
.footer {
border-top: 1px solid $grey-4;
border-top: 1px solid $grey-5;
p.warning {
color: $orange-warning;
margin: 1rem;
......
src/app/profile/structure-members-management/structure-members-management.component.scss
+ 1
− 1
View file @ caf0f2db
......@@ -50,7 +50,7 @@
gap: 8px;
.avatar {
background-color: $grey-8;
background-color: $grey-9;
border-radius: 4px;
}
.info-member {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment