timepiece 0.2.4 → 0.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3ed139f43c37e7dd7143b0403e788aeec7efe5e1
4
- data.tar.gz: 5bdec9dae596a264d26dbafda3bd82192f28e0ec
3
+ metadata.gz: 523a99318876fb8974ab2428ee6a2ba8034867cb
4
+ data.tar.gz: babb089acb6ec852f939fc826611e8f2317e61bd
5
5
  SHA512:
6
- metadata.gz: 3610230ae56ec3c4d101d664536513b068c43c549df98e221c6eecb8564f67349384f911f33080f8788d6a33a8460579ba6dd3e2d8005c10a87b6d7ac14902ae
7
- data.tar.gz: 85e1fa6679cb20aef38b33c1274fdfa313782dc328232da5578c43006065d10fef56d087412fdea63628a3ac8f72dcc6cac24e564e53ac5abb480981f65e492e
6
+ metadata.gz: af32caa504ab41c39b8a8a101360c10a8fe7a410bd1baea1f304464c1a476ca1cf0567b5eba2e2dd154a2fdeaddfa76bd8d7ce3385501cebeada769beaef50b8
7
+ data.tar.gz: c088171332d78c678bc3485cfd156219134b5bbb836e9c2f686b06c92e66ecc9b2139490ccc8a4ee4568d2f8ea5d29babc7e73221aa9f8b7cbf8d4ec66933d18
@@ -40,6 +40,11 @@
40
40
  }
41
41
  }
42
42
  $(".timepiece-analog").each(function(i, e){
43
+ if(analog_hours[i] >= 12){
44
+ abbr = 'pm'
45
+ }else if(analog_hours[i] < 12){
46
+ abbr = 'am'
47
+ }
43
48
  if(analog_hours[i] >= 6 && analog_hours[i] < 18){
44
49
  $(e).addClass('timepiece-analog-day')
45
50
  $(e).removeClass('timepiece-analog-night')
@@ -63,6 +68,7 @@
63
68
  $('.timepiece-hours-container', $(e)).css({'-ms-transform':'rotateZ(' + $(e).data('hours_angle') + 'deg)','-webkit-transform':'rotateZ(' + $(e).data('hours_angle') + 'deg)','transform':'rotateZ(' + $(e).data('hours_angle') + 'deg)'}); // angle set on each
64
69
  $('.timepiece-minutes-container', $(e)).css({'-ms-transform':'rotateZ(' + $(e).data('minutes_angle') + 'deg)','-webkit-transform':'rotateZ(' + $(e).data('minutes_angle') + 'deg)','transform':'rotateZ(' + $(e).data('minutes_angle') + 'deg)'});
65
70
  $('.timepiece-seconds-container', $(e)).css({'-ms-transform':'rotateZ(' + $(e).data('seconds_angle') + 'deg)','-webkit-transform':'rotateZ(' + $(e).data('seconds_angle') + 'deg)','transform':'rotateZ(' + $(e).data('seconds_angle') + 'deg)'});
71
+ $('.timepiece-analog-abbr', $(e)).html(abbr);
66
72
  })
67
73
  })
68
74
  }, 1000)
@@ -24,12 +24,26 @@
24
24
  z-index: 10;
25
25
  }
26
26
 
27
+ .timepiece-analog-abbr {
28
+ color: #333;
29
+ font-family:Helvetica,Arial,sans-serif;
30
+ font-size:1.25em;
31
+ position: absolute;
32
+ left: 25%;
33
+ top: 50%;
34
+ -ms-transform: translate(-50%, -50%);
35
+ -webkit-transform: translate(-50%, -50%);
36
+ transform: translate(-50%, -50%);
37
+ z-index: 3;
38
+ }
39
+
27
40
  .timepiece-minutes-container, .timepiece-hours-container, .timepiece-seconds-container {
28
41
  position: absolute;
29
42
  top: 0;
30
43
  right: 0;
31
44
  bottom: 0;
32
45
  left: 0;
46
+ z-index:5;
33
47
  }
34
48
 
35
49
  .timepiece-analog-hours {
@@ -98,6 +112,13 @@
98
112
  background: #333;
99
113
  }
100
114
 
115
+ .timepiece-analog-day .timepiece-analog-abbr {
116
+ color: #333;
117
+ }
118
+
119
+ .timepiece-analog-night .timepiece-analog-abbr {
120
+ color: #eee;
121
+ }
101
122
 
102
123
  .timepiece-analog-night{
103
124
  /* border-color:#222; */
@@ -50,12 +50,18 @@ module TimepieceHelper
50
50
  else
51
51
  time_of_day_class = 'timepiece-analog-night'
52
52
  end
53
+ if hours.to_i >= 12
54
+ var = 'pm'
55
+ elsif hours.to_i < 12
56
+ var = 'am'
57
+ end
53
58
  hours_angle = (hours.to_i * 30) + (minutes.to_i / 2)
54
59
  minutes_angle = minutes.to_i * 6
55
60
  seconds_angle = seconds.to_i * 6
56
61
  time = "<div class='timepiece-hours-container' style='-ms-transform:rotateZ(#{hours_angle}deg);-webkit-transform:rotateZ(#{hours_angle}deg);transform:rotateZ(#{hours_angle}deg);'><div class='timepiece-analog-hours'></div></div>"\
57
62
  "<div class='timepiece-minutes-container' style='-ms-transform:rotateZ(#{minutes_angle}deg);-webkit-transform:rotateZ(#{minutes_angle}deg);transform:rotateZ(#{minutes_angle}deg);'><div class='timepiece-analog-minutes'></div></div>"\
58
- "<div class='timepiece-seconds-container' style='-ms-transform:rotateZ(#{seconds_angle}deg);-webkit-transform:rotateZ(#{seconds_angle}deg);transform:rotateZ(#{seconds_angle}deg);'><div class='timepiece-analog-seconds'></div></div>"
63
+ "<div class='timepiece-seconds-container' style='-ms-transform:rotateZ(#{seconds_angle}deg);-webkit-transform:rotateZ(#{seconds_angle}deg);transform:rotateZ(#{seconds_angle}deg);'><div class='timepiece-analog-seconds'></div></div>"\
64
+ "<div class='timepiece-analog-abbr'>" + var + "</div>"
59
65
  content_tag(:div, time.html_safe, class: 'timepiece-analog ' + time_of_day_class, 'data-timezone' => location, 'id' => (id unless id.blank?), 'style' => 'width:' + size + ';padding-bottom:' + size + ';')
60
66
  end
61
67
 
@@ -1,3 +1,3 @@
1
1
  module Timepiece
2
- VERSION = "0.2.4"
2
+ VERSION = "0.2.5"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: timepiece
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.4
4
+ version: 0.2.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thom Bruce