weui-rails 0.4.4 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b472409cfe7027f7ad1506283d2b64a80a1f197f
-  data.tar.gz: 175f7dac01e5fe35d04376f12e91fdd97f6bceca
+  metadata.gz: 9d0905687ca8d6f9f4c5f0821aee98d3925ba5b9
+  data.tar.gz: 2bf8c567bc01180505d4549ed4fa88433c7c7b29
 SHA512:
-  metadata.gz: 51bb48e0350bf5d7717ed4119d6d75d9f5ed7593a27d0a4918b5ed338f4cba174b9aca55e35525e26ae7c03899378e6bef2b66a9eda10f3fbfc5f816c5b31606
-  data.tar.gz: b814ba10df656d5361070088894779f64c62066c3cb21a145dcb6bba733d891f97b4d4273aeff4e60b80d2ab9defff6f33000e062a691fe8e33bdd8e6f86bf8d
+  metadata.gz: e747ccc445a5a114e19b11426c3856c069e126bc1c7b0833cec550de5f8fa94ccd071858b7490eca33f79f163e6ab67049717a2a055fcf479807073add8593bc
+  data.tar.gz: 5bf45bb434eed34121796830c92b615cf0b3a2ea70753d166e9dae5abb048eec541e2b78983ad42bef747807a52d5b622c9c58a57c8dcf68fa2afce65f440409

data/README.md

@@ -9,6 +9,34 @@ Weui-Rails version is same as [weui-sass version](https://github.com/kevyu/weui-
 
 This gems can be used seperately, but 99% you will using with [wechat gems](https://github.com/Eric-Guo/wechat) at same time.
 
+## Migration from 0.4.x to 1.0.x notes
+
+Due to weui make a huge rename when go 1.0 version, so a lot of style name changed, here is some incomplete list to help you upgrade easier.
+
+| Previus style | 1.0 style |
+|---------------|-----------|
+| weui_cells | weui-cells |
+| weui_cell | weui-cell |
+| weui_cell_hd | weui-cell__hd |
+| weui_cell_bd | weui-cell__bd |
+| weui_cell_ft | weui-cell__ft |
+| weui_cell_primary | weui-cell_primary |
+| weui_input | weui-input |
+| weui_cells_title | weui-cells_title |
+| weui_cells_access | weui-cell_access * |
+| weui_toptips | weui-toptips |
+| weui_warn | weui-toptips_warn |
+| weui_cells_form | weui-cells_form |
+| weui_label | weui-label |
+| weui_cell_select | weui-cell_select |
+| weui_select_after | weui-cell_select-after |
+| weui_select_before | weui-cell_select-before |
+| weui_btn | weui-btn |
+| weui_btn_primary | weui-btn_primary |
+| weui_textarea | weui-textarea |
+
+* weui-cell_access move from weui-cells to weui-cell.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -79,7 +107,7 @@ end
 app/views/wechats/message_box.html.erb
 
 ```erb
-<%= weui_message_box 'Title', 'Description', 'weui_icon_warn' -%>
+<%= weui_message_box 'Title', 'Description', 'weui-icon-warn' -%>
 ```
 
 ## More example

data/app/views/weui/_message_box.html.erb

@@ -1,13 +1,13 @@
 <div class="page">
-    <div class="weui_msg">
-        <div class="weui_icon_area"><i class="weui_icon_msg <%= icon_style -%>"></i></div>
-        <div class="weui_text_area">
-            <h2 class="weui_msg_title"><%= title -%></h2>
-            <p class="weui_msg_desc"><%= description -%></p>
+    <div class="weui-msg">
+        <div class="weui-msg__icon-area"><i class="weui-icon_msg <%= icon_style -%>"></i></div>
+        <div class="weui-msg__text-area">
+            <h2 class="weui-msg__title"><%= title -%></h2>
+            <p class="weui-msg__desc"><%= description -%></p>
         </div>
-        <div class="weui_opr_area">
-            <p class="weui_btn_area">
-                <a href="javascript:wx.closeWindow();" class="weui_btn weui_btn_primary"><%= button_text -%></a>
+        <div class="weui-msg__opr-area">
+            <p class="weui-btn-area">
+                <a href="javascript:wx.closeWindow();" class="weui-btn weui-btn_primary"><%= button_text -%></a>
             </p>
         </div>
     </div>

data/app/views/weui/message_box.html.erb

@@ -1,4 +1,4 @@
 <%= render partial: 'weui/message_box',
             locals: { title: title, description: description,
-                      icon_style: defined?(icon_style) ? icon_style : 'weui_icon_warn',
+                      icon_style: defined?(icon_style) ? icon_style : 'weui-icon-warn',
                       button_text: defined?(button_text) ? button_text : '确定' } -%>

data/lib/weui-rails/helpers/weui_message_box.rb

@@ -1,6 +1,6 @@
 module Weui
   module Helpers
-    def weui_message_box(title, description, icon_style = 'weui_icon_warn', button_text = '确定')
+    def weui_message_box(title, description, icon_style = 'weui-icon-warn', button_text = '确定')
       render partial: 'weui/message_box',
              locals: { title: title, description: description,
                        icon_style: icon_style, button_text: button_text }

data/lib/weui-rails/version.rb

@@ -1,5 +1,5 @@
 module Weui
 	module Rails
-	  VERSION = '0.4.4'
+	  VERSION = '1.0.1'
 	end
 end

data/vendor/assets/stylesheets/_weui.scss

@@ -1,48 +1,68 @@
 @import "./base/reset";
 
 // icon font
-@import "./icon/weui_icon_font";
+@import "./icon/weui-icon_font";
+
 
 // button
-@import "./widget/weui_button/weui_button";
+@import "./widget/weui-button/weui-button";
 
 // cell
-@import "./widget/weui_cell/weui_cell_global";
+@import "./widget/weui-cell/weui-cell_global";
 
-@import "./widget/weui_cell/weui_access";
-@import "./widget/weui_cell/weui_check";
-@import "./widget/weui_cell/weui_form";
-@import "./widget/weui_cell/weui_switch";
-@import "./widget/weui_cell/weui_uploader";
+@import "./widget/weui-cell/weui-access";
+@import "./widget/weui-cell/weui-check";
+@import "./widget/weui-cell/weui-form";
+@import "./widget/weui-cell/weui-gallery";
+@import "./widget/weui-cell/weui-switch";
+@import "./widget/weui-cell/weui-uploader";
 
 // msg
-@import "./widget/weui_page/weui_msg";
+@import "./widget/weui-page/weui-msg";
 
 // article
-@import "./widget/weui_page/weui_article";
+@import "./widget/weui-page/weui-article";
 
 // tab
-@import "./widget/weui_tab/weui_tab";
+@import "./widget/weui-tab/weui-tab";
 
 // progress
-@import "./widget/weui_progress/weui_progress";
+@import "./widget/weui-progress/weui-progress";
 
-// card
-@import "./widget/weui_panel/weui_panel";
+// panel
+@import "./widget/weui-panel/weui-panel";
 
 // media box
-@import "./widget/weui_media_box/weui_media_box";
+@import "./widget/weui-media-box/weui-media-box";
 
 // grid
-@import "./widget/weui_grid/weui_grid";
+@import "./widget/weui-grid/weui-grid";
+
+// copyright
+@import "./widget/weui-footer/weui-footer";
 
-// tips
-@import "./widget/weui_tips/weui_dialog";
-@import "./widget/weui_tips/weui_toast";
-@import "./widget/weui_tips/weui_mask";
 
-//action sheet
-@import "./widget/weui_tips/weui_actionsheet";
+// flex
+@import "./widget/weui-flex/weui-flex";
+
+// tips
+@import "./widget/weui-tips/weui-dialog";
+@import "./widget/weui-tips/weui-toast";
+@import "./widget/weui-tips/weui-mask";
+@import "./widget/weui-tips/weui-actionsheet";
+@import "./widget/weui-tips/weui-loadmore";
 
 //searchbar
-@import "./widget/weui_searchbar/weui_searchbar";
+@import "./widget/weui-searchbar/weui-searchbar";
+
+// picker
+@import "./widget/weui-picker/weui-picker";
+
+// animate
+@import "./widget/weui-animate/weui-animate";
+
+// agree
+@import "./widget/weui-agree/weui-agree";
+
+// loading
+@import "./widget/weui-loading/weui-loading";

data/vendor/assets/stylesheets/base/fn.scss

@@ -4,12 +4,15 @@
 @import "./mixin/setArrow";
 @import "./mixin/text";
 
+
 // variable
 @import "./variable/global";
-@import "./variable/monokai";
+@import "./variable/color";
+
 
-@import "./variable/weui_cell";
-@import "./variable/weui_button";
-@import "./variable/weui_msg";
-@import "./variable/weui_progress";
-@import "./variable/weui_grid";
+@import "./variable/weui-cell";
+@import "./variable/weui-button";
+@import "./variable/weui-msg";
+@import "./variable/weui-grid";
+@import "./variable/weui-progress";
+@import "./variable/weui-dialog";

data/vendor/assets/stylesheets/base/mixin/_mobile.scss

@@ -1,20 +1,3 @@
-// tapcolor
-@mixin setTapColor($c:rgba(0,0,0,0)) {
+@mixin setTapColor($c:rgba(0,0,0,0)) {
     -webkit-tap-highlight-color: $c;
 }
-
-//user action
-@mixin no_select() {
-    user-select: none;
-}
-
-// opacity
-@mixin opacity($opacity) {
-    @if $opacity == 1 {
-      filter: "progid:DXImageTransform.Microsoft.Alpha(enabled=false)";
-    }
-    @else {
-      filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=#{round($opacity * 100)})";
-    }
-  opacity: $opacity;
-}

data/vendor/assets/stylesheets/base/mixin/_setArrow.scss

@@ -1,97 +1,26 @@
-// css2 arrow
-@mixin arrow($borderWidth, $borderColor) {
-    @include setArrowWidth($borderWidth);
-    @include setArrowColor($borderColor);
-}
-
-@mixin setArrowColor($borderColor) {
-    &.arrow_t {
-        border-bottom-color: $borderColor;
-    }
-    &.arrow_r {
-        border-left-color: $borderColor;
-    }
-    &.arrow_b {
-        border-top-color: $borderColor;
-    }
-    &.arrow_l {
-        border-right-color: $borderColor;
-    }
-}
-
-@mixin setArrowWidth($borderWidth) {
-    border-width: $borderWidth;
-}
-
-@mixin setArrow($direction, $borderWidth, $borderColor) {
+@mixin setArrow($direction, $arrowsize, $borderColor, $borderWidth) {
     display: inline-block;
-    width: 0;
-    height: 0;
-    border: $borderWidth dashed transparent;
-    @if $direction == top {
-        @include arrow_t($borderColor);
-    } @else if $direction == right {
-        @include arrow_r($borderColor);
-    } @else if $direction == bottom {
-        @include arrow_b($borderColor);
-    } @else if $direction == left {
-        @include arrow_l($borderColor);
-    }
-}
-
-@mixin arrow_t($c) {
-    border-top-width: 0;
-    border-bottom-color: $c;
-    border-bottom-style: solid;
-}
-
-@mixin arrow_r($c) {
-    border-right-width: 0;
-    border-left-color: $c;
-    border-left-style: solid;
-}
-
-@mixin arrow_b($c) {
-    border-bottom-width: 0;
-    border-top-color: $c;
-    border-top-style: solid;
-}
-
-@mixin arrow_l($c) {
-    border-left-width: 0;
-    border-right-color: $c;
-    border-right-style: solid;
-}
-
-// css3 arrow
-@mixin setArrowWidth_Wap($borderWidth) {
-    border-width: $borderWidth $borderWidth 0 0;
-}
-
-@mixin setArrowSize_Wap($arrowsize) {
     height: $arrowsize;
     width: $arrowsize;
-}
-
-@mixin setArrow_Wap($direction, $arrowsize, $borderColor, $borderWidth) {
-    display: inline-block;
-    @include setArrowSize_Wap($arrowsize);
-    @include setArrowWidth_Wap($borderWidth);
+    border-width: $borderWidth $borderWidth 0 0;
     border-color: $borderColor;
     border-style: solid;
     @if $direction == top {
-        transform: translate(0, 0) rotate(-45deg); 
+        transform: matrix(0.71,-0.71,0.71,0.71,0,0); // rotate(-45deg)
     } @else if $direction == right {
-        transform: rotate(45deg);
+        transform: matrix(0.71,0.71,-0.71,0.71,0,0); // rotate(45deg);
+
         position: relative;
         top: -2px;
     } @else if $direction == down {
-        transform: rotate(135deg);
+        transform: matrix(-0.71,0.71,-0.71,-0.71,0,0); // rotate(135deg);
+
         position: relative;
         top: -3px;
-    } @else if $direction == bottom {
-        transform: rotate(-135deg);
+    } @else if $direction == left {
+        transform: matrix(-0.71,-0.71,0.71,-0.71,0,0); // rotate(-135deg);
+
         position: relative;
         top: -2px;
     }
-}
+}

data/vendor/assets/stylesheets/base/mixin/_setOnepx.scss

@@ -3,7 +3,7 @@
     position: absolute;
     left: 0;
     top: 0;
-    width: 100%;
+    right: 0;
     height: 1px;
     border-top: 1px solid $c;
     color: $c;
@@ -16,7 +16,7 @@
     position: absolute;
     left: 0;
     bottom: 0;
-    width: 100%;
+    right: 0;
     height: 1px;
     border-bottom: 1px solid $c;
     color: $c;
@@ -30,7 +30,7 @@
     left: 0;
     top: 0;
     width: 1px;
-    height: 100%;
+    bottom: 0;
     border-left: 1px solid $c;
     color: $c;
     transform-origin: 0 0;
@@ -43,7 +43,7 @@
     right: 0;
     top: 0;
     width: 1px;
-    height: 100%;
+    bottom: 0;
     border-right: 1px solid $c;
     color: $c;
     transform-origin: 100% 0;

data/vendor/assets/stylesheets/base/mixin/_text.scss

@@ -16,4 +16,9 @@
 @mixin text_wrap() {
     word-wrap:break-word;
     word-break:break-all;
+}
+@mixin hyphens() {
+    word-wrap:break-word;
+    -webkit-hyphens:auto;
+    hyphens:auto;
 }

data/vendor/assets/stylesheets/base/reset.scss

@@ -1,4 +1,4 @@
-@import "./fn";
+@import "fn";
 
 html {
     -ms-text-size-adjust: 100%;
@@ -7,7 +7,7 @@ html {
 
 body {
     line-height: 1.6;
-    font-family: $sansFont;
+    font-family: $weuiFontDefault;
 }
 
 * {
@@ -21,4 +21,5 @@ a img {
 
 a {
     text-decoration: none;
-}
+    @include setTapColor();
+}

data/vendor/assets/stylesheets/base/variable/_color.scss

@@ -0,0 +1,20 @@
+// link
+$weuiLinkColorDefault: #586C94 !default;
+
+// background
+$weuiBgColorDefault: #EFEFF4 !default;
+$weuiBgColorActive: #ECECEC !default;
+
+// line
+$weuiLineColorLight: #E5E5E5 !default;
+$weuiLineColorDark: #BCBAB6 !default;
+
+// text
+$weuiTextColorTitle: #000000 !default;
+$weuiTextColorTips: #B2B2B2 !default;
+$weuiTextColorWarn: #E64340 !default;
+$weuiTextColorGray: #999999 !default;
+
+
+
+

data/vendor/assets/stylesheets/base/variable/_global.scss

@@ -1,35 +1,9 @@
 // namespace
-$weui_ns: 'weui_' !default;
+$weui_ns: 'weui-' !default;
 
-// font family
-$sansFont:"Helvetica Neue",Helvetica,Arial,sans-serif !default;
-$serifFont:Georgia, "Times New Roman",Times,serif !default;
-$wpFont:"Microsoft YaHei",sans-serif !default;
-$bizFont:"Helvetica Neue",Helvetica,"Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif !default;
-$globalFont:$sansFont !default;
-$globalFontSize:14px !default;
+// font
+$weuiFontEN:-apple-system-font,"Helvetica Neue";
+$weuiFontCN:"PingFang SC","Hiragino Sans GB","Microsoft YaHei";
+$weuiFontSans:sans-serif;
+$weuiFontDefault:$weuiFontEN,$weuiFontSans;
 
-// font color
-$globalLinkColor: #61749B !default;
-$globalDescColor: #B2B2B2 !default;
-$globalWarnColor: #E64340 !default;
-$globalNickNameColor: #576B95 !default;
-$globalTextColor: #888 !default;
-$globalTitleColor: #000 !default;
-
-//border
-$globalBorderColor: #BCBAB6 !default;
-
-//arrow
-$globalArrowColor: #C7C7CC !default;
-
-//component
-$itemActiveColor: #E4E4E4 !default;
-
-//page
-$pageDefaultBackgroundColor:#EFEFF4 !default;
-
-// gap
-$gap5:5px !default;
-$gap10:10px !default;
-$gap15:15px !default;