1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-29 10:24:20 +01:00

Merge branch 'dev' into monthly-payment

This commit is contained in:
Sylvain 2020-10-28 08:54:09 +01:00
commit 85a1cc99cf
2 changed files with 8 additions and 17 deletions

View File

@ -5,6 +5,7 @@
- Enlarged privacy policy display and edition zones
- Removed fab-manager email address from the seeds
- Fix a bug: in the settings area, boolean switches are always shown as false
- Fix a bug: public cards presenting the plans in the public area, have bogus style
- Updated stripe gem to 5.21.0
- [TODO DEPLOY] `rails fablab:stripe:plans_prices`

View File

@ -37,7 +37,7 @@
.fa {
// color: $red;
}
.widget-content {
@ -73,7 +73,7 @@
text-align: center;
//color: $red;
}
}
@ -297,12 +297,9 @@
display: inline-block;
background: white;
@include border-radius(50%);
@include border-radius(50%, 50%, 50%, 50%);
border: 3px solid;
// $yellow;
}
.price {
@ -313,7 +310,7 @@
width: 84px;
background-color: black;
@include border-radius(50%);
@include border-radius(50%, 50%, 50%, 50%);
.amount {
padding-top: 16px;
@ -343,18 +340,13 @@
background-color: white;
padding-left: 30px;
padding-right: 30px;
//&:hover { background-color: $yellow; }
}
}
}
.well {
&.well-warning {
//border-color: #ffdc4e;
//background-color: #ffdc4e;
@include border-radius(3px);
@include border-radius(3px, 3px, 3px, 3px);
padding: 5px 10px;
}
@ -449,8 +441,6 @@
.block-link {
cursor: pointer;
//&:hover { background-color: $yellow; }
}
.form-control .ui-select-choices, .form-control .ui-select-match {
@ -460,7 +450,7 @@
.about-link {
.label {
font-size: rem-calc(26);
padding: 0px 10px 0px 11px;
padding: 0 10px 0 11px;
vertical-align: bottom;
&.label-icon {
@ -495,7 +485,7 @@
font-weight: 900;
//black
}
.about-title-aside {