ustyle 1.6.1 → 1.7.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,4 +1,4 @@
1
1
  module Ustyle
2
- version = "1.6.1"
2
+ version = "1.7.0"
3
3
  VERSION = version
4
4
  end
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ustyle",
3
- "version": "1.6.1",
3
+ "version": "1.7.0",
4
4
  "description": "A living styleguide and pattern library by uSwitch.",
5
5
  "keywords": [
6
6
  "css",
@@ -19,29 +19,6 @@
19
19
 
20
20
  $input-placeholder-color: $c-inputgrey !default;
21
21
 
22
- /// Creates a larger version of a form input, allows us to set the styles
23
- /// in a responsive manner
24
- ///
25
- /// @author David Annez
26
- /// @group Forms
27
- ///
28
- /// @param {String} $input-size [base]
29
- /// Name of the size used in the form element list
30
- ///
31
- /// @param {List} $input-sizes [$form-element-sizes]
32
- /// List of sizes to pass through. Should contain 4 values per item,
33
- /// `(size-name, height, padding, font-size)`
34
-
35
- @mixin input-sizing($input-size: base, $input-sizes: $form-element-sizes) {
36
- @each $size in $input-sizes {
37
- @if nth($size, 1) == $input-size {
38
- height: nth($size, 2);
39
- padding: nth($size, 3);
40
- font-size: nth($size, 4);
41
- }
42
- }
43
- }
44
-
45
22
  .us-form-input {
46
23
  @extend %base-form-element;
47
24
  @extend %input-background--normalise;
@@ -21,7 +21,6 @@
21
21
  // <option>And a few more</option>
22
22
  // </select>
23
23
 
24
- $select-base-padding: 5px 10px !default;
25
24
  $select-default-color: $c-form-element-border !default;
26
25
  $select-hover-color: $c-form-element-border-hover !default;
27
26
 
@@ -47,8 +46,8 @@ $select-hover-color: $c-form-element-border-hover !default;
47
46
  .us-form-select {
48
47
  @extend %base-form-element;
49
48
  @include select-background($select-default-color, $select-hover-color);
49
+ @include input-sizing();
50
50
  max-width: 100%;
51
- padding: $select-base-padding;
52
51
  padding-right: 40px;
53
52
  cursor: pointer;
54
53
  background-position: 100% 50%;
@@ -74,7 +73,7 @@ $select-hover-color: $c-form-element-border-hover !default;
74
73
 
75
74
  .ie8 &,
76
75
  .ie9 & {
77
- padding: $select-base-padding;
76
+ padding: $form-element-base-padding;
78
77
  }
79
78
  }
80
79
 
@@ -85,7 +84,6 @@ $select-hover-color: $c-form-element-border-hover !default;
85
84
  &,
86
85
  .us-form-select {
87
86
  height: auto;
88
- padding: $select-base-padding;
89
87
  overflow: hidden {
90
88
  x: auto;
91
89
  y: auto;
@@ -38,15 +38,12 @@
38
38
  // </div>
39
39
 
40
40
  $toggle-btn-padding: 5px 30px !default;
41
- $toggle-default-bg: #fff !default;
42
- $toggle-default-border: $c-bordergrey !default;
43
- $toggle-hover-border: $c-typecyan !default;
44
41
  $toggle-active-bg: $c-cyan-light !default;
45
- $toggle-active-border: $c-typecyan !default;
46
42
 
47
43
  @mixin toggle-active-style {
48
44
  background: $toggle-active-bg;
49
- border-color: $toggle-active-border;
45
+ border-color: $c-form-element-border-hover;
46
+ text-shadow: 1px 0 0 $c-form-element-text;
50
47
  }
51
48
 
52
49
  @mixin toggle-disabled-style {
@@ -88,16 +85,16 @@ $toggle-active-border: $c-typecyan !default;
88
85
  color: $c-form-element-text;
89
86
  text-align: center;
90
87
  background-color: $c-form-element-background;
91
- border: 1px solid $toggle-default-border;
88
+ border: 1px solid $c-form-element-border;
92
89
 
93
90
  .us-toggle__label:hover & {
94
- border-color: $toggle-hover-border;
91
+ border-color: $c-form-element-border-hover;
95
92
  }
96
93
 
97
94
  .us-toggle__label:focus &,
98
95
  .us-toggle__label .us-form-input:focus + & {
99
- border-color: $toggle-hover-border;
100
- box-shadow: inset 0 0 0 1px $toggle-hover-border;
96
+ border-color: $c-form-element-border-hover;
97
+ box-shadow: inset 0 0 0 1px $c-form-element-border-hover;
101
98
  }
102
99
 
103
100
  // [nodoc] Legacy, as grouping selectors will fail on pseudo-selector :checked
@@ -60,3 +60,26 @@
60
60
  box-shadow: none;
61
61
  }
62
62
  }
63
+
64
+ /// Creates a larger version of a form input, allows us to set the styles
65
+ /// in a responsive manner
66
+ ///
67
+ /// @author David Annez
68
+ /// @group Forms
69
+ ///
70
+ /// @param {String} $input-size [base]
71
+ /// Name of the size used in the form element list
72
+ ///
73
+ /// @param {List} $input-sizes [$form-element-sizes]
74
+ /// List of sizes to pass through. Should contain 4 values per item,
75
+ /// `(size-name, height, padding, font-size)`
76
+
77
+ @mixin input-sizing($input-size: base, $input-sizes: $form-element-sizes) {
78
+ @each $size in $input-sizes {
79
+ @if nth($size, 1) == $input-size {
80
+ height: nth($size, 2);
81
+ padding: nth($size, 3);
82
+ font-size: nth($size, 4);
83
+ }
84
+ }
85
+ }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ustyle
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.1
4
+ version: 1.7.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - uSwitch Limited
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2016-09-09 00:00:00.000000000 Z
16
+ date: 2016-10-04 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: sass