Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix gasp between backgrounds of body and sidebar divs #357

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix gasp between backgrounds of body and sidebar divs #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/assets/stylesheets/RonRonnement.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ $PX_MARGE_GAUCHE: 42px;
$PX_MARGE_DROITE: 30px;
$PX_BANDEAU: 7px;
$PX_BRANDING_LARG: 201px;
$PX_BODY_BORDER_WIDTH_LEFT_RIGHT: 1px;
$PX_SITE_PAD_DROIT: 42px;
$PX_CONT_TOP: 34px;

Expand Down
16 changes: 6 additions & 10 deletions app/assets/stylesheets/contrib/RonRonnement-Classic.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ $PX_MARGE_GAUCHE: 42px;
$PX_MARGE_DROITE: 30px;
$PX_BANDEAU: 7px;
$PX_BRANDING_LARG: 201px;
$PX_BODY_BORDER_WIDTH_LEFT_RIGHT: 1px;
$PX_SITE_PAD_DROIT: 42px;
$PX_CONT_TOP: 34px;

Expand Down Expand Up @@ -88,15 +89,11 @@ body {
max-width: 150ex;
margin: 0 auto;
border: solid $C_BORDER_FONCE;
border-width: 0 1px;
background: linear-gradient(
90deg,
$C_CLAIR,
$C_CLAIR $PX_BRANDING_LARG,
$C_CONTAINER $PX_BRANDING_LARG,
$C_CONTAINER
)
#fff;
border-width: 0 $PX_BODY_BORDER_WIDTH_LEFT_RIGHT;
background-repeat: no-repeat;
background-size: $PX_BRANDING_LARG + $PX_BODY_BORDER_WIDTH_LEFT_RIGHT, auto;
background-position: 0, $PX_BRANDING_LARG + $PX_BODY_BORDER_WIDTH_LEFT_RIGHT;
background-image: linear-gradient($C_CLAIR, $C_CLAIR), linear-gradient($C_CONTAINER, $C_CONTAINER);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well if you use two gradients why not just use two plain colours?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

background-image CSS rule requires an image, so we can't use directly plain colours. The hack is to use linear-gradiant to create an image with just the plain color.

Due to the usage of background-image, I had to disable the background-repeat, otherwise only one of the colour is rendered everywhere.

}

a {
Expand Down Expand Up @@ -360,7 +357,6 @@ a.edit_client_app,
width: $PX_BRANDING_LARG;
text-align: left;
font-size: 0.8em;
background: $C_CLAIR;

a {
font-weight: inherit;
Expand Down
6 changes: 3 additions & 3 deletions app/assets/stylesheets/contrib/RonRonnement-Sepia.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ $PX_MARGE_DROITE: 30px;
$PX_TOP: 16px;
$PX_BANDEAU: 7px;
$PX_BRANDING_LARG: 201px;
$PX_BODY_BORDER_WIDTH_LEFT_RIGHT: 1px;
$PX_BRANDING_HEIGHT: 186px;
$PX_SITE_PAD_DROIT: 42px;
$PX_CONT_TOP: 34px;
Expand Down Expand Up @@ -85,8 +86,8 @@ body {
margin-top: 0;
margin-bottom: 0;
padding-top: $PX_TOP;
border-left: 1px #333 solid;
border-right: 1px #333 solid;
border-left: $PX_BODY_BORDER_WIDTH_LEFT_RIGHT #333 solid;
border-right: $PX_BODY_BORDER_WIDTH_LEFT_RIGHT #333 solid;
background: #fff;
}

Expand Down Expand Up @@ -285,7 +286,6 @@ input[type="submit"] {
width: $PX_BRANDING_LARG;
text-align: left;
font-size: small;
background: $C_CLAIR;

a {
font-weight: inherit;
Expand Down
14 changes: 5 additions & 9 deletions app/assets/stylesheets/parts/a_tag.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,11 @@ body {
max-width: $BODY_MAX_WIDTH;
margin: 0 auto;
border: solid #999;
border-width: 0 1px;
background: linear-gradient(
90deg,
$C_CLAIR,
$C_CLAIR $PX_BRANDING_LARG,
$C_CONTAINER $PX_BRANDING_LARG,
$C_CONTAINER
)
#fff;
border-width: 0 $PX_BODY_BORDER_WIDTH_LEFT_RIGHT;
background-repeat: no-repeat;
background-size: $PX_BRANDING_LARG + $PX_BODY_BORDER_WIDTH_LEFT_RIGHT, auto;
background-position: 0, $PX_BRANDING_LARG + $PX_BODY_BORDER_WIDTH_LEFT_RIGHT;
background-image: linear-gradient($C_CLAIR, $C_CLAIR), linear-gradient($C_CONTAINER, $C_CONTAINER);
}

a {
Expand Down
1 change: 0 additions & 1 deletion app/assets/stylesheets/parts/sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
text-align: left;
font-size: 0.8em;
line-height: 1.3;
background: $C_CLAIR;

a {
font-weight: inherit;
Expand Down