From 580abb9d3e84013a6e484200882ac7187164ad3c Mon Sep 17 00:00:00 2001 From: tonsai-j Date: Tue, 17 Jan 2017 14:31:26 +0700 Subject: [PATCH] fix style btn --- README.md | 1 + bower.json | 2 +- gl-color.html | 61 +------------------------------------------------- gl-styles.html | 61 +++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 63 insertions(+), 62 deletions(-) diff --git a/README.md b/README.md index eeeba97..7278d06 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,7 @@ import ไฟล์ gl-styles ในหน้าที่่ต้องกา ## Btn style and icon size ![alt text](http://i.imgur.com/CKClG9G.png "gl-color") ``` + .gl-btn-primary .gl-btn-success .gl-btn-info diff --git a/bower.json b/bower.json index 345d96e..0dd3109 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "gl-styles", "description": "gl-style for web components", - "version": "0.0.21", + "version": "0.0.22", "main": "gl-color.html", "dependencies": { "polymer": "Polymer/polymer#^1.4.0" diff --git a/gl-color.html b/gl-color.html index 7ab84cd..09523a7 100644 --- a/gl-color.html +++ b/gl-color.html @@ -31,64 +31,5 @@ --gl-icon-hight:20px; --gl-icon-width:20px; } - /*bg*/ - .gl-bg-primary,.gl-bg-success, - .gl-bg-info,.gl-bg-warning, - .gl-bg-danger { - color: var(--gl-white-color); - padding: var(--gl-padding); - } - /* coror and btn*/ - .gl-bg-primary,.gl-btn-primary { - background-color: var(--gl-primary-color); - } - .gl-bg-success,.gl-btn-success { - background-color: var(--gl-success-color); - } - .gl-bg-info,.gl-btn-info { - background-color: var(--gl-info-color); - } - .gl-bg-warning,.gl-btn-warning { - background-color: var(--gl-warning-color); - } - .gl-bg-danger,.gl-btn-danger { - background-color: var(--gl-danger-color); - } - /*end bg */ - /*btn*/ - .gl-btn-defalse,.gl-btn-primary, - .gl-btn-success,.gl-btn-info, - .gl-btn-warning,.gl-btn-danger { - color: var(--gl-white-color); - min-height:var(--gl-btn-min-hight); - min-width:var(--gl-btn-min-width); - margin: var(--gl-btn-margin); - } - .gl-btn-defalse { - background-color: var(--gl-white-color); - color: black; - } - /*btn disabled*/ - .gl-btn-defalse[disabled],.gl-btn-primary[disabled], - .gl-btn-success[disabled],.gl-btn-info[disabled], - .gl-btn-warning[disabled],.gl-btn-danger[disabled] { - background-color: #eaeaea; - color: #a8a8a8; - } - .gl-btn-disabled{ - background-color: var(--gl-disabled-color); - color: var(--gl-white-color); - min-height:var(--gl-btn-min-hight); - min-width:var(--gl-btn-min-width); - margin: var(--gl-btn-margin); - --paper-button-disabled:{ - cursor:not-allowed; - } - } - /*end btn*/ - .gl-icon-size { - height:var(--gl-icon-hight); - width:var(--gl-icon-width); - padding-right: 5px; - } + diff --git a/gl-styles.html b/gl-styles.html index 9a303b7..de84923 100644 --- a/gl-styles.html +++ b/gl-styles.html @@ -27,7 +27,66 @@ } } - + /*bg*/ + .gl-bg-primary,.gl-bg-success, + .gl-bg-info,.gl-bg-warning, + .gl-bg-danger { + color: var(--gl-white-color); + padding: var(--gl-padding); + } + /* coror and btn*/ + .gl-bg-primary,.gl-btn-primary { + background-color: var(--gl-primary-color); + } + .gl-bg-success,.gl-btn-success { + background-color: var(--gl-success-color); + } + .gl-bg-info,.gl-btn-info { + background-color: var(--gl-info-color); + } + .gl-bg-warning,.gl-btn-warning { + background-color: var(--gl-warning-color); + } + .gl-bg-danger,.gl-btn-danger { + background-color: var(--gl-danger-color); + } + /*end bg */ + /*btn*/ + .gl-btn-default,.gl-btn-primary, + .gl-btn-success,.gl-btn-info, + .gl-btn-warning,.gl-btn-danger { + color: var(--gl-white-color); + min-height:var(--gl-btn-min-hight); + min-width:var(--gl-btn-min-width); + margin: var(--gl-btn-margin); + } + .gl-btn-default { + background-color: var(--gl-white-color); + color: black; + } + /*btn disabled*/ + .gl-btn-default[disabled],.gl-btn-primary[disabled], + .gl-btn-success[disabled],.gl-btn-info[disabled], + .gl-btn-warning[disabled],.gl-btn-danger[disabled] { + background-color: #eaeaea; + color: #a8a8a8; + } + .gl-btn-disabled{ + background-color: var(--gl-disabled-color); + color: var(--gl-white-color); + min-height:var(--gl-btn-min-hight); + min-width:var(--gl-btn-min-width); + margin: var(--gl-btn-margin); + --paper-button-disabled:{ + cursor:not-allowed; + } + } + /*end btn*/ + .gl-icon-size { + height:var(--gl-icon-hight); + width:var(--gl-icon-width); + padding-right: 5px; + } table.gl-table-default { border-collapse: collapse;