Skip to content

Commit

Permalink
Merge pull request #394 from epfl-idevelop/bug-fix/bugfix_ak_260619
Browse files Browse the repository at this point in the history
Corrections de bugs
  • Loading branch information
jdelasoie authored Jul 3, 2019
2 parents e3c02a4 + cc33234 commit b486fa4
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 13 deletions.
3 changes: 3 additions & 0 deletions assets/components/base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
@import '../config/wordpress';
@import '../../node_modules/tablesaw/src/tables.stack-mixin.scss';

// site:
@import './site.scss';

// Don't edit the following sections, they should always be preceded by a blank
// line and have exactly those names for the `$ yo toolbox:generate` command
// to work
Expand Down
10 changes: 0 additions & 10 deletions assets/components/molecules/search/search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,3 @@
}
}
}

.site {
position: relative;
top: 0;
transition: top .3s ease-in-out;

.search-open & {
top: $mm-lang-height;
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
@charset 'utf-8';

.social-feed-group {
margin-left: -16px;
margin-right: -16px;
padding: 4rem 0;

.social-feed {
padding-left: 0;
padding-right: 0;
}

@include media-breakpoint-up(lg) {
@include media-breakpoint-up(xl) {
display: flex;
flex-flow: row nowrap;
align-items: stretch;
margin: 0;
padding: 2rem 0;

.social-feed-container {
Expand All @@ -19,6 +27,7 @@

.social-feed {
height: 100%;
padding: 2.2rem 1.5rem 1.5rem;
}

&:first-child {
Expand All @@ -33,17 +42,18 @@
}

.social-feed-container {
align-items: center;
display: flex;
flex-flow: column nowrap;

@include media-breakpoint-up(lg) {
@include media-breakpoint-up(xl) {
flex-flow: row nowrap;
}

.social-feed {
margin-bottom: 3rem;

@include media-breakpoint-up(lg) {
@include media-breakpoint-up(xl) {
margin-bottom: 0;
height: 100%;
}
Expand Down
13 changes: 13 additions & 0 deletions assets/components/site.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
body {
overflow-x: hidden;
}

.site {
position: relative;
top: 0;
transition: top .3s ease-in-out;

.search-open & {
top: $mm-lang-height;
}
}

0 comments on commit b486fa4

Please sign in to comment.