weui-rails 1.1.1.1 → 1.1.2

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: 4ecba9e2def3dac7f2e2de64f9c39c8ac19069d4
4
- data.tar.gz: 93fc9e9916e0562bc494a125d767e88a1f79a314
3
+ metadata.gz: 3d6ad90975aeb16eefbb1bbbc18029d044c21e28
4
+ data.tar.gz: c6fa357583b436785ec51a098f350861c8c29c16
5
5
  SHA512:
6
- metadata.gz: 0d1d49a8c2a0fcb09eef0d631bf4f5e80a6a58a7477c2ac015464809f941b7b4d946aff8bd9000d28097666f22d331f0fff409a7834fd3da9d0381202656e64d
7
- data.tar.gz: d789fa61b7f539d6b163bc0c904c04155d5fa3dd2d77a788cd5bd78cf937651ef563b0d86e9ec3bf4182a1f74ce410829069606ac47b4c9cfa44b87fda9d8f21
6
+ metadata.gz: b4a986dd77700a519f34b6ec1c1f8634d24a0395d34849798e8ea22997d8a881455932a7a50734668f82240e2d04060b47fd5e3eee04e656e54d746f6112f8c3
7
+ data.tar.gz: 3ffbe3d9aadde20bade12ac14074169f13f6ff6163173b102d453bf9994bfb957002e9219dd8b609cfd910a7d7fd19788027bd5643d1f53252af677980792e23
@@ -1,5 +1,5 @@
1
1
  module Weui
2
2
  module Rails
3
- VERSION = '1.1.1.1'
3
+ VERSION = '1.1.2'
4
4
  end
5
5
  end
@@ -9,6 +9,7 @@
9
9
 
10
10
  // cell
11
11
  @import "widget/weui-cell/weui-cell_global";
12
+ @import "widget/weui-cell/weui-cell_swiped";
12
13
 
13
14
  @import "widget/weui-cell/weui-access";
14
15
  @import "widget/weui-cell/weui-check";
@@ -1,14 +1,14 @@
1
1
  $weuiCellBg:#FFFFFF !default;
2
- $weuiCellBorderColor:#D9D9D9 !default;
2
+ $weuiCellBorderColor:#e5e5e5 !default;
3
3
  $weuiCellGapV:10px !default;
4
4
  $weuiCellGapH:15px !default;
5
5
  $weuiCellInnerGapH:.35em !default;
6
- $weuiCellHeight: 44px !default;
6
+ $weuiCellHeight: 45px !default;
7
7
  $weuiCellFontSize:17px !default;
8
8
  $weuiCellTipsFontSize:14px !default;
9
9
  $weuiCellLabelWidth:105px !default;
10
10
 
11
- $weuiCellLineHeight: ($weuiCellHeight - 2 * $weuiCellGapV) / $weuiCellFontSize !default; // 高度为44px,减去上下padding的行高
11
+ $weuiCellLineHeight: ($weuiCellHeight - 2 * $weuiCellGapV) / $weuiCellFontSize !default; // 高度减去上下padding的行高
12
12
  $weuiCellsMarginTop: 20 / ($weuiCellFontSize / ($weuiCellFontSize * 0 + 1)) + em !default;
13
13
 
14
14
  // weui switch
@@ -4,16 +4,13 @@
4
4
  .#{$weui_ns}loading {
5
5
  margin:-.2em .34em 0 0;
6
6
  }
7
- &.#{$weui_ns}btn_primary, &.#{$weui_ns}btn_warn {
8
- color: $weuiBtnActiveFontColor;
9
- .#{$weui_ns}loading{
10
- background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect xmlns='http://www.w3.org/2000/svg' width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.56)' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.5)' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.43)' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.38)' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.32)' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.28)' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.25)' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.2)' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.17)' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.14)' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.1)' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.03)' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E");
11
- }
12
- }
7
+ &.#{$weui_ns}btn_primary, &.#{$weui_ns}btn_warn {
8
+ color: $weuiBtnActiveFontColor;
9
+ }
13
10
  &.#{$weui_ns}btn_primary{
14
- background-color: $weuiBtnPrimaryActiveBg;
11
+ background-color: $weuiBtnPrimaryActiveBg;
15
12
  }
16
13
  &.#{$weui_ns}btn_warn{
17
- background-color: $weuiBtnWarnActiveBg;
14
+ background-color: $weuiBtnWarnActiveBg;
18
15
  }
19
16
  }
@@ -1,5 +1,12 @@
1
1
  @import "../../base/fn";
2
2
 
3
+ /*
4
+ z-index:
5
+ 0: .weui-swiped-btn
6
+ 1: .weui-cell_swiped .weui-cell__bd
7
+ 2: .weui-cells和.weui-cell的1px线
8
+ */
9
+
3
10
  .#{$weui_ns}cells {
4
11
  margin-top: $weuiCellsMarginTop;
5
12
  background-color: $weuiCellBg;
@@ -12,9 +19,11 @@
12
19
  position: relative;
13
20
  &:before {
14
21
  @include setTopLine($weuiCellBorderColor);
22
+ z-index: 2;
15
23
  }
16
24
  &:after {
17
25
  @include setBottomLine($weuiCellBorderColor);
26
+ z-index: 2;
18
27
  }
19
28
  }
20
29
 
@@ -47,6 +56,7 @@
47
56
  &:before {
48
57
  @include setTopLine($weuiCellBorderColor);
49
58
  left: $weuiCellGapH;
59
+ z-index: 2;
50
60
  }
51
61
  &:first-child {
52
62
  &:before {
@@ -63,4 +73,4 @@
63
73
  .#{$weui_ns}cell__ft {
64
74
  text-align: right;
65
75
  color: $weuiTextColorGray;
66
- }
76
+ }
@@ -0,0 +1,31 @@
1
+ @import "../../base/fn";
2
+
3
+ .weui-cell_swiped {
4
+ display: block;
5
+ padding: 0;
6
+ > .weui-cell__bd {
7
+ position: relative;
8
+ z-index: 1;
9
+ background-color: #FFFFFF;
10
+ }
11
+ > .weui-cell__ft {
12
+ position: absolute;
13
+ right: 0;
14
+ top: 0;
15
+ bottom: 0;
16
+ display: flex;
17
+ color: #FFFFFF;
18
+ }
19
+ }
20
+ .weui-swiped-btn {
21
+ display: block;
22
+ padding: $weuiCellGapV 1em;
23
+ line-height: $weuiCellLineHeight;
24
+ color: inherit;
25
+ }
26
+ .weui-swiped-btn_default {
27
+ background-color: #C7C7CC;
28
+ }
29
+ .weui-swiped-btn_warn {
30
+ background-color: #FF3B30;
31
+ }
@@ -35,7 +35,7 @@
35
35
  position: relative;
36
36
  line-height: 50px;
37
37
  display: flex;
38
- &:after {
38
+ &:before {
39
39
  @include setTopLine($weuiDialogLineColor);
40
40
  }
41
41
  }
@@ -87,4 +87,4 @@
87
87
  }
88
88
  .#{$weui_ns}form-preview__btn_primary {
89
89
  color: #0BB20C;
90
- }
90
+ }
@@ -1,15 +1,18 @@
1
1
  @import "../../base/fn";
2
2
 
3
3
  .#{$weui_ns}loading {
4
- width:20px;
5
- height:20px;
4
+ width: 20px;
5
+ height: 20px;
6
6
  display: inline-block;
7
7
  vertical-align: middle;
8
8
  animation: weuiLoading 1s steps(12, end) infinite;
9
9
  background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;
10
10
  background-size: 100%;
11
- &.weui-loading_transparent {
12
- background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect xmlns='http://www.w3.org/2000/svg' width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.56)' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.5)' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.43)' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.38)' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.32)' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.28)' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.25)' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.2)' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.17)' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.14)' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.1)' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.03)' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E");
11
+ &.weui-loading_transparent,
12
+ .weui-btn_loading.weui-btn_primary &,
13
+ .weui-btn_loading.weui-btn_warn &
14
+ {
15
+ background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect xmlns='http://www.w3.org/2000/svg' width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.56)' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.5)' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.43)' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.38)' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.32)' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.28)' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.25)' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.2)' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.17)' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.14)' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.1)' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.03)' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E");
13
16
  }
14
17
  }
15
18
 
@@ -15,10 +15,11 @@ $pickerItemHeight: 34px;
15
15
 
16
16
  .#{$weui_ns}picker__hd {
17
17
  display: flex;
18
- padding: 10px 15px;
19
- background-color: #fbf9fe;
18
+ padding: 9px 15px;
19
+ background-color: #fff;
20
20
  position: relative;
21
21
  text-align: center;
22
+ font-size: 17px;
22
23
  &:after {
23
24
  @include setBottomLine($weuiLineColorLight);
24
25
  }
@@ -102,4 +103,4 @@ $pickerItemHeight: 34px;
102
103
 
103
104
  .#{$weui_ns}picker__item_disabled {
104
105
  color: $weuiTextColorGray;
105
- }
106
+ }
@@ -13,12 +13,31 @@ $weuiActionSheetAndroidBorderRadius: 2px;
13
13
  //slide up animation
14
14
  transition: transform .3s;
15
15
  }
16
+ .#{$weui_ns}actionsheet__title {
17
+ position: relative;
18
+ height: 65px;
19
+ padding: 0 20px;
20
+ line-height: 1.4;
21
+ display: flex;
22
+ justify-content: center;
23
+ flex-direction: column;
24
+ text-align: center;
25
+ font-size: 14px;
26
+ color: #888;
27
+ background: #FCFCFD;
28
+ &:before {
29
+ @include setBottomLine($weuiCellBorderColor);
30
+ }
31
+ .weui-actionsheet__title-text {
32
+ @include ellipsisLn(2);
33
+ }
34
+ }
16
35
  .#{$weui_ns}actionsheet__menu{
17
- background-color: #FFFFFF;
36
+ background-color: #FCFCFD;
18
37
  }
19
38
  .#{$weui_ns}actionsheet__action {
20
39
  margin-top: 6px;
21
- background-color: #FFFFFF;
40
+ background-color: #FCFCFD;
22
41
  }
23
42
  .#{$weui_ns}actionsheet__cell {
24
43
  position: relative;
@@ -81,4 +100,4 @@ $weuiActionSheetAndroidBorderRadius: 2px;
81
100
  //actionSheet aniamtion
82
101
  .#{$weui_ns}actionsheet_toggle{
83
102
  transform: translate(0, 0);
84
- }
103
+ }
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: weui-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.1.1
4
+ version: 1.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Eric Guo
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-04-13 00:00:00.000000000 Z
11
+ date: 2017-05-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sass
@@ -84,6 +84,7 @@ files:
84
84
  - vendor/assets/stylesheets/widget/weui-button/_weui-button.scss
85
85
  - vendor/assets/stylesheets/widget/weui-cell/_weui-access.scss
86
86
  - vendor/assets/stylesheets/widget/weui-cell/_weui-cell_global.scss
87
+ - vendor/assets/stylesheets/widget/weui-cell/_weui-cell_swiped.scss
87
88
  - vendor/assets/stylesheets/widget/weui-cell/_weui-check.scss
88
89
  - vendor/assets/stylesheets/widget/weui-cell/_weui-form.scss
89
90
  - vendor/assets/stylesheets/widget/weui-cell/_weui-gallery.scss
@@ -139,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
139
140
  version: '0'
140
141
  requirements: []
141
142
  rubyforge_project:
142
- rubygems_version: 2.6.11
143
+ rubygems_version: 2.6.12
143
144
  signing_key:
144
145
  specification_version: 4
145
146
  summary: An UI library for WeChat