Merge pull request #21 from civicrm/develop

Merge develop into master
civicrm · Jul 7, 2017 · 44a8c10 · 44a8c10
2 parents ed7e97e + a6c1c89
commit 44a8c10
Show file tree

Hide file tree

Showing 13 changed files with 330 additions and 77 deletions.
diff --git a/css/bootstrap.css b/css/bootstrap.css
diff --git a/css/custom-civicrm.css b/css/custom-civicrm.css
diff --git a/scss/bootstrap/bootstrap.scss b/scss/bootstrap/bootstrap.scss
@@ -13,3 +13,4 @@
 @import "SCSSROOT/org.civicrm.shoreditch/base/scss/bootstrap";
 @import "overrides/style/*";
 @import "components/*";
+@import "helper";
diff --git a/scss/bootstrap/components/_custom-select.scss b/scss/bootstrap/components/_custom-select.scss
@@ -1,102 +1,110 @@
+//** Custom select
+$crm-customselect-background:             #ffffff;
+$crm-customselect-caret-width:            32;
+$crm-customselect-padding-right:          $crm-customselect-caret-width + 12;
+$crm-customselect-feedback-padding-right: $crm-customselect-padding-right + 10;
+
 .crm_custom-select {
-    background: $crm-customselect-background;
-    display: inline-block;
-    position: relative;
+  background: $crm-customselect-background;
+  display: inline-block;
+  position: relative;
 
-    > select {
-        background: transparent;
-        padding-right: #{$crm-customselect-padding-right}px;
-        position: relative;
-        width: 100%;
-        z-index: 2;
+  > select {
+    background: transparent;
+    border: 1px solid $input-border;
+    height: $input-height-base;
+    padding: 4px #{$crm-customselect-padding-right}px 4px 12px;
+    position: relative;
+    width: 100%;
+    z-index: 2;
 
-        -moz-appearance: none;
-        -webkit-appearance: none;
-        -webkit-border-radius: 0px;
+    -moz-appearance: none;
+    -webkit-appearance: none;
+    -webkit-border-radius: 0px;
 
-        &::-ms-expand {
-            display: none;
-        }
+    &::-ms-expand {
+      display: none;
+    }
 
-        &:disabled {
+    &:disabled {
 
-            + .crm_custom-select__arrow {
-                z-index: 2;
-            }
-        }
+      + .crm_custom-select__arrow {
+        z-index: 2;
+      }
+    }
 
-        &:focus {
+    &:focus {
 
-            + .crm_custom-select__arrow {
-                border-color: $input-border-focus;
-            }
-        }
+      + .crm_custom-select__arrow {
+        border-color: $input-border-focus;
+      }
     }
+  }
 
-    .ie9 & {
+  .ie9 & {
 
-        > select {
-            padding-right: 10px;
-        }
+    > select {
+      padding-right: 10px;
+    }
 
-        .crm_custom-select__arrow {
-            display: none;
-        }
+    .crm_custom-select__arrow {
+      display: none;
     }
+  }
 }
 
 .crm_custom-select--full {
-    display: block;
-    width: auto;
+  display: block;
+  width: auto;
 }
 
 .crm_custom-select--transparent {
-    background: transparent;
+  background: transparent;
 
-    option {
-        background: $crm-customselect-background;
-    }
+  option {
+    background: $crm-customselect-background;
+  }
 }
 
 .crm_custom-select__arrow {
-    border-left: 1px solid $input-border;
-    bottom: 0;
-    display: inline-block;
-    line-height: #{$crm-customselect-caret-width - 1}px;
-    position: absolute;
-    right: 0;
-    text-align: center;
-    top: 0;
-    width: #{$crm-customselect-caret-width}px;
-    z-index: 1;
-
-    &:before {
-        content: '\f0d7';
-        color: $text-color;
-        font-family: "FontAwesome";
-        font-style: normal;
-        text-rendering: auto;
-        -webkit-font-smoothing: antialiased;
-    }
+  border-left: 1px solid $input-border;
+  bottom: 0;
+  display: inline-block;
+  line-height: #{$crm-customselect-caret-width - 1}px;
+  position: absolute;
+  right: 0;
+  text-align: center;
+  top: 0;
+  width: #{$crm-customselect-caret-width}px;
+  z-index: 1;
+
+  &:before {
+    content: '\f0d7';
+    color: $text-color;
+    font-family: "FontAwesome";
+    font-style: normal;
+    text-rendering: auto;
+    -webkit-font-smoothing: antialiased;
+  }
 }
 
 .has-error {
 
-    .crm_custom-select__arrow {
-        border-color: $brand-danger !important;
-    }
+  .crm_custom-select__arrow {
+    border-color: $brand-danger !important;
+  }
 }
 
 .has-feedback {
 
-    > .crm_custom-select {
+  > .crm_custom-select {
 
-        > select {
-            padding-right: #{$crm-customselect-feedback-padding-right}px;
-        }
+    > select {
+      padding-right: #{$crm-customselect-feedback-padding-right}px;
+    }
 
-        + .form-control-feedback {
-            right: #{$crm-customselect-caret-width - 5}px !important;
-        }
+    + .form-control-feedback {
+      right: #{$crm-customselect-caret-width - 5}px !important;
     }
+  }
 }
diff --git a/scss/bootstrap/components/_table.scss b/scss/bootstrap/components/_table.scss
@@ -0,0 +1,10 @@
+.table {
+  &.table-transparent {
+    background-color: transparent;
+    border: 1px solid $crm-dark-grayblue;
+
+    th {
+      background-color: transparent;
+    }
+  }
+}
diff --git a/scss/bootstrap/components/_text-angular.scss b/scss/bootstrap/components/_text-angular.scss
@@ -0,0 +1,43 @@
+$crm-text-angular-min-height: 120px;
+
+[text-angular] {
+  border: 1px solid $gray-light;
+  padding: 0;
+
+  [text-angular-toolbar] {
+    background-color: #f4f7f8;
+    border: 0;
+    margin-left: 0;
+    padding: 10px;
+
+    .btn {
+      background: transparent;
+      border: none;
+      color: #727E8A;
+
+      &.active {
+        color: $gray-darker;
+      }
+
+      i.fa {
+        font-size: $font-size-small;
+        font-weight: 700;
+      }
+    }
+  }
+
+  .ta-editor {
+    border: none !important;
+  }
+
+  .form-control {
+    border: none;
+    box-shadow: none !important;
+    min-height: $crm-text-angular-min-height;
+
+    &.ta-scroll-window > .ta-bind {
+      min-height: $crm-text-angular-min-height;
+      outline: 0;
+    }
+  }
+}
diff --git a/scss/bootstrap/components/_wysiwyg.scss b/scss/bootstrap/components/_wysiwyg.scss
@@ -0,0 +1,23 @@
+.chr_wysiwyg {
+  border-bottom: none !important;
+}
+
+.chr_wysiwyg__action {
+  background-color: #FFF;
+  border: 1px solid $gray-light;
+  border-top: none;
+  padding: 5px 0;
+  text-align: right;
+
+  hr {
+    margin: 0 10px;
+  }
+
+  .btn-link {
+    margin-top: 5px;
+  }
+
+  .fa {
+    margin-right: 5px;
+  }
+}
diff --git a/scss/bootstrap/helper.scss b/scss/bootstrap/helper.scss
@@ -0,0 +1,3 @@
+.pointer {
+  cursor: pointer !important;
+}
diff --git a/scss/bootstrap/mixins/_utility.scss b/scss/bootstrap/mixins/_utility.scss
@@ -0,0 +1,31 @@
+/**
+ * Absolutely positions and vertically and horizontally centers an element
+ */
+@mixin absolute-centered() {
+  bottom: 0;
+  left: 0;
+  margin: auto;
+  position: absolute;
+  right: 0;
+  top: 0;
+}
+
+/**
+ * Dropdown arrow
+ */
+@mixin dropdown-arrow() {
+  content: '\f0d7';
+  border-left: 1px solid $input-border;
+  bottom: 0;
+  font-family: "FontAwesome";
+  display: inline-block;
+  height: 100%;
+  line-height: $input-height-base;
+  position: absolute;
+  right: 0;
+  text-align: center;
+  width: 32px;
+  z-index: 1;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
diff --git a/scss/bootstrap/overrides/_variables.scss b/scss/bootstrap/overrides/_variables.scss
@@ -53,6 +53,7 @@ $brand-danger:              #E6807F !default;
 $crm-brand-primary-light:   lighten(desaturate(adjust-hue($brand-primary, 4.9301), 34.7499), 45.6863) !default;
 $crm-brand-primary-lighter: lighten(desaturate(adjust-hue(#3ab1c9, -10.0699), 36.9721), 48.2353) !default;
 
+$crm-color-neutral:         #949caa !default; // gray shade
 $crm-dark-blue:             #586277 !default;
 $crm-dark-grayblue:         #D3DEE2 !default;
 $crm-darker-grayblue:       #C2CFD8 !default;
@@ -160,13 +161,6 @@ $input-border-radius-small: $border-radius-base !default;
 
 $crm-input-addon-color:     $gray-darker !default;
 
-//** Custom select
-$crm-customselect-background:             #ffffff;
-$crm-customselect-caret-width:            32;
-$crm-customselect-padding-right:          $crm-customselect-caret-width + 12;
-$crm-customselect-feedback-padding-right: $crm-customselect-padding-right + 10;
-
-
 //== Dropdowns
 //
 //## Dropdown menu container and contents.
@@ -339,3 +333,5 @@ $dl-horizontal-offset: 250px !default;
 
 $blockquote-small-color:      $crm-copy !default;
 $blockquote-border-color:     $brand-primary !default;
+
+$crm-ui-select-top-padding: 4px;
diff --git a/scss/bootstrap/overrides/style/_button-groups.scss b/scss/bootstrap/overrides/style/_button-groups.scss
@@ -0,0 +1,22 @@
+.btn .caret {
+  margin: 0 5px;
+}
+
+.btn-group {
+
+  .btn {
+    box-shadow: none;
+    border-color: $input-border;
+
+    &:not([class*=" btn-"]) {
+      &:hover {
+        border-color: $input-border;
+      }
+    }
+
+    &.active {
+      background-color: $gray;
+      color: #FFF;
+    }
+  }
+}
diff --git a/scss/bootstrap/overrides/style/_buttons.scss b/scss/bootstrap/overrides/style/_buttons.scss
@@ -103,6 +103,20 @@
   }
 }
 
+.btn-default-outline {
+
+  @include button-outline-variant($crm-white);
+  color: $crm-white !important;
+  border-color: $crm-white !important;
+
+  .open &,
+  &:hover,
+  &:active {
+    background-color: $crm-white !important;
+    color: $crm-dark-blue !important;
+  }
+}
+
 .btn-primary-outline {
   @include button-outline-variant($btn-primary-bg);
 }