Skip to content

Commit

Permalink
Color Configuration for Cookie Banner (bigbluebutton#1302)
Browse files Browse the repository at this point in the history
* Color Configuration for Cookie Banner

Right now, the colors of the cookie banner are hard-coded which can
easily clash with the configured site colors in site settings.

This patch switches to using the configured colors instead.

* Update application.scss

Co-authored-by: Ahmad Farhat <[email protected]>
Co-authored-by: Jesus Federico <[email protected]>
  • Loading branch information
3 people authored Apr 16, 2020
1 parent 7738499 commit 311806f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 1 addition & 3 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,7 @@ a {
.cookies-banner {
color: white;
background-color: $button-color-blue;

#cookies-agree-button {
background-color: green !important;
margin: 0;
}
}
Expand Down Expand Up @@ -180,4 +178,4 @@ table {

#delete-confirm:disabled {
cursor: not-allowed;
}
}
4 changes: 2 additions & 2 deletions app/views/shared/components/_cookie_warning.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
%>

<% if cookies && cookies['cookie_consented'] != 'true' %>
<div class="cookies-banner fixed-bottom text-center d-inline-block">
<div class="primary-lighten cookies-banner fixed-bottom text-center d-inline-block">
<div class="cookies-banner-content py-3">
<span class="cookies-warning-text pr-5">
<%= t("cookies.cookie_info") %>
</span>
<span class="cookies-warning-button d-inline-block">
<button id="cookies-agree-button" class="btn customBtn bg-primary"><%= t("cookies.cookie_button") %></button>
<button id="cookies-agree-button" class="btn customBtn primary-regular"><%= t("cookies.cookie_button") %></button>
</span>
</div>
</div>
Expand Down

0 comments on commit 311806f

Please sign in to comment.