1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-26 20:54:21 +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 - Enlarged privacy policy display and edition zones
- Removed fab-manager email address from the seeds - 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: 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 - Updated stripe gem to 5.21.0
- [TODO DEPLOY] `rails fablab:stripe:plans_prices` - [TODO DEPLOY] `rails fablab:stripe:plans_prices`

View File

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