Update SASS variables and adjust Bootstrap classes

dbmi-bgm · Oct 6, 2024 · 7d71e70 · 7d71e70
1 parent 76f6a22
commit 7d71e70
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/encoded/static/components/forms/ExcelSubmissionView.js b/src/encoded/static/components/forms/ExcelSubmissionView.js
@@ -882,7 +882,7 @@ function FileAttachmentBtn(props){
                             { selectTitle }
                         </span>
                     </div>
-                    <div className="input-group-append">
+                    <div className="input-group">
                         <label htmlFor="test_file" disabled={loadingFileResult || postFileSuccess === true }
                             className={"mb-0 btn btn-primary " + (loadingFileResult || postFileSuccess ? " disabled unclickable" : " clickable")}>
                             <input id="test_file" type="file" onChange={!loadingFileResult && onFileInputChange ? onFileInputChange: undefined} className="d-none"
@@ -916,7 +916,7 @@ function FileAttachmentBtn(props){
                         { onClearFile && <i className={`${clearBtnDisabled ? "" : "clickable"} icon fas icon-times icon-fw mx-2`} onClick={clearBtnDisabled ? undefined : onClearFile} />}
                     </div>
                 </div>
-                <div className="input-group-append">
+                <div className="input-group">
                     <button type="button" className="btn btn-success" onClick={onFormSubmit} disabled={loadingFileResult || postFileSuccess === true}>
                         <i className={"me-08 icon icon-fw fas icon-" + icon} />
                         {uploadTitle}

diff --git a/src/encoded/static/scss/encoded/_base.scss b/src/encoded/static/scss/encoded/_base.scss
@@ -59,6 +59,7 @@ $grid-breakpoints: (
   xxl: 1500px,
 );
 
+$border-radius:                             .25rem;
 $border-radius-base:                        3px;
 $border-radius-lg:                          4px;
 $border-radius-sm:                          2px;
@@ -138,6 +139,8 @@ $btn-line-height: 1.45rem;
 
 
 /* Cards */
+$card-spacer-y: 1.25rem;
+$card-spacer-x: 1.25rem;
 $card-cap-bg: #fff;
 $card-bg: #fff;
 $card-inner-border-radius: 3px;
@@ -156,6 +159,16 @@ $h6-font-size: 0.85rem;
 $print-page-size:                   8.5in 11in;
 $print-body-min-width:              8.5in;
 
+/* Popovers */
+$popover-border-color: #ebebeb;
+$popover-header-bg: #f7f7f7;
+$popover-body-padding-y: .5rem;
+$popover-body-padding-x: .75rem;
+
+/* Alerts */
+$alert-padding-y: .75rem;
+$alert-padding-x: 1.25rem;
+
 /****************************/
 /** FontAwesome Icon Stuff **/
 /****************************/