Skip to content

Commit

Permalink
Merge pull request #2611 from luisramos0/cookies_banner_font_size
Browse files Browse the repository at this point in the history
[Cookies] Increased cookies banner font size for med/large screens to improve readability
  • Loading branch information
mkllnk authored Sep 4, 2018
2 parents 7dbbc3e + 59f8dd4 commit 0d2fa3d
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 13 deletions.
30 changes: 17 additions & 13 deletions app/assets/stylesheets/darkswarm/cookies_banner.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,9 @@
background: $dark-grey;
bottom: 0;
position: fixed;
top: 20vh !important;
top: 15% !important;
z-index: 100000;

@media only screen and (min-width: 640px) {
top: 20vh !important;
}

@media only screen and (min-width: 800px) and (min-height: 400px) {
top: 40vh !important;
}

@media only screen and (min-width: 1024px) and (min-height: 500px) {
top: 60vh !important;
}

button {
background-color: $clr-turquoise;
}
Expand All @@ -27,4 +15,20 @@
color: $white;
font-size: .75rem;
}

@media only screen and (min-width: 800px) and (min-height: 560px) {
top: 40% !important;

p {
font-size: 1rem;
}
}

@media only screen and (min-width: 1024px) and (min-height: 660px) {
top: 60% !important;

p {
font-size: 1rem;
}
}
}
16 changes: 16 additions & 0 deletions spec/features/consumer/cookies_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

feature "Cookies", js: true do
describe "banner" do

# keeps banner toggle config unchanged
around do |example|
original_banner_toggle = Spree::Config[:cookies_consent_banner_toggle]
example.run
Spree::Config[:cookies_consent_banner_toggle] = original_banner_toggle
end

describe "in the homepage" do
before do
Spree::Config[:cookies_consent_banner_toggle] = true
Expand Down Expand Up @@ -59,6 +67,14 @@
end

describe "policy page" do

# keeps config unchanged
around do |example|
original_config_value = Spree::Config[:cookies_policy_matomo_section]
example.run
Spree::Config[:cookies_policy_matomo_section] = original_config_value
end

scenario "showing session_id cookies description with correct instance domain" do
visit '/#/policies/cookies'
expect(page).to have_content('_session_id')
Expand Down

0 comments on commit 0d2fa3d

Please sign in to comment.