Merge branch 'master' of https://github.com/atinc/ngx-tethys

atinc · Dec 24, 2019 · 2bd093e · 2bd093e
2 parents 5a36a76 + 8c05a96
commit 2bd093e
Show file tree

Hide file tree

Showing 7 changed files with 9,084 additions and 8,616 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+## [7.6.16](https://github.com/worktile/ngx-tethys/compare/7.6.14...7.6.16) (2019-12-24)
+
+
+### Bug Fixes
+
+* **layout:** fix can't scroll to bottom in chrom 79.0.x #INF-262 ([c70e380](https://github.com/worktile/ngx-tethys/commit/c70e380)), closes [#INF-262](https://github.com/worktile/ngx-tethys/issues/INF-262)
+
+
+### Features
+
+* **checbox:** add thyIndeterminate in checkbox #INF-269 ([20daea8](https://github.com/worktile/ngx-tethys/commit/20daea8)), closes [#INF-269](https://github.com/worktile/ngx-tethys/issues/INF-269)
+* **vote:** add vote component #INF-169 ([#458](https://github.com/worktile/ngx-tethys/issues/458)) ([62d77b3](https://github.com/worktile/ngx-tethys/commit/62d77b3)), closes [#INF-169](https://github.com/worktile/ngx-tethys/issues/INF-169) [#INF-169](https://github.com/worktile/ngx-tethys/issues/INF-169)
+
+
+
 ## [7.6.14](https://github.com/worktile/ngx-tethys/compare/7.6.12...7.6.14) (2019-12-16)
 
 

diff --git a/docs/index.html b/docs/index.html
@@ -8,7 +8,7 @@
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
     <!-- <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Roboto+Mono:300"  rel="stylesheet"> -->
     <link id="theme" rel="stylesheet" href="assets/css/default.min.css" />
-    <link rel="stylesheet" href="styles.ffae885376b2829e1749.css" />
+    <link rel="stylesheet" href="styles.2db251d179c9935abdd8.css" />
   </head>
 
   <body>
@@ -19,6 +19,6 @@
     <script type="text/javascript" src="assets/js/jquery.js"></script>
     <script type="text/javascript" src="runtime.a5dd35324ddfd942bef1.js"></script
     ><script type="text/javascript" src="polyfills.97c9e3e620c2ae7f6e3a.js"></script
-    ><script type="text/javascript" src="main.132954210648c61e1ced.js"></script>
+    ><script type="text/javascript" src="main.ef71be7fa4e418c4e205.js"></script>
   </body>
 </html>
diff --git a/docs/main.132954210648c61e1ced.js → docs/main.ef71be7fa4e418c4e205.js b/docs/main.132954210648c61e1ced.js → docs/main.ef71be7fa4e418c4e205.js
diff --git a/docs/styles.ffae885376b2829e1749.css → docs/styles.2db251d179c9935abdd8.css b/docs/styles.ffae885376b2829e1749.css → docs/styles.2db251d179c9935abdd8.css
@@ -8633,6 +8633,7 @@ pop-box-container {
     flex-direction: column;
     flex: auto;
     height: 100%;
+    min-height: 0;
     background: #eee;
 }
 .thy-layout--has-sidebar {
@@ -11376,6 +11377,24 @@ thy-daterangepicker-container {
     margin-top: -1px;
     margin-left: 0;
 }
+.form-check-indeterminate input[type='checkbox'] {
+    border-color: #348fe4;
+}
+.form-check-indeterminate input[type='checkbox']::after {
+    width: 6px;
+    height: 6px;
+    background: #348fe4;
+    margin: auto;
+    opacity: 1;
+    -webkit-transform: none;
+    transform: none;
+    position: absolute;
+    left: 4px;
+    top: 4px;
+}
+.form-check-indeterminate input[type='checkbox']::before {
+    display: none;
+}
 input[type='checkbox'],
 input[type='radio'] {
     margin-top: 2px;
@@ -13820,6 +13839,71 @@ select.form-control-md:not([size]):not([multiple]) {
 .thy-skeleton {
     display: block;
 }
+.thy-vote {
+    display: flex;
+    background-color: #f3f3f3;
+    color: #888;
+    border-radius: 4px;
+    cursor: pointer;
+}
+.thy-vote .thy-icon {
+    display: block;
+}
+.thy-vote-vertical {
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-between;
+}
+.thy-vote-vertical-size-sm {
+    width: 36px;
+    height: 36px;
+    padding: 5px;
+    line-height: 0.625rem;
+    font-size: 0.625rem;
+}
+.thy-vote-vertical-size-sm .thy-icon {
+    font-size: 0.75rem;
+}
+.thy-vote-vertical-size-md {
+    width: 48px;
+    height: 48px;
+    padding: 7px;
+    line-height: 0.875rem;
+    font-size: 0.875rem;
+}
+.thy-vote-vertical-size-md .thy-icon {
+    font-size: 1rem;
+}
+.thy-vote-horizontal {
+    align-items: center;
+    justify-content: space-between;
+}
+.thy-vote-horizontal-size-sm {
+    width: 50px;
+    height: 20px;
+    padding: 4px 7px;
+    line-height: 0.75rem;
+    font-size: 0.75rem;
+}
+.thy-vote-horizontal-size-sm .thy-icon {
+    font-size: 0.75rem;
+}
+.thy-vote-success:hover {
+    background: #66c060 !important;
+    color: #fff !important;
+}
+.thy-vote-success.has-voted {
+    background: rgba(102, 192, 96, 0.1);
+    color: #66c060;
+}
+.thy-vote-primary:hover {
+    background: #348fe4 !important;
+    color: #fff !important;
+}
+.thy-vote-primary.has-voted {
+    background: rgba(52, 143, 228, 0.1);
+    color: #348fe4;
+}
 .thy-result {
     display: block;
     text-align: center;
@@ -15031,7 +15115,7 @@ body {
     right: 6px;
     background: #eee;
 }
-.demo-main .thy-layout-content {
+.demo-main .demo-main-layout-content {
     background: #fff;
     padding: 30px 0;
 }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-tethys",
-  "version": "7.6.14",
+  "version": "7.6.16",
   "license": "MIT",
   "scripts": {
     "build": "npm run build:ngm",

diff --git a/src/package.json b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-tethys",
-  "version": "7.6.14",
+  "version": "7.6.16",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/worktile/ngx-tethys.git"

diff --git a/src/version.ts b/src/version.ts
@@ -1,3 +1,3 @@
 import { Version } from '@angular/core';
 
-export const VERSION = new Version('7.6.14');
+export const VERSION = new Version('7.6.16');