Skip to content
Snippets Groups Projects
Commit ee2b9cd5 authored by ext.sopra.ncastejon's avatar ext.sopra.ncastejon
Browse files

Merge branch 'development' of...

Merge branch 'development' of forge.grandlyon.com:web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/custom-apps/web-app into development
parents c1a7e251 b6d0fd6e
Branches
Tags
1 merge request!73Development
Pipeline #5312 passed
...@@ -62,9 +62,7 @@ h4 { ...@@ -62,9 +62,7 @@ h4 {
.resource-item { .resource-item {
background-color: white; background-color: white;
padding: 0.5rem; padding-top: 0.5rem;
padding-left: 0;
padding-bottom: 0;
border-radius: 8px; border-radius: 8px;
@media screen and (min-width: $tablet) { @media screen and (min-width: $tablet) {
...@@ -77,17 +75,16 @@ h4 { ...@@ -77,17 +75,16 @@ h4 {
.resource-description { .resource-description {
padding-bottom: 0.5rem; padding-bottom: 0.5rem;
padding-left: 0.5rem;
padding-top: 1rem; @media screen and (max-width: $tablet) {
padding: 1rem 0.7rem 1.5rem 0.7rem;
border-bottom: 1px solid $grey-background-color;
}
span { span {
font-weight: 600; font-weight: 600;
line-height: 1; line-height: 1;
font-size: 1rem; font-size: 1rem;
@media screen and (min-width: $tablet) {
padding-left: 1.5rem;
}
} }
} }
} }
......
...@@ -79,18 +79,10 @@ ...@@ -79,18 +79,10 @@
margin-left: 0.5rem; margin-left: 0.5rem;
position: relative; position: relative;
margin-right: 0.5rem; margin-right: 0.5rem;
height: 3.5rem; height: 2.75rem;
flex-grow: 1; width: 2.75rem;
margin-top: 0.5rem;
border-color: $grey-super-light-color; border-color: $grey-super-light-color;
@media screen and (min-width: $tablet) {
height: 2.75rem;
width: 2.75rem;
margin-top: 0;
flex-grow: 0;
}
svg { svg {
position: absolute; position: absolute;
width: 1.25rem; width: 1.25rem;
...@@ -204,6 +196,14 @@ ...@@ -204,6 +196,14 @@
justify-content: unset; justify-content: unset;
} }
@media screen and (max-width: $tablet) {
.button {
margin-top: 0.5rem;
margin-left: 0;
}
}
.resource-download-icon, .resource-download-icon,
.tooltip { .tooltip {
margin-left: 0; margin-left: 0;
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
.resource { .resource {
background-color: white; background-color: white;
padding: 0.75rem; padding: 0 0.75rem 0.75rem 0.75rem;
padding-left: 1rem; margin-top: 0.75rem;
position: relative; position: relative;
border-left: 2px solid white; border-left: 2px solid white;
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
} }
@media screen and (min-width: $tablet) { @media screen and (min-width: $tablet) {
padding-left: 1.5rem;
margin-right: unset; margin-right: unset;
} }
...@@ -54,7 +53,6 @@ ...@@ -54,7 +53,6 @@
.resource-title { .resource-title {
display: flex; display: flex;
align-items: center; align-items: center;
flex-wrap: wrap;
cursor: pointer; cursor: pointer;
} }
......
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
flex-direction: column; flex-direction: column;
padding: 2rem 1.25rem 1.25rem 1.25rem; padding: 2rem 1.25rem 1.25rem 1.25rem;
max-width: 100vw; max-width: 100vw;
justify-content: center;; justify-content: center;
;
@media screen and (min-width: $tablet) { @media screen and (min-width: $tablet) {
max-width: unset; max-width: unset;
...@@ -71,7 +72,7 @@ ...@@ -71,7 +72,7 @@
margin-bottom: 1.5rem; margin-bottom: 1.5rem;
border-bottom: 2px solid $grey-background-color; border-bottom: 2px solid $grey-background-color;
background-color: white; background-color: white;
padding: 2.5rem; padding: 1.7rem 2rem;
box-shadow: 0 6px 12px 0 rgba(129, 128, 128, 0.1); box-shadow: 0 6px 12px 0 rgba(129, 128, 128, 0.1);
border-radius: 8px; border-radius: 8px;
} }
...@@ -89,7 +90,7 @@ ...@@ -89,7 +90,7 @@
margin-bottom: 1.5rem; margin-bottom: 1.5rem;
border-bottom: 2px solid $grey-background-color; border-bottom: 2px solid $grey-background-color;
background-color: white; background-color: white;
padding: 2.5rem; padding: 1.7rem 2rem;
box-shadow: 0 6px 12px 0 rgba(129, 128, 128, 0.1); box-shadow: 0 6px 12px 0 rgba(129, 128, 128, 0.1);
border-radius: 8px; border-radius: 8px;
...@@ -103,7 +104,6 @@ ...@@ -103,7 +104,6 @@
box-shadow: 0 6px 12px 0 rgba(129, 128, 128, 0.1); box-shadow: 0 6px 12px 0 rgba(129, 128, 128, 0.1);
border-radius: 8px; border-radius: 8px;
align-self: flex-start; align-self: flex-start;
padding: 2.5rem;
margin-left: 1rem; margin-left: 1rem;
} }
} }
...@@ -140,6 +140,7 @@ ...@@ -140,6 +140,7 @@
.resource-static-files { .resource-static-files {
border-bottom: 1px solid #f2f2f2; border-bottom: 1px solid #f2f2f2;
} }
.resource-downloadable-files:last-of-type .resource-download-item-wrapper:last-of-type, .resource-downloadable-files:last-of-type .resource-download-item-wrapper:last-of-type,
.resource-static-files:last-of-type { .resource-static-files:last-of-type {
border-bottom: none; border-bottom: none;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment