update: css for form elements are outside the .with-form context

src/styles/base/form.scss

@@ -15,6 +15,7 @@ form {
   margin-left: auto;
   margin-top: 3.2rem;
 }
+<<<<<<< HEAD
 
 .fieldset {
   border-bottom: 1px solid var(--color-fieldset-border);
@@ -48,14 +49,56 @@ form {
   padding-left: 3.4rem;
 }
 
+=======
+
+.fieldset {
+  border-bottom: 1px solid var(--color-fieldset-border);
+  color: var(--color-title);
+  display: flex;
+  flex: 1 0 100%;
+  font-size: 1.8rem;
+  font-weight: 600;
+  margin: 2.6rem 0 1.8rem;
+  padding-bottom: 0.8rem;
+}
+
+.form-label {
+  /*flex: 1 1 auto;*/
+  
+  label {
+    display: flex;
+    flex-direction: column; /* To align label and input vertically */
+    font-weight: 600;
+    margin-bottom: 0.8rem;
+    margin-top: 1.8rem;
+    text-transform: uppercase;
+  }
+  
+  &.is-light label {
+    color: var(--color-label-light);
+  }
+}
+
+.is-full-width {
+  box-sizing: border-box;
+  flex: 1 1 100%;
+  padding-left: 3.4rem;
+}
+
+>>>>>>> 5701eea... update: css for form elements are outside the .with-form context
 .is-half-width {
   box-sizing: border-box;
   flex: 0 0 50%;
   padding-left: 3.4rem;
 }
 
+<<<<<<< HEAD
 input:not([type='file']):not([type='search']):not([type='submit']),
 textarea {
+=======
+.input-text-like input:not([type='file']):not([type='search']):not([type='submit']),
+.input-text-like textarea {
+>>>>>>> 5701eea... update: css for form elements are outside the .with-form context
   -webkit-tap-highlight-color: var(--color-grey-7);
   background-color: var(--color-input-background);
   box-sizing: border-box;
@@ -65,7 +108,11 @@ textarea {
   line-height: 1;
   min-width: 0;
   padding: 1rem;
+<<<<<<< HEAD
 
+=======
+  
+>>>>>>> 5701eea... update: css for form elements are outside the .with-form context
   &:focus,
   &:active {
     border-bottom: 2px solid var(--color-input-active);
@@ -75,9 +122,15 @@ textarea {
 textarea {
   height: 100px;
 }
+<<<<<<< HEAD
 
 .content-box {
 
+=======
+    
+.content-box {
+  
+>>>>>>> 5701eea... update: css for form elements are outside the .with-form context
   &.with-form {
 
     sib-set-default:not([name='user-thumb']) {
@@ -91,7 +144,10 @@ textarea {
 				width: 50%;
 			}
     }
+  }
+}
 
+<<<<<<< HEAD
     /* To align label and input vertically */
     label {
       display: flex;
@@ -99,6 +155,9 @@ textarea {
     }
 
     /*sib-form[set-user-id-select] {
+=======
+/*sib-form[set-user-id-select] {
+>>>>>>> 5701eea... update: css for form elements are outside the .with-form context
 
   input[type="submit"] {
     margin-left: 0;
@@ -148,13 +207,7 @@ textarea {
     }
   }
 
-      .ss-list {
+<<<<<<< HEAD
-        color: var(--color-select-list);
-        font-weight: normal;
-        text-transform: none;
-      }
-    }
-
     hubl-status {
       align-self: auto;
     }
@@ -180,6 +233,63 @@ textarea {
           position: absolute;
           right: 8px;
         }
+=======
+  .ss-list {
+    color: var(--color-select-list);
+    font-weight: normal;
+    text-transform: none;
+  }
+}
+
+/* Additional styles for the select to add a member in circle-edit */
+.block.select-add>form {
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 2.6rem;
+
+  label {
+    margin-top: 0;
+  }
+
+  .ss-main {
+    min-width: 35vw;
+  }
+
+  input[type='submit'] {
+    @extend .button,
+    .btn-margin-left,
+    .text-bold,
+    .text-uppercase,
+    .button-complementary,
+    .bordered;
+    margin-top: auto;
+    margin-bottom: auto;
+  }
+}
+/* End */
+
+sib-form-date {
+  input[type="date"] {
+    background-image: url("/images/calendar.svg");
+    background-position: right 12px top 50%;
+    background-repeat: no-repeat;
+    background-size: 1.4rem;
+    color: var(--color-input-icon);
+    cursor: default;
+    font-size: 1.4rem;
+    margin-top: 1.6rem;
+    max-width: 50vw;
+    padding-right: 3rem; /* Needed to replace the close icon in FF when you are selecting a date */
+    padding-top: 1.2rem; /* Needed to center the close icon in FF when you are selecting a date */
+    position: relative;
+
+    &::-webkit-calendar-picker-indicator {
+      cursor: pointer;
+      opacity: 0;
+      position: absolute;
+      right: 8px;
+    }
+>>>>>>> 5701eea... update: css for form elements are outside the .with-form context
 
     &::-webkit-clear-button {
       cursor: pointer;
@@ -323,5 +433,3 @@ textarea {
     }
   }
 }
-  }
-}