From 5c3c177a93070079477689e71436b9ab26d62250 Mon Sep 17 00:00:00 2001 From: cagataycivici Date: Wed, 13 May 2020 09:07:56 +0300 Subject: [PATCH] Fixed timepicker and updated themes for radiobutton alignment issues --- public/themes/luna-amber/theme.css | 4 ++-- public/themes/luna-green/theme.css | 4 ++-- public/themes/luna-pink/theme.css | 4 ++-- public/themes/nova-colored/theme.css | 4 ++-- public/themes/nova-dark/theme.css | 4 ++-- public/themes/nova-light/theme.css | 4 ++-- public/themes/nova-vue/theme.css | 4 ++-- public/themes/rhea/theme.css | 4 ++-- public/themes/saga-blue/theme.css | 4 ++-- public/themes/saga-cyan/theme.css | 4 ++-- public/themes/saga-deeppurple/theme.css | 4 ++-- public/themes/saga-green/theme.css | 4 ++-- public/themes/saga-indigo/theme.css | 4 ++-- public/themes/saga-orange/theme.css | 4 ++-- public/themes/saga-purple/theme.css | 4 ++-- public/themes/saga-teal/theme.css | 4 ++-- public/themes/vela-blue/theme.css | 4 ++-- public/themes/vela-cyan/theme.css | 4 ++-- public/themes/vela-deeppurple/theme.css | 4 ++-- public/themes/vela-green/theme.css | 4 ++-- public/themes/vela-indigo/theme.css | 4 ++-- public/themes/vela-orange/theme.css | 4 ++-- public/themes/vela-purple/theme.css | 4 ++-- public/themes/vela-teal/theme.css | 4 ++-- src/components/calendar/Calendar.vue | 4 ++-- src/views/inputgroup/InputGroupDemo.vue | 6 +++--- 26 files changed, 53 insertions(+), 53 deletions(-) diff --git a/public/themes/luna-amber/theme.css b/public/themes/luna-amber/theme.css index c9badf224..7f360f87a 100644 --- a/public/themes/luna-amber/theme.css +++ b/public/themes/luna-amber/theme.css @@ -874,8 +874,8 @@ .p-radiobutton .p-radiobutton-box { border: 1px solid #585858; background: #585858; - width: 1.5rem; - height: 1.5rem; + width: 20px; + height: 20px; color: #dedede; border-radius: 50%; transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s; diff --git a/public/themes/luna-green/theme.css b/public/themes/luna-green/theme.css index a2473169e..de70410a9 100644 --- a/public/themes/luna-green/theme.css +++ b/public/themes/luna-green/theme.css @@ -874,8 +874,8 @@ .p-radiobutton .p-radiobutton-box { border: 1px solid #585858; background: #585858; - width: 1.5rem; - height: 1.5rem; + width: 20px; + height: 20px; color: #dedede; border-radius: 50%; transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s; diff --git a/public/themes/luna-pink/theme.css b/public/themes/luna-pink/theme.css index 81383bbee..4e76ec492 100644 --- a/public/themes/luna-pink/theme.css +++ b/public/themes/luna-pink/theme.css @@ -874,8 +874,8 @@ .p-radiobutton .p-radiobutton-box { border: 1px solid #585858; background: #585858; - width: 1.5rem; - height: 1.5rem; + width: 20px; + height: 20px; color: #dedede; border-radius: 50%; transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s; diff --git a/public/themes/nova-colored/theme.css b/public/themes/nova-colored/theme.css index 117f90ef9..089eea671 100644 --- a/public/themes/nova-colored/theme.css +++ b/public/themes/nova-colored/theme.css @@ -874,8 +874,8 @@ .p-radiobutton .p-radiobutton-box { border: 1px solid #a6a6a6; background: #ffffff; - width: 1.5rem; - height: 1.5rem; + width: 20px; + height: 20px; color: #333333; border-radius: 50%; transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s; diff --git a/public/themes/nova-dark/theme.css b/public/themes/nova-dark/theme.css index 9bdf760cb..457e11853 100644 --- a/public/themes/nova-dark/theme.css +++ b/public/themes/nova-dark/theme.css @@ -874,8 +874,8 @@ .p-radiobutton .p-radiobutton-box { border: 1px solid #a6a6a6; background: #ffffff; - width: 1.5rem; - height: 1.5rem; + width: 20px; + height: 20px; color: #333333; border-radius: 50%; transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s; diff --git a/public/themes/nova-light/theme.css b/public/themes/nova-light/theme.css index 1eb57734d..96b278017 100644 --- a/public/themes/nova-light/theme.css +++ b/public/themes/nova-light/theme.css @@ -874,8 +874,8 @@ .p-radiobutton .p-radiobutton-box { border: 1px solid #a6a6a6; background: #ffffff; - width: 1.5rem; - height: 1.5rem; + width: 20px; + height: 20px; color: #333333; border-radius: 50%; transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s; diff --git a/public/themes/nova-vue/theme.css b/public/themes/nova-vue/theme.css index 94247d080..4b0554579 100644 --- a/public/themes/nova-vue/theme.css +++ b/public/themes/nova-vue/theme.css @@ -874,8 +874,8 @@ .p-radiobutton .p-radiobutton-box { border: 1px solid #a6a6a6; background: #ffffff; - width: 1.5rem; - height: 1.5rem; + width: 20px; + height: 20px; color: #333333; border-radius: 50%; transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s; diff --git a/public/themes/rhea/theme.css b/public/themes/rhea/theme.css index f400020ab..6dd58bec1 100644 --- a/public/themes/rhea/theme.css +++ b/public/themes/rhea/theme.css @@ -874,8 +874,8 @@ .p-radiobutton .p-radiobutton-box { border: 1px solid #dadada; background: #f4f4f4; - width: 1.5rem; - height: 1.5rem; + width: 20px; + height: 20px; color: #666666; border-radius: 50%; transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s; diff --git a/public/themes/saga-blue/theme.css b/public/themes/saga-blue/theme.css index 9aa4091f0..ecf384f95 100644 --- a/public/themes/saga-blue/theme.css +++ b/public/themes/saga-blue/theme.css @@ -868,8 +868,8 @@ } .p-radiobutton { - width: 20px; - height: 20px; + width: 1.5rem; + height: 1.5rem; } .p-radiobutton .p-radiobutton-box { border: 1px solid #ced4da; diff --git a/public/themes/saga-cyan/theme.css b/public/themes/saga-cyan/theme.css index ba3b1dd8d..71aa8e078 100644 --- a/public/themes/saga-cyan/theme.css +++ b/public/themes/saga-cyan/theme.css @@ -868,8 +868,8 @@ } .p-radiobutton { - width: 20px; - height: 20px; + width: 1.5rem; + height: 1.5rem; } .p-radiobutton .p-radiobutton-box { border: 1px solid #ced4da; diff --git a/public/themes/saga-deeppurple/theme.css b/public/themes/saga-deeppurple/theme.css index a89e9fe5b..71bdf0e17 100644 --- a/public/themes/saga-deeppurple/theme.css +++ b/public/themes/saga-deeppurple/theme.css @@ -868,8 +868,8 @@ } .p-radiobutton { - width: 20px; - height: 20px; + width: 1.5rem; + height: 1.5rem; } .p-radiobutton .p-radiobutton-box { border: 1px solid #ced4da; diff --git a/public/themes/saga-green/theme.css b/public/themes/saga-green/theme.css index 572e692f7..ea73b6ab2 100644 --- a/public/themes/saga-green/theme.css +++ b/public/themes/saga-green/theme.css @@ -868,8 +868,8 @@ } .p-radiobutton { - width: 20px; - height: 20px; + width: 1.5rem; + height: 1.5rem; } .p-radiobutton .p-radiobutton-box { border: 1px solid #ced4da; diff --git a/public/themes/saga-indigo/theme.css b/public/themes/saga-indigo/theme.css index 5e8231dd6..8f875b2d8 100644 --- a/public/themes/saga-indigo/theme.css +++ b/public/themes/saga-indigo/theme.css @@ -868,8 +868,8 @@ } .p-radiobutton { - width: 20px; - height: 20px; + width: 1.5rem; + height: 1.5rem; } .p-radiobutton .p-radiobutton-box { border: 1px solid #ced4da; diff --git a/public/themes/saga-orange/theme.css b/public/themes/saga-orange/theme.css index ac94d6bf4..38e9a587e 100644 --- a/public/themes/saga-orange/theme.css +++ b/public/themes/saga-orange/theme.css @@ -868,8 +868,8 @@ } .p-radiobutton { - width: 20px; - height: 20px; + width: 1.5rem; + height: 1.5rem; } .p-radiobutton .p-radiobutton-box { border: 1px solid #ced4da; diff --git a/public/themes/saga-purple/theme.css b/public/themes/saga-purple/theme.css index 34765c6ef..1f2306aed 100644 --- a/public/themes/saga-purple/theme.css +++ b/public/themes/saga-purple/theme.css @@ -868,8 +868,8 @@ } .p-radiobutton { - width: 20px; - height: 20px; + width: 1.5rem; + height: 1.5rem; } .p-radiobutton .p-radiobutton-box { border: 1px solid #ced4da; diff --git a/public/themes/saga-teal/theme.css b/public/themes/saga-teal/theme.css index 6d2c11cac..36183658a 100644 --- a/public/themes/saga-teal/theme.css +++ b/public/themes/saga-teal/theme.css @@ -868,8 +868,8 @@ } .p-radiobutton { - width: 20px; - height: 20px; + width: 1.5rem; + height: 1.5rem; } .p-radiobutton .p-radiobutton-box { border: 1px solid #ced4da; diff --git a/public/themes/vela-blue/theme.css b/public/themes/vela-blue/theme.css index 0db413cc8..cfa57dd33 100644 --- a/public/themes/vela-blue/theme.css +++ b/public/themes/vela-blue/theme.css @@ -868,8 +868,8 @@ } .p-radiobutton { - width: 20px; - height: 20px; + width: 1.5rem; + height: 1.5rem; } .p-radiobutton .p-radiobutton-box { border: 1px solid #2C3E50; diff --git a/public/themes/vela-cyan/theme.css b/public/themes/vela-cyan/theme.css index 3db25a8e1..50bad29cb 100644 --- a/public/themes/vela-cyan/theme.css +++ b/public/themes/vela-cyan/theme.css @@ -868,8 +868,8 @@ } .p-radiobutton { - width: 20px; - height: 20px; + width: 1.5rem; + height: 1.5rem; } .p-radiobutton .p-radiobutton-box { border: 1px solid #2C3E50; diff --git a/public/themes/vela-deeppurple/theme.css b/public/themes/vela-deeppurple/theme.css index f6e540494..7f1c136f0 100644 --- a/public/themes/vela-deeppurple/theme.css +++ b/public/themes/vela-deeppurple/theme.css @@ -868,8 +868,8 @@ } .p-radiobutton { - width: 20px; - height: 20px; + width: 1.5rem; + height: 1.5rem; } .p-radiobutton .p-radiobutton-box { border: 1px solid #2C3E50; diff --git a/public/themes/vela-green/theme.css b/public/themes/vela-green/theme.css index 9eebad49f..efff02749 100644 --- a/public/themes/vela-green/theme.css +++ b/public/themes/vela-green/theme.css @@ -868,8 +868,8 @@ } .p-radiobutton { - width: 20px; - height: 20px; + width: 1.5rem; + height: 1.5rem; } .p-radiobutton .p-radiobutton-box { border: 1px solid #2C3E50; diff --git a/public/themes/vela-indigo/theme.css b/public/themes/vela-indigo/theme.css index 641079f3d..18a132d53 100644 --- a/public/themes/vela-indigo/theme.css +++ b/public/themes/vela-indigo/theme.css @@ -868,8 +868,8 @@ } .p-radiobutton { - width: 20px; - height: 20px; + width: 1.5rem; + height: 1.5rem; } .p-radiobutton .p-radiobutton-box { border: 1px solid #2C3E50; diff --git a/public/themes/vela-orange/theme.css b/public/themes/vela-orange/theme.css index 8fd64817b..fb14ebdeb 100644 --- a/public/themes/vela-orange/theme.css +++ b/public/themes/vela-orange/theme.css @@ -868,8 +868,8 @@ } .p-radiobutton { - width: 20px; - height: 20px; + width: 1.5rem; + height: 1.5rem; } .p-radiobutton .p-radiobutton-box { border: 1px solid #2C3E50; diff --git a/public/themes/vela-purple/theme.css b/public/themes/vela-purple/theme.css index 6969683a7..cdf44647b 100644 --- a/public/themes/vela-purple/theme.css +++ b/public/themes/vela-purple/theme.css @@ -868,8 +868,8 @@ } .p-radiobutton { - width: 20px; - height: 20px; + width: 1.5rem; + height: 1.5rem; } .p-radiobutton .p-radiobutton-box { border: 1px solid #2C3E50; diff --git a/public/themes/vela-teal/theme.css b/public/themes/vela-teal/theme.css index f0b3212c9..b5f17c7e0 100644 --- a/public/themes/vela-teal/theme.css +++ b/public/themes/vela-teal/theme.css @@ -868,8 +868,8 @@ } .p-radiobutton { - width: 20px; - height: 20px; + width: 1.5rem; + height: 1.5rem; } .p-radiobutton .p-radiobutton-box { border: 1px solid #2C3E50; diff --git a/src/components/calendar/Calendar.vue b/src/components/calendar/Calendar.vue index 5b7e3a67d..15d3d01c0 100755 --- a/src/components/calendar/Calendar.vue +++ b/src/components/calendar/Calendar.vue @@ -2136,10 +2136,10 @@ export default { return this.currentHour < 10 ? '0' + this.currentHour : this.currentHour; }, formattedCurrentMinute() { - return this.currentHour < 10 ? '0' + this.currentHour : this.currentHour; + return this.currentMinute < 10 ? '0' + this.currentMinute : this.currentMinute; }, formattedCurrentSecond() { - return this.currentHour < 10 ? '0' + this.currentHour : this.currentHour; + return this.currentSecond < 10 ? '0' + this.currentSecond : this.currentSecond; } }, components: { diff --git a/src/views/inputgroup/InputGroupDemo.vue b/src/views/inputgroup/InputGroupDemo.vue index 38fe9aaec..a4b69cf2d 100755 --- a/src/views/inputgroup/InputGroupDemo.vue +++ b/src/views/inputgroup/InputGroupDemo.vue @@ -79,7 +79,7 @@

Checkbox and RadioButton

-
+
@@ -88,7 +88,7 @@
-
+
@@ -97,7 +97,7 @@
-
+