github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-15 23:37:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3630 from overleaf/jel-ui-reconfirm-portal

Browse source 
Show reconfirm notification on the portals

GitOrigin-RevId: 3899edce2699ce7206bc264f9b58bc790d80dd3d
This commit is contained in:
Jessica Lawshe 2021-02-22 09:01:19 -06:00 • committed by Copybot
parent 54c471bc1c
commit 37e3ff4310
4 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/views/_mixins/reconfirm_affiliation.pug
View file

@ -33,6 +33,6 @@ mixin reconfirmAffiliationNotification(location)
mixin reconfirmedAffiliationNotification()
.alert.alert-info
.reconfirm-notification
div
div(style="width:100%;")
//- extra div for flex styling
| !{translate("your_affiliation_is_confirmed", {institutionName: '{{userEmail.affiliation.institution.name}}'}, ['strong'])} #{translate('thank_you')}

11
services/web/frontend/stylesheets/app/content_page.less
View file

@ -15,7 +15,16 @@
}
}
.reset-btns; // reapply btn style to correct color property set on <a> above
// correct color property set on <a> above:
.reset-btns;
.alert {
.alert;
}
.alert-info {
.btn-info {
.btn-alert-info;
}
}
hr {
border-color: @hr-border-alt;

3
services/web/frontend/stylesheets/components/alerts.less
View file

@ -68,7 +68,8 @@
}
.btn-alert-info {
.btn-alert-variant(@alert-info-bg);
.button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);
.alert-btn(@btn-info-bg);
}
.alert-warning {

16
services/web/frontend/stylesheets/core/mixins.less
View file

@ -605,13 +605,24 @@
// -------------------------
// Easily pump out default styles, as well as :hover, :focus, :active,
// and disabled options for all buttons
.alert-btn(@background) {
background-color: darken(@background, 16%);
&:hover,
&:focus,
&:active,
&.active,
&.checked,
.open .dropdown-toggle& {
background-color: darken(@background, 24%);
}
}
.button-variant(@color; @background; @border) {
color: @color;
background-color: @background;
border-color: @border;
.alert & {
background-color: darken(@background, 16%);
.alert-btn(@background);
}
&:hover,
@ -623,9 +634,6 @@
color: @color;
background-color: darken(@background, 8%);
border-color: darken(@border, 12%);
.alert & {
background-color: darken(@background, 24%);
}
}
&:active,
&.active,