Merge pull request #29 from cozy/bootstrap-5.0.2

Update bootstrap to v5.0.2 (and small fixes)
cozy · Jun 28, 2021 · e06987e · e06987e
2 parents ae53cb1 + 096ba8d
commit e06987e
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "@semantic-release/npm": "7.1.3",
     "autoprefixer": "10.2.6",
     "backstopjs": "5.3.2",
-    "bootstrap": "5.0.1",
+    "bootstrap": "5.0.2",
     "browserslist-config-cozy": "0.4.0",
     "clean-css-cli": "5.3.0",
     "nodemon": "2.0.7",

diff --git a/screenshots/reference/docs_Modals_0_document_0_phone.png b/screenshots/reference/docs_Modals_0_document_0_phone.png
diff --git a/screenshots/reference/docs_Modals_0_document_1_desktop.png b/screenshots/reference/docs_Modals_0_document_1_desktop.png
diff --git a/src/cozy-bs.scss b/src/cozy-bs.scss
@@ -15,7 +15,6 @@
 @import "bootstrap/scss/type";
 
 // Components
-@import "cozy/custom";
 @import "cozy/banner";
 @import "cozy/wrapper";
 // @import "bootstrap/scss/images";
@@ -65,6 +64,8 @@ $enable-shadows: false;
 // @import "bootstrap/scss/carousel";
 // @import "bootstrap/scss/spinners";
 
+@import "cozy/custom";
+
 // Helpers
 // @import "bootstrap/scss/helpers";
 @import "bootstrap/scss/helpers/visually-hidden";

diff --git a/src/cozy/_custom.scss b/src/cozy/_custom.scss
@@ -25,6 +25,10 @@
   box-shadow: 0 .25rem .75rem 0 rgba(0, 0, 0, .08);
 }
 
+.modal-dialog {
+  margin-top: 2.75rem;
+}
+
 .modal-icon .icon {
   width: 3.3rem;
   height: 3.3rem;

diff --git a/src/cozy/_validation.scss b/src/cozy/_validation.scss
@@ -37,6 +37,7 @@
 }
 
 .invalid-tooltip .icon {
+  flex-shrink: 0;
   margin: .25rem .375rem .25rem 0;
 }
 

diff --git a/src/cozy/_variables.scss b/src/cozy/_variables.scss
@@ -53,6 +53,9 @@ $form-floating-padding-y-lg: 1.25rem;
 $form-floating-label-transform: scale(.8) translateY(-2rem) translateX(.15rem);
 $form-floating-transition: opacity .2s ease-in-out, transform .2s ease-in-out;
 
+$form-select-padding-x: .75rem;
+$form-select-indicator-padding: 2rem;
+
 $form-feedback-tooltip-font-size: .75rem;
 
 // Buttons
@@ -109,4 +112,5 @@ $spacers: (
   5: $spacer * 2, // <-- add one more level
   6: $spacer * 3,
 );
+$border-radius-lg: .5rem;
 $box-shadow: 0 0 0 .5px rgba(0, 0, 0, .12), 0 .125rem .25rem rgba(0, 0, 0, .08), 0 .25rem 1rem rgba(0, 0, 0, .06);
diff --git a/yarn.lock b/yarn.lock
@@ -1076,10 +1076,10 @@ [email protected]:
     raw-body "2.4.0"
     type-is "~1.6.17"
 
-[email protected].1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.0.1.tgz#e7939d599119dc818a90478a2a299bdaff037e09"
-  integrity sha512-Fl79+wsLOZKoiU345KeEaWD0ik8WKRI5zm0YSPj2oF1Qr+BO7z0fco6GbUtqjoG1h4VI89PeKJnMsMMVQdKKTw==
+[email protected].2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.0.2.tgz#aff23d5e0e03c31255ad437530ee6556e78e728e"
+  integrity sha512-1Ge963tyEQWJJ+8qtXFU6wgmAVj9gweEjibUdbmcCEYsn38tVwRk8107rk2vzt6cfQcRr3SlZ8aQBqaD8aqf+Q==
 
 bottleneck@^2.18.1:
   version "2.19.5"
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,7 @@ @@
     }
     .invalid-tooltip .icon {
+      flex-shrink: 0;
       margin: .25rem .375rem .25rem 0;
     }
@@ Expand Down @@