tenon 1.0.49 → 1.0.50

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 619780ee5084625b9e5fdb2c3fce7dbbfb582a5a
4
- data.tar.gz: 30c4d7fcba7d142b1d534c561b3de368b87f4e1d
3
+ metadata.gz: 54502b6fa4022f3091a7992df0d05a1ff26363e9
4
+ data.tar.gz: 595f43bba44bd2f4ccb25ce826394128b9f0a4ce
5
5
  SHA512:
6
- metadata.gz: cf68bb7c4e5b4ae5b8977e47ed9135cccf45a6431205224c937199f426974b8b4619cac70ebbc372fbc66d3cb0bb0ff12c0ae7f21c678c18950d4731c2c9769f
7
- data.tar.gz: c52fd8a04e4ea4a51c5bdde748edef569e30047401d7d3348cb5c550915352037182d369a8deed06e82eed10c17922bbd95fa5f65a96dd3ef4e87feb8f8d231e
6
+ metadata.gz: b578dd52ba9a5d31ac24e7b23939d24fb917603d8a5605c677574ad0a7dec581375c71e1224926cdbfe983fb32976e426c29e2b7d1eec10e7e759872473f40a9
7
+ data.tar.gz: 2be9569450c5c3bf1cb76536c28459517aa9e04cae3bd00616ba9bdeea52290b20d244294130764b90752cdadcb5d663208a5f988f317d372cb3d86e0bb7ed49
@@ -1,58 +1,73 @@
1
- @mixin styled-checkbox($unchecked: "\f10c", $checked: "\f058", $active: inherit, $hover: inherit, $font-family: "FontAwesome", $float: none, $unchecked-color: $tn-grey, $checked-color: $tn-primary, $active-color: inherit, $hover-color: inherit) {
1
+ @mixin styled-checkbox($unchecked: '\f10c', $checked: '\f058', $font-family: 'FontAwesome', $float: none, $unchecked-color: $tn-grey, $checked-color: $tn-primary) {
2
2
  position: absolute;
3
- z-index: 5;
3
+ z-index: 0;
4
4
  opacity: 0;
5
- width: 100%;
5
+ float: none;
6
6
  cursor: pointer;
7
-
8
7
  & + label {
9
- display: inline;
8
+ position: relative;
9
+ display: block;
10
10
  cursor: pointer;
11
-
11
+ padding: 2px;
12
+ @if $float == left {
13
+ padding-left: 30px;
14
+ }
12
15
  &:before {
13
- float: $float;
14
- padding: 0 2px;
15
- color: $unchecked-color;
16
+ font-family: $font-family;
17
+ font-size: 20px;
18
+ position: absolute;
19
+ z-index: 10;
20
+ top: 2px;
21
+ display: block;
22
+ width: auto;
16
23
  content: $unchecked;
17
- font: 22px $font-family;
18
24
  cursor: pointer;
19
-
20
- @if $float == none {
21
- padding: 6px;
25
+ color: $unchecked-color;
26
+ @if $float == right {
27
+ right: 2px;
28
+ }
29
+ @if $float == left {
30
+ left: 2px;
22
31
  }
23
32
  }
24
33
  }
25
-
26
34
  &:checked + label:before {
27
- color: $checked-color;
28
35
  content: $checked;
36
+ color: $checked-color;
29
37
  }
30
-
31
- &:focus + label:before {
32
- outline: 1px dotted $checked-color;
33
- content: $active;
34
-
35
- @if $active-color != inherit {
36
- color: $active-color;
38
+ &:hover + label:before {
39
+ color: lighten($checked-color, 10%);
40
+ }
41
+ &:focus + label {
42
+ border: 1px dotted lighten($unchecked-color, 10%);
43
+ padding: 1px;
44
+ @if $float == left {
45
+ padding-left: 29px;
46
+ }
47
+ &:before {
48
+ top: 1px;
49
+ @if $float == right {
50
+ right: 1px;
51
+ }
52
+ @if $float == left {
53
+ left: 1px;
54
+ }
37
55
  }
56
+
38
57
  }
39
58
  }
40
59
 
41
60
  @mixin button($border-color, $background-color, $color, $highlight-border-color, $highlight-background-color) {
42
- @include transition(all 0.2s ease);
61
+ @include transition(all .2s ease);
62
+ color: $color;
43
63
  border-color: $border-color;
44
64
  background-color: $background-color;
45
- color: $color;
46
65
  &:hover, &:focus, &:active, &.active {
66
+ color: $color;
47
67
  border-color: $highlight-border-color;
48
68
  background-color: $highlight-background-color;
49
- color: $color;
50
69
  }
51
- &.disabled,
52
- &.disabled:hover,
53
- &.disabled:focus,
54
- &.disabled:active,
55
- &.disabled.active {
70
+ &.disabled, &.disabled:hover, &.disabled:focus, &.disabled:active, &.disabled.active {
56
71
  border-color: $border-color;
57
72
  background-color: $background-color;
58
73
  }
@@ -64,4 +79,3 @@
64
79
  margin-right: 0;
65
80
  }
66
81
  }
67
-
@@ -9,6 +9,7 @@
9
9
 
10
10
  .form-group {
11
11
  clear: both;
12
+ position: relative;
12
13
  margin: $tn-margin 0;
13
14
 
14
15
  &:first-child {
@@ -56,15 +57,11 @@ input[type=text], input[type=password], input[type=email] {
56
57
  font-size: $tn-font-large;
57
58
  }
58
59
 
59
- .tn-checkbox {
60
- @include styled-checkbox;
61
- opacity: 0;
62
- }
63
-
64
60
  .tn-checkbox-right {
65
61
  @include styled-checkbox($float: right);
66
62
  }
67
63
 
64
+ .tn-checkbox,
68
65
  .tn-checkbox-left {
69
66
  @include styled-checkbox($float: left);
70
67
  }
@@ -75,18 +75,7 @@
75
75
  }
76
76
 
77
77
  .remember {
78
- display: inline-block;
79
- vertical-align: middle;
80
- width: 50%;
81
78
  position: relative;
82
-
83
- label {
84
- display: inline;
85
- &:before {
86
- position: relative;
87
- top: 3px;
88
- }
89
- }
90
79
  }
91
80
 
92
81
  input[type=text], input[type=password], input[type=email] {
@@ -14,8 +14,8 @@
14
14
  = f.password_field :password, placeholder: 'password'
15
15
 
16
16
  .row.bordered
17
- .remember
18
- = f.check_box :remember_me, class: 'tn-checkbox'
17
+ .remember.left
18
+ = f.check_box :remember_me, class: 'tn-checkbox-left'
19
19
  = f.label :remember_me, "Remember Me?"
20
20
 
21
21
  = f.submit "Login", :class => "btn btn-info"
data/lib/tenon/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Tenon
2
- VERSION = '1.0.49'
2
+ VERSION = '1.0.50'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tenon
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.49
4
+ version: 1.0.50
5
5
  platform: ruby
6
6
  authors:
7
7
  - factor[e] design initiative
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-12-15 00:00:00.000000000 Z
11
+ date: 2014-12-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: better_errors