QMUI_Sass 1.1.4 → 1.2.0

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: 5ee3b30bee7289d22b65d70fabdcaa7435d436ce
4
- data.tar.gz: f2adac22bf82757ebd77bd2771584900e5cc5441
3
+ metadata.gz: 1d4a628b4e6dc67087c887d4fb654dc32b22e0e3
4
+ data.tar.gz: f7c8166a18dc626d377d1b08395dd32b2eed4ea5
5
5
  SHA512:
6
- metadata.gz: c19a5e838a19741132f5371de90d0923c6754ed82878b65753bbf0e6d29fc1c2729112486fa1c8e0b12344860a5e95e69786af556fba307fe1fda21890a7f4a6
7
- data.tar.gz: b6c30746d3aa4510048948cefee79b6b08cb02397c72678618bd99954764272009b5ad73854c51189d29a2db581a4c61f2b7e7081852b30efca519b5c370852d
6
+ metadata.gz: a5e91a55addd56866d3012669bc0f8b46f50a85b73d284ad5d3b88e568bf636936b6a950ab6e1ca5c300b97b796482384d2dd90a38815cab70ab78dc4672f0f7
7
+ data.tar.gz: 31ab45e1e94a2e2d1f8c7d3bd45c4e7d586e019398b30c444615e9967a9a0ce226900c7e1bf37bbdb947b215c057087fd3a6f849c1bed2cdaddebd19383d23ff
data/.travis.yml CHANGED
@@ -7,8 +7,11 @@ node_js:
7
7
  - "7.0"
8
8
  - "8.0"
9
9
  - "stable"
10
+ before_install:
11
+ - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.12.3
12
+ - export PATH="$HOME/.yarn/bin:$PATH"
10
13
  before_script:
11
14
  - npm install -g node-sass
12
15
  - npm install
13
16
  script:
14
- - sh test/node_sass_compile_test.sh
17
+ - npm run test
data/Gemfile.lock CHANGED
@@ -1,11 +1,15 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- QMUI_Sass (1.1.0)
4
+ QMUI_Sass (1.2.0)
5
+ autoprefixer-rails (>= 6.0.3)
5
6
 
6
7
  GEM
7
8
  remote: https://rubygems.org/
8
9
  specs:
10
+ autoprefixer-rails (9.5.0)
11
+ execjs
12
+ execjs (2.7.0)
9
13
  rake (10.5.0)
10
14
 
11
15
  PLATFORMS
data/README.md CHANGED
@@ -34,15 +34,15 @@ Or install it yourself as:
34
34
 
35
35
  $ gem install QMUI_Sass
36
36
 
37
- Import Bootstrap styles:
37
+ Import QMUI Sass styles:
38
38
  ```sass
39
39
  @import "qmui"
40
40
  ```
41
41
 
42
- ### d. npm / Node.js
42
+ ### npm / Node.js
43
43
 
44
44
  ```bash
45
- $ npm install bootstrap-sass
45
+ $ npm install qmui-sass
46
46
  ```
47
47
 
48
48
  If you use webpack, you can import QMUI Sass like so:
@@ -30,11 +30,11 @@
30
30
  }
31
31
 
32
32
  .qui_txtOverflow {
33
- @extend %text_ellipsis;
33
+ @include text-ellipsis;
34
34
  }
35
35
 
36
36
  .qui_clear {
37
- @extend %clear;
37
+ @include clear;
38
38
  }
39
39
 
40
40
  .qui_txtNowrap {
@@ -23,98 +23,98 @@
23
23
  @import "mixin/tool/calculate";
24
24
 
25
25
  // #common 通用
26
- $common_fontFamily: "Helvetica Neue", Helvetica, Verdana, san-serif;
27
- $common_fontSize: 14px;
28
- $common_body_background: #FFF;
29
- $common_body_color: #000;
30
- $common_color_link: #2685D2;
31
- $common_color_linkTapHighlight: rgba(105, 186, 255, .13);
32
- $common_color_separator: #CCCCCE;
33
- $common_color_border: $common_color_separator;
34
- $common_color_placeholder: #ADB4BE;
35
- $common_color_placeholderFocus: $common_color_placeholder;
36
- $common_zIndex_1: 10;
37
- $common_zIndex_2: 20;
38
- $common_zIndex_3: 30;
39
- $common_zIndex_4: 40;
40
- $common_zIndex_5: 50;
41
- $common_zIndex_6: 60;
42
- $common_zIndex_7: 70;
43
- $common_zIndex_8: 80;
44
- $common_zIndex_9: 90;
45
- $common_zIndex_10: 100;
26
+ $common_fontFamily: "Helvetica Neue", Helvetica, Verdana, san-serif !default;
27
+ $common_fontSize: 14px !default;
28
+ $common_body_background: #FFF !default;
29
+ $common_body_color: #000 !default;
30
+ $common_color_link: #2685D2 !default;
31
+ $common_color_linkTapHighlight: rgba(105, 186, 255, .13) !default;
32
+ $common_color_separator: #CCCCCE !default;
33
+ $common_color_border: $common_color_separator !default;
34
+ $common_color_placeholder: #ADB4BE !default;
35
+ $common_color_placeholderFocus: $common_color_placeholder !default;
36
+ $common_zIndex_1: 10 !default;
37
+ $common_zIndex_2: 20 !default;
38
+ $common_zIndex_3: 30 !default;
39
+ $common_zIndex_4: 40 !default;
40
+ $common_zIndex_5: 50 !default;
41
+ $common_zIndex_6: 60 !default;
42
+ $common_zIndex_7: 70 !default;
43
+ $common_zIndex_8: 80 !default;
44
+ $common_zIndex_9: 90 !default;
45
+ $common_zIndex_10: 100 !default;
46
46
 
47
47
  // #button 按钮组件
48
- $btn_minWidth: 46px;
49
- $btn_height: 30px;
50
- $btn_lineHeight: $btn_height;
51
- $btn_padding: 0 12px;
52
- $btn_background: #04C9E8;
53
- $btn_border: 1px solid transparent;
54
- $btn_fontSize: 13px;
55
- $btn_color: #FFF;
48
+ $btn_minWidth: 46px !default;
49
+ $btn_height: 30px !default;
50
+ $btn_lineHeight: $btn_height !default;
51
+ $btn_padding: 0 12px !default;
52
+ $btn_background: #04C9E8 !default;
53
+ $btn_border: 1px solid transparent !default;
54
+ $btn_fontSize: 13px !default;
55
+ $btn_color: #FFF !default;
56
56
 
57
57
  // #dialog 对话框组件
58
- $dialog_zIndex: $common_zIndex_10;
59
- $dialog_minWidth: 420px; // 对话框的最小宽度
60
- $dialog_background: #fff;
61
- $dialog_border: none;
62
- $dialog_radius: 5px;
58
+ $dialog_zIndex: $common_zIndex_10 !default;
59
+ $dialog_minWidth: 420px !default; // 对话框的最小宽度
60
+ $dialog_background: #fff !default;
61
+ $dialog_border: none !default;
62
+ $dialog_radius: 5px !default;
63
63
 
64
- $dialog_head_background: #00C0E1;
65
- $dialog_head_borderBottom: none; // 对话框头部的下边线
64
+ $dialog_head_background: #00C0E1 !default;
65
+ $dialog_head_borderBottom: none !default; // 对话框头部的下边线
66
66
 
67
- $dialog_title_height: 40px;
68
- $dialog_title_fontSize: 14px;
69
- $dialog_title_fontWeight: bold;
70
- $dialog_title_color: #FFF;
71
- $dialog_title_lineHeight: $dialog_title_height;
67
+ $dialog_title_height: 40px !default;
68
+ $dialog_title_fontSize: 14px !default;
69
+ $dialog_title_fontWeight: bold !default;
70
+ $dialog_title_color: #FFF !default;
71
+ $dialog_title_lineHeight: $dialog_title_height !default;
72
72
 
73
- $dialog_close_top: 5px;
74
- $dialog_close_right: 6px;
73
+ $dialog_close_top: 5px !default;
74
+ $dialog_close_right: 6px !default;
75
75
 
76
- $dialog_body_background: #fff;
76
+ $dialog_body_background: #fff !default;
77
77
 
78
- $dialog_foot_background: $dialog_background; // 对话框底部的背景,默认与对话框的背景一样
79
- $dialog_foot_borderTop: $dialog_head_borderBottom; // 对话框底部的上边线,样式默认与对话框边线一样
78
+ $dialog_foot_background: $dialog_background !default; // 对话框底部的背景,默认与对话框的背景一样
79
+ $dialog_foot_borderTop: $dialog_head_borderBottom !default; // 对话框底部的上边线,样式默认与对话框边线一样
80
80
 
81
81
  // #mask 遮罩层组件
82
- $mask_zIndex: $common_zIndex_9;
83
- $maskWrap_zIndex: $mask_zIndex;
84
- $mask_background: #000;
85
- $mask_opacity: .5;
82
+ $mask_zIndex: $common_zIndex_9 !default;
83
+ $maskWrap_zIndex: $mask_zIndex !default;
84
+ $mask_background: #000 !default;
85
+ $mask_opacity: .5 !default;
86
86
 
87
87
  // #dropdownMenu 下拉菜单组件
88
- $dropdownMenu_zIndex: $common_zIndex_3;
89
- $dropdownMenu_background: #fff;
90
- $dropdownMenu_border: 1px solid $common_color_border;
91
- $dropdownMenu_ulPadding: 12px 0;
92
- $dropdownMenu_itemLink_height: 32px;
93
- $dropdownMenu_itemLink_lineHeight: $dropdownMenu_itemLink_height;
94
- $dropdownMenu_itemLink_padding: 0 15px;
95
- $dropdownMenu_itemLink_color: #000;
96
- $dropdownMenu_split_margin: 5px 0;
97
- $dropdownMenu_split_borderTop: 1px solid #ccc;
88
+ $dropdownMenu_zIndex: $common_zIndex_3 !default;
89
+ $dropdownMenu_background: #fff !default;
90
+ $dropdownMenu_border: 1px solid $common_color_border !default;
91
+ $dropdownMenu_ulPadding: 12px 0 !default;
92
+ $dropdownMenu_itemLink_height: 32px !default;
93
+ $dropdownMenu_itemLink_lineHeight: $dropdownMenu_itemLink_height !default;
94
+ $dropdownMenu_itemLink_padding: 0 15px !default;
95
+ $dropdownMenu_itemLink_color: #000 !default;
96
+ $dropdownMenu_split_margin: 5px 0 !default;
97
+ $dropdownMenu_split_borderTop: 1px solid #CCC !default;
98
98
 
99
99
  // #tab 选项卡组件
100
- $tab_background: #fff;
101
- $tab_head_background: $tab_background;
102
- $tabNav_padding: 0 16px;
103
- $tabNav_item_margin: 0 24px -1px 0;
104
- $tabNav_itemLink_height: 43px;
105
- $tabNav_itemLink_lineHeight: $tabNav_itemLink_height;
106
- $tabNav_itemLink_padding: 0;
107
- $tabNav_itemLink_background: transparent;
108
- $tabNav_itemLink_color: #858C96;
100
+ $tab_background: #FFF !default;
101
+ $tab_head_background: $tab_background !default;
102
+ $tabNav_padding: 0 16px !default;
103
+ $tabNav_item_margin: 0 24px -1px 0 !default;
104
+ $tabNav_itemLink_height: 43px !default;
105
+ $tabNav_itemLink_lineHeight: $tabNav_itemLink_height !default;
106
+ $tabNav_itemLink_padding: 0 !default;
107
+ $tabNav_itemLink_background: transparent !default;
108
+ $tabNav_itemLink_color: #858C96 !default;
109
109
 
110
110
  // #inputText、#textarea 文本输入组件
111
- $textField_width: 270px;
112
- $textField_lineHeight: 22px;
113
- $textField_padding: 12px 16px;
114
- $textField_background: #fff;
115
- $textField_border: 1px solid $common_color_border;
116
- $textField_borderRadius: 5px;
111
+ $textField_width: 270px !default;
112
+ $textField_lineHeight: 22px !default;
113
+ $textField_padding: 12px 16px !default;
114
+ $textField_background: #fff !default;
115
+ $textField_border: 1px solid $common_color_border !default;
116
+ $textField_borderRadius: 5px !default;
117
117
 
118
- $inputText_height: $textField_lineHeight;
118
+ $inputText_height: $textField_lineHeight !default;
119
119
 
120
- $textarea_height: $textField_lineHeight * 3;
120
+ $textarea_height: $textField_lineHeight * 3 !default;
@@ -11,7 +11,7 @@
11
11
  ///
12
12
  /// @group 布局
13
13
  /// @name clear
14
- %clear {
14
+ @mixin clear {
15
15
  &:after {
16
16
  clear: both;
17
17
  content: ".";
@@ -22,11 +22,15 @@
22
22
  }
23
23
  }
24
24
 
25
+ %clear {
26
+ @include clear;
27
+ }
28
+
25
29
  /// 单行省略号
26
30
  ///
27
31
  /// @group 外观
28
32
  /// @name text-ellipsis
29
- %text-ellipsis {
33
+ @mixin text-ellipsis {
30
34
  overflow: hidden;
31
35
  white-space: nowrap;
32
36
  text-overflow: ellipsis;
@@ -35,8 +39,8 @@
35
39
  word-wrap: normal;
36
40
  }
37
41
 
38
- %text_ellipsis {
39
- @extend %text-ellipsis;
42
+ %text-ellipsis {
43
+ @include text-ellipsis;
40
44
  }
41
45
 
42
46
  /// 多行省略号
@@ -59,6 +63,7 @@
59
63
  line-clamp: $line;
60
64
  -webkit-box-orient: vertical;
61
65
  -moz-box-orient: vertical;
66
+ -webkit-text-size-adjust: none;
62
67
  // stylelint-enable
63
68
  box-orient: vertical;
64
69
  }
@@ -67,13 +72,13 @@
67
72
  ///
68
73
  /// @group 外观
69
74
  /// @name text-breakWord
70
- %text-breakWord {
75
+ @mixin text-breakWord {
71
76
  word-wrap: break-word;
72
77
  word-break: break-word;
73
78
  }
74
79
 
75
- %text_breakWord {
76
- @extend %text-breakWord;
80
+ %text-breakWord {
81
+ @include text-breakWord;
77
82
  }
78
83
 
79
84
  /// 适配多倍屏的 CSS 选择器
@@ -1,5 +1,5 @@
1
1
  module QMUISass
2
2
  module Sass
3
- VERSION = "1.1.4"
3
+ VERSION = "1.2.0"
4
4
  end
5
5
  end
data/package.json CHANGED
@@ -1,7 +1,10 @@
1
1
  {
2
2
  "name": "qmui-sass",
3
- "version": "1.1.4",
3
+ "version": "1.2.0",
4
4
  "description": "Sass helper of QMUI Web, dealing with layout, appearance, device adaptation, math calculation and other SASS enhancement.",
5
+ "scripts": {
6
+ "test": "sh test/node_sass_compile_test.sh"
7
+ },
5
8
  "repository": {
6
9
  "type": "git",
7
10
  "url": "git+https://github.com/QMUI/QMUI_Sass.git"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: QMUI_Sass
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.4
4
+ version: 1.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - kayo5994
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2018-11-12 00:00:00.000000000 Z
11
+ date: 2019-04-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler