Merge pull request #139 from sebgroup/develop

Cut release
seb-oss · Jul 19, 2019 · 76d1754 · 76d1754
2 parents b7196d5 + 1eba44d
commit 76d1754
Show file tree

Hide file tree

Showing 52 changed files with 7,047 additions and 7,381 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/scss/_variables.scss b/scss/_variables.scss
diff --git a/scss/mixins/_alert.scss b/scss/mixins/_alert.scss
@@ -13,51 +13,25 @@
     &:hover {
       color: $link-hover-color;
     }
-  }
-}
-
-@mixin alert-outline-variant($background, $border, $color) {
-  background: $white;
-  border: solid 1px $background;
-  border-color: $border;
-
-  hr {
-    border-top-color: darken($border, 5%);
-  }
-
-  .alert-link {
-    color: $link-color;
-  }
-  .alert-heading {
-    background: $background;
-    color: color-yiq($background);
-    margin: -$alert-padding-x;
-    margin-bottom: $alert-padding-x;
-    padding: $alert-padding-x;
-  }
-}
-@mixin alert-context-icon($context, $background) {
-  @if $context == 'success' {
-    background: str-replace(url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 448 512'%3E%3Cpath d='M413.505 91.951L133.49 371.966l-98.995-98.995c-4.686-4.686-12.284-4.686-16.971 0L6.211 284.284c-4.686 4.686-4.686 12.284 0 16.971l118.794 118.794c4.686 4.686 12.284 4.686 16.971 0l299.813-299.813c4.686-4.686 4.686-12.284 0-16.971l-11.314-11.314c-4.686-4.686-12.284-4.686-16.97 0z' fill='#{color-yiq($background)}'/%3E%3C/svg%3E"), "#", "%23");
-  }
-  @else {
-    background: str-replace(url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 576 512'%3E%3Cpath d='M569.517 440.013C587.975 472.007 564.806 512 527.94 512H48.054c-36.937 0-59.999-40.054-41.577-71.987L246.423 23.985c18.467-32.009 64.72-31.952 83.154 0l239.94 416.028zm-27.658 15.991l-240-416c-6.16-10.678-21.583-10.634-27.718 0l-240 416C27.983 466.678 35.731 480 48 480h480c12.323 0 19.99-13.369 13.859-23.996zM288 372c-15.464 0-28 12.536-28 28s12.536 28 28 28 28-12.536 28-28-12.536-28-28-28zm-11.49-212h22.979c6.823 0 12.274 5.682 11.99 12.5l-7 168c-.268 6.428-5.556 11.5-11.99 11.5h-8.979c-6.433 0-11.722-5.073-11.99-11.5l-7-168c-.283-6.818 5.167-12.5 11.99-12.5zM288 372c-15.464 0-28 12.536-28 28s12.536 28 28 28 28-12.536 28-28-12.536-28-28-28z' fill='#{color-yiq($background)}'/%3E%3C/svg%3E"), "#", "%23");
+    &.external:not(:hover):after {
+      content: str-replace($external-link-icon, str-replace(#{'fill=\'' + $external-link-icon-color + '\''}, "#", "%23"), str-replace(#{'fill=\'' + color-yiq($background) + '\''}, "#", "%23"));
+    }
   }
 }
 
 @mixin alert-icon($background, $border, $color, $context) {
-  padding-left: $alert-icon-width + ($alert-padding-x*2);
   &::before {
     content: '';
-    @include alert-context-icon($context, $background);
+    background: str-replace(map-get($theme-icons, $context), str-replace(#{'fill=\'' + $icon-fill-color + '\''}, "#", "%23"), str-replace(#{'fill=\'' + color-yiq($background) + '\''}, "#", "%23"));
     margin-right: $alert-padding-x;
     margin-left: -$alert-icon-width - $alert-padding-x;
     width: $alert-icon-width;
     height: $alert-icon-height;
     display: inline-block;
     background-position: center;
     background-repeat: no-repeat;
-    vertical-align: -.125em;
+    vertical-align: top;
+    margin-top: 4px;
   }
 }
 
diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss
@@ -24,11 +24,11 @@
   @if($submitted-bg == $dark) {
     $background: transparent;
     $color: $light;
-    $border: $black;
-    $hover-background: $black;
-    $hover-border: $black;
-    $active-background: rgba($black,.65);
-    $active-border: $black;
+    $border: $dark;
+    $hover-background: $dark;
+    $hover-border: $dark;
+    $active-background: rgba($dark,.65);
+    $active-border: $dark;
   }
 
   // override danger button

diff --git a/scss/mixins/_close.scss b/scss/mixins/_close.scss
@@ -6,7 +6,7 @@
   z-index: 1;
   &::after {
     content: '';
-    background: str-replace(url("data:image/svg+xml;charset=UTF-8, %3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 384 512'%3E%3Cpath d='M217.5 256l137.2-137.2c4.7-4.7 4.7-12.3 0-17l-8.5-8.5c-4.7-4.7-12.3-4.7-17 0L192 230.5 54.8 93.4c-4.7-4.7-12.3-4.7-17 0l-8.5 8.5c-4.7 4.7-4.7 12.3 0 17L166.5 256 29.4 393.2c-4.7 4.7-4.7 12.3 0 17l8.5 8.5c4.7 4.7 12.3 4.7 17 0L192 281.5l137.2 137.2c4.7 4.7 12.3 4.7 17 0l8.5-8.5c4.7-4.7 4.7-12.3 0-17L217.5 256z' fill='#{color-yiq($color)}'/%3E%3C/svg%3E"), "#", "%23");
+    background: str-replace(url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 320 512'%3E%3Cpath d='M207.6 256l107.72-107.72c6.23-6.23 6.23-16.34 0-22.58l-25.03-25.03c-6.23-6.23-16.34-6.23-22.58 0L160 208.4 52.28 100.68c-6.23-6.23-16.34-6.23-22.58 0L4.68 125.7c-6.23 6.23-6.23 16.34 0 22.58L112.4 256 4.68 363.72c-6.23 6.23-6.23 16.34 0 22.58l25.03 25.03c6.23 6.23 16.34 6.23 22.58 0L160 303.6l107.72 107.72c6.23 6.23 16.34 6.23 22.58 0l25.03-25.03c6.23-6.23 6.23-16.34 0-22.58L207.6 256z' fill='#{color-yiq($color)}'/%3E%3C/svg%3E"), "#", "%23");
     background-size: 1rem 1.125rem;
     background-repeat: no-repeat;
     width: 1rem;
@@ -18,4 +18,4 @@
   &:hover {
     opacity: 0.75;
   }
-}
+}
diff --git a/scss/styles/_alert.scss b/scss/styles/_alert.scss
@@ -30,6 +30,9 @@
 .alert-heading {
   position: relative;
   z-index: 0;
+  display: inline-block;
+  width: 100%;
+  margin-bottom: 0;
   &::after {
     content: '';
     display: block;
@@ -82,6 +85,10 @@
 // Generate contextual modifier classes for colorizing the alert.
 
 @each $color, $value in $theme-colors {
+  // override the style of primary and info alerts
+  @if ($color == 'primary') or ($color == 'info') {
+    $value: map-get($theme-colors, 'secondary');
+  }
   .alert-#{$color} {
     @include alert-variant($value, $value, theme-color-level($color, $alert-color-level));
   }
@@ -90,26 +97,37 @@
 }
 }
 
-// Alert outline styles
-//
-// Generate contextual modifier classes for colorizing the alert.
-
-@each $color, $value in $theme-colors {
-  .alert-outline-#{$color} {
-    @include alert-outline-variant($value, $value, theme-color-level($color, $alert-color-level));
-  }
-}
-
 // Alert icon styles
 //
 // Generate contextual modifier classes for alert icons.
 
 @each $color, $value in $theme-colors {
-  @if index("danger" "warning" "success", $color) {
+  // override the style of primary and info alerts
+  @if ($color == 'primary') or ($color == 'info') {
+    $value: map-get($theme-colors, 'secondary');
+  }
+  @if index("danger" "warning" "success" "info", $color) {
     .alert.alert-icon {
       &.alert-#{$color} {
         @include alert-icon($value, $value, theme-color-level($color, $alert-color-level), $color);
       }
     }
   }
-}
+}
+
+.alert-icon {
+  padding-left: $alert-icon-padding;
+  > .row {
+    display: inline-flex;
+    @include media-breakpoint-down(xs) {
+      > .col-12 {
+        // margin-left: calc(-2.625rem + .75rem);
+        margin-left: -$alert-icon-padding + $alert-padding-x;
+        min-width: calc(100% + #{$alert-icon-padding - $alert-padding-x});
+      }
+    }
+  }
+
+}
+
+
diff --git a/scss/styles/_breadcrumb.scss b/scss/styles/_breadcrumb.scss
@@ -5,6 +5,7 @@
   }
   + .breadcrumb-item::before {
     width: $breadcrumb-divider-width;
+    height: $breadcrumb-divider-height;
     vertical-align: middle;
   }
 
@@ -38,8 +39,38 @@
         color: $breadcrumb-divider-color;
         content: $breadcrumb-back-icon;
         width: $breadcrumb-divider-width;
+        height: $breadcrumb-divider-height;
         vertical-align: middle;
       }
     }
   }
-}
+}
+
+.breadcrumb-light {
+  .breadcrumb-item {
+    + .breadcrumb-item {
+
+      &::before {
+        color: $breadcrumb-divider-color-light;
+        content: str-replace($breadcrumb-divider, str-replace(#{'fill=\'' + $breadcrumb-divider-color + '\''}, "#", "%23"), str-replace(#{'fill=\'' + $breadcrumb-divider-color-light + '\''}, "#", "%23"));
+      }
+    }
+    &.active {
+      color: $breadcrumb-active-color-light;
+    }
+    a {
+      color: $breadcrumb-active-color-light;
+      @include hover {
+        color: $breadcrumb-active-color-light;
+      }
+    }
+    @include media-breakpoint-down(xs) {
+      &:nth-last-child(2) {
+        &::before {
+          content: str-replace($breadcrumb-back-icon, str-replace(#{'fill=\'' + $breadcrumb-divider-color + '\''}, "#", "%23"), str-replace(#{'fill=\'' + $breadcrumb-divider-color-light + '\''}, "#", "%23"));
+        }
+      }
+    }
+
+  }
+}
diff --git a/scss/styles/_buttons.scss b/scss/styles/_buttons.scss
@@ -185,39 +185,3 @@ button.close {
     display: none;
   }
 }
-
-.input-group {
-  .input-group-prepend, .input-group-append {
-    .btn:not(:hover,:active,:focus) {
-      background: $input-bg;
-      color: $blue-dark;
-    }
-  }
-  .input-group-append .btn:not(:hover,:active,:focus) {
-    border-color: $input-border-color;
-    border-left:none;
-    padding-left: calc(#{$btn-padding-x} + 1px);
-  }
-  .input-group-prepend .btn:not(:hover,:active,:focus) {
-    border-color: $input-border-color;
-    border-right:none;
-    padding-right: calc(#{$btn-padding-x} + 1px);
-  }
-}
-.input-group-sm {
-  .input-group-append .btn:not(:hover,:active,:focus) {
-    padding-left: calc(#{$btn-padding-x-sm} + 1px);
-  }
-  .input-group-prepend .btn:not(:hover,:active,:focus) {
-    padding-right: calc(#{$btn-padding-x-sm} + 1px);
-  }
-}
-
-.input-group-lg {
-  .input-group-append .btn:not(:hover,:active,:focus) {
-    padding-left: calc(#{$btn-padding-x-lg} + 1px);
-  }
-  .input-group-prepend .btn:not(:hover,:active,:focus) {
-    padding-right: calc(#{$btn-padding-x-lg} + 1px);
-  }
-}