RubyGems - weui-rails - Versions diffs - 0.4.2 → 0.4.3 - Mend

weui-rails 0.4.2 → 0.4.3

Files changed (44) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f676075193edf332309fc797b748b8c46a49768
-  data.tar.gz: d3c463346c8c0615d87886c5e7f6137358a6e08d
+  metadata.gz: ec4b132ba0d31d593ea0df801b367d2ffb1a0deb
+  data.tar.gz: ad95c8d8a031f41504567d9a8775c6b616ee033f
 SHA512:
-  metadata.gz: 87464517329ff725917adee8fed0a422b95159b8ec2d436d66f2e84a708df7b281d4ab0e83ca8d7b114b54d7fe67575813dbdd80bc5f2a96573d2b1c7870bb9d
-  data.tar.gz: 940569c68fc0f31a30c512ac0d27b1f8bff7ce855382363ae6d9c89a87baff284425b89ed0cf91ccaf6f51aa689615cbbb5f831b0975658f0a49c68fbeaa6ee7
+  metadata.gz: 4c22fd150b1c6c8bf816c2551b80bafe40c484aac0b84cffd71279be65c60d067f36c3fe40e9a1d481dfffdf38efd6e4ca92403ffa5fbc7282567a62dec4f364
+  data.tar.gz: 03f70c3bb7d51abdc4d28ff5a02e0ef866b54f5bc40aa6df91e281eb6a97e6566b18746a0687cf60252cf3d26ed965808a20c5c5fdc6d5b5cbe85070041b4cc4

data/lib/weui-rails/version.rb CHANGED

@@ -1,5 +1,5 @@
 module Weui
 	module Rails
-	  VERSION = '0.4.2'
+	  VERSION = '0.4.3'
 	end
 end

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

@@ -1,32 +1,35 @@
-// font family
-$sansFont:"Helvetica Neue",Helvetica,Arial,sans-serif;
-$serifFont:Georgia, "Times New Roman",Times,serif;
-$wpFont:"Microsoft YaHei",sans-serif;
-$bizFont:"Helvetica Neue",Helvetica,"Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
-$globalFont:$sansFont;
-$globalFontSize:14px;
+// namespace
+$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 color
-$globalLinkColor: #61749B;
-$globalDescColor: #B2B2B2;
-$globalWarnColor: #E64340;
-$globalNickNameColor: #576B95;
-$globalTextColor: #888;
-$globalTitleColor: #000;
+$globalLinkColor: #61749B !default;
+$globalDescColor: #B2B2B2 !default;
+$globalWarnColor: #E64340 !default;
+$globalNickNameColor: #576B95 !default;
+$globalTextColor: #888 !default;
+$globalTitleColor: #000 !default;
 //border
-$globalBorderColor: #BCBAB6;
+$globalBorderColor: #BCBAB6 !default;
 //arrow
-$globalArrowColor: #C7C7CC;
+$globalArrowColor: #C7C7CC !default;
 //component
-$itemActiveColor: #E4E4E4;
+$itemActiveColor: #E4E4E4 !default;
 //page
-$pageDefaultBackgroundColor:#EFEFF4;
+$pageDefaultBackgroundColor:#EFEFF4 !default;
 // gap
-$gap5:5px;
-$gap10:10px;
-$gap15:15px;
+$gap5:5px !default;
+$gap10:10px !default;
+$gap15:15px !default;

data/vendor/assets/stylesheets/base/variable/_monokai.scss CHANGED

@@ -1,11 +1,11 @@
-$monokaiCaret:#F8F8F0;
-$monokaiGreen:#A6E22E;
-$monokaiOrange:#FD971F;
-$monokaiBlue:#66D9EF;
-$monokaiRed:#F92672;
-$monokaiPurple:#AE81FF;
-$monokaiBrown:#E6DB74;
-$monokaiFindHighlight:#FFE792;
-$monokaiLineHighlight:#3E3D32;
-$monokaiSelection:#49483E;
-$monokaiBg:#272822;
+$monokaiCaret:#F8F8F0 !default;
+$monokaiGreen:#A6E22E !default;
+$monokaiOrange:#FD971F !default;
+$monokaiBlue:#66D9EF !default;
+$monokaiRed:#F92672 !default;
+$monokaiPurple:#AE81FF !default;
+$monokaiBrown:#E6DB74 !default;
+$monokaiFindHighlight:#FFE792 !default;
+$monokaiLineHighlight:#3E3D32 !default;
+$monokaiSelection:#49483E !default;
+$monokaiBg:#272822 !default;

data/vendor/assets/stylesheets/base/variable/_weui_button.scss CHANGED

@@ -1,21 +1,21 @@
-$weuiBtnDefaultGap:15px;
-$weuiBtnHeight:42px;
-$weuiBtnMiniHeight:1.9;
-$weuiBtnFontSize:18px;
-$weuiBtnFontColor:#FFFFFF;
-$weuiBtnDisabledFontColor:rgba(255,255,255,.6);
-$weuiBtnActiveFontColor:rgba(255,255,255,.4);
-$weuiBtnMiniFontSize:14px;
-$weuiBtnBorderRadius:5px;
+$weuiBtnDefaultGap:15px !default;
+$weuiBtnHeight:42px !default;
+$weuiBtnMiniHeight:1.9 !default;
+$weuiBtnFontSize:18px !default;
+$weuiBtnFontColor:#FFFFFF !default;
+$weuiBtnDisabledFontColor:rgba(255,255,255,.6) !default;
+$weuiBtnActiveFontColor:rgba(255,255,255,.4) !default;
+$weuiBtnMiniFontSize:14px !default;
+$weuiBtnBorderRadius:5px !default;
-$weuiBtnDefaultBg:#F7F7F7;
-$weuiBtnDefaultActiveBg:#DEDEDE;
-$weuiBtnDefaultFontColor:#454545;
-$weuiBtnDefaultDisabledFontColor:#C9C9C9;
-$weuiBtnDefaultActiveFontColor:#A1A1A1;
+$weuiBtnDefaultBg:#F7F7F7 !default;
+$weuiBtnDefaultActiveBg:#DEDEDE !default;
+$weuiBtnDefaultFontColor:#454545 !default;
+$weuiBtnDefaultDisabledFontColor:#C9C9C9 !default;
+$weuiBtnDefaultActiveFontColor:#A1A1A1 !default;
-$weuiBtnPrimaryBg:#04be02;
-$weuiBtnPrimaryActiveBg:#039702;
+$weuiBtnPrimaryBg:#04be02 !default;
+$weuiBtnPrimaryActiveBg:#039702 !default;
-$weuiBtnWarnBg:#ef4f4f;
-$weuiBtnWarnActiveBg:#c13e3e;
+$weuiBtnWarnBg:#ef4f4f !default;
+$weuiBtnWarnActiveBg:#c13e3e !default;

data/vendor/assets/stylesheets/base/variable/_weui_cell.scss CHANGED

@@ -1,14 +1,14 @@
-$weuiCellBg:#FFFFFF;
-$weuiCellBorderColor:#D9D9D9;
-$weuiCellGapV:10px;
-$weuiCellGapH:15px;
-$weuiCellInnerGapH:.35em;
-$weuiCellLabelWidth:105px;
+$weuiCellBg:#FFFFFF !default;
+$weuiCellBorderColor:#D9D9D9 !default;
+$weuiCellGapV:10px !default;
+$weuiCellGapH:15px !default;
+$weuiCellInnerGapH:.35em !default;
+$weuiCellLabelWidth:105px !default;
-$weuiCellHeight: 44px;
-$weuiCellFontSize:17px;
-$weuiCellTipsFontSize:14px;
+$weuiCellHeight: 44px !default;
+$weuiCellFontSize:17px !default;
+$weuiCellTipsFontSize:14px !default;
-$weuiCellLineHeight: ($weuiCellHeight - 2 * $weuiCellGapV) / $weuiCellFontSize; // 高度为44px，减去上下padding的行高
-$weuiCellsMarginTop: 20 / ($weuiCellFontSize / ($weuiCellFontSize * 0 + 1)) + em;
+$weuiCellLineHeight: ($weuiCellHeight - 2 * $weuiCellGapV) / $weuiCellFontSize !default; // 高度为44px，减去上下padding的行高
+$weuiCellsMarginTop: 20 / ($weuiCellFontSize / ($weuiCellFontSize * 0 + 1)) + em !default;

data/vendor/assets/stylesheets/base/variable/_weui_grid.scss CHANGED

@@ -1,4 +1,4 @@
-$weuiGridBorderColor: #D9D9D9;
-$weuiGridFontSize: 14px;
-$weuiGridIconSize: 28px;
-$weuiGridColumnCount: 3;
+$weuiGridBorderColor: #D9D9D9 !default;
+$weuiGridFontSize: 14px !default;
+$weuiGridIconSize: 28px !default;
+$weuiGridColumnCount: 3 !default;

data/vendor/assets/stylesheets/base/variable/_weui_msg.scss CHANGED

@@ -1,7 +1,7 @@
-$weuiMsgPaddingTop:36px;
-$weuiMsgIconGap:30px;
-$weuiMsgTextGap:25px;
-$weuiMsgTitleGap:5px;
-$weuiMsgOprGap:25px;
-$weuiMsgExtraAreaGap:15px;
-$weuiMsgExtraAreaOfMinHeight:438px;
+$weuiMsgPaddingTop:36px !default;
+$weuiMsgIconGap:30px !default;
+$weuiMsgTextGap:25px !default;
+$weuiMsgTitleGap:5px !default;
+$weuiMsgOprGap:25px !default;
+$weuiMsgExtraAreaGap:15px !default;
+$weuiMsgExtraAreaOfMinHeight:438px !default;

data/vendor/assets/stylesheets/base/variable/_weui_progress.scss CHANGED

@@ -1,5 +1,5 @@
-$weuiProgressBg: #ebebeb;
-$weuiProgressColor: #09bb07;
-$weuiProgressHeight: 3px;
-$weuiProgressCloseBg: #ef4f4f;
-$weuiProgressActiveBg: #c13e3e;
+$weuiProgressBg: #ebebeb !default;
+$weuiProgressColor: #09bb07 !default;
+$weuiProgressHeight: 3px !default;
+$weuiProgressCloseBg: #ef4f4f !default;
+$weuiProgressActiveBg: #c13e3e !default;

data/vendor/assets/stylesheets/icon/weui_icon_font.scss CHANGED

@@ -57,7 +57,7 @@
 }
 .weui_icon_cancel:before {
-  font-size: 23px;
+  font-size: 22px;
   color: #F43530;
 }

data/vendor/assets/stylesheets/widget/weui_button/weui_btn_default.scss CHANGED

@@ -1,12 +1,12 @@
 @import "../../base/fn";
-.weui_btn_default {
+.#{$weui_ns}btn_default {
     background-color: $weuiBtnDefaultBg;
     color: $weuiBtnDefaultFontColor;
-    &:not(.weui_btn_disabled):visited {
+    &:not(.#{$weui_ns}btn_disabled):visited {
         color: $weuiBtnDefaultFontColor;
     }
-    &:not(.weui_btn_disabled):active {
+    &:not(.#{$weui_ns}btn_disabled):active {
         color: $weuiBtnDefaultActiveFontColor;
         background-color: $weuiBtnDefaultActiveBg;
     }

data/vendor/assets/stylesheets/widget/weui_button/weui_btn_disabled.scss CHANGED

@@ -1,9 +1,9 @@
 @import "../../base/fn";
-.weui_btn_disabled {
+.#{$weui_ns}btn_disabled {
     color: $weuiBtnDisabledFontColor;
-    &.weui_btn_default {
+    &.#{$weui_ns}btn_default {
         color: $weuiBtnDefaultDisabledFontColor;
     }
 }

data/vendor/assets/stylesheets/widget/weui_button/weui_btn_global.scss CHANGED

@@ -1,6 +1,6 @@
 @import "../../base/fn";
-.weui_btn {
+.#{$weui_ns}btn {
     position: relative;
     display: block;
     margin-left: auto;
@@ -30,7 +30,7 @@
         border-radius: $weuiBtnBorderRadius*2;
     }
-    &.weui_btn_inline {
+    &.#{$weui_ns}btn_inline {
         display: inline-block;
     }
 }

data/vendor/assets/stylesheets/widget/weui_button/weui_btn_plain.scss CHANGED

@@ -1,6 +1,6 @@
 @import "../../base/fn";
-.weui_btn_plain_primary {
+.#{$weui_ns}btn_plain_primary {
     color: $weuiBtnPrimaryBg;
     border: 1px solid $weuiBtnPrimaryBg;
     &:active {
@@ -11,12 +11,12 @@
     }
 }
-button.weui_btn_plain_primary, input.weui_btn_plain_primary {
+button.#{$weui_ns}btn_plain_primary, input.#{$weui_ns}btn_plain_primary {
     border-width: 1px;
     background-color: transparent;
 }
-.weui_btn_plain_default {
+.#{$weui_ns}btn_plain_default {
     color: #5A5A5A;
     border: 1px solid #5A5A5A;
     &:after {
@@ -24,7 +24,7 @@ button.weui_btn_plain_primary, input.weui_btn_plain_primary {
     }
 }
-button.weui_btn_plain_default, input.weui_btn_plain_default {
+button.#{$weui_ns}btn_plain_default, input.#{$weui_ns}btn_plain_default {
     border-width: 1px;
     background-color: transparent;
 }

data/vendor/assets/stylesheets/widget/weui_button/weui_btn_primary.scss CHANGED

@@ -1,11 +1,11 @@
 @import "../../base/fn";
-.weui_btn_primary {
+.#{$weui_ns}btn_primary {
     background-color: $weuiBtnPrimaryBg;
-    &:not(.weui_btn_disabled):visited {
+    &:not(.#{$weui_ns}btn_disabled):visited {
         color: $weuiBtnFontColor;
     }
-    &:not(.weui_btn_disabled):active {
+    &:not(.#{$weui_ns}btn_disabled):active {
         color: $weuiBtnActiveFontColor;
         background-color: $weuiBtnPrimaryActiveBg;
     }

data/vendor/assets/stylesheets/widget/weui_button/weui_btn_warn.scss CHANGED

@@ -1,11 +1,11 @@
 @import "../../base/fn";
-.weui_btn_warn {
+.#{$weui_ns}btn_warn {
     background-color: $weuiBtnWarnBg;
-    &:not(.weui_btn_disabled):visited {
+    &:not(.#{$weui_ns}btn_disabled):visited {
         color: $weuiBtnFontColor;
     }
-    &:not(.weui_btn_disabled):active {
+    &:not(.#{$weui_ns}btn_disabled):active {
         color: $weuiBtnActiveFontColor;
         background-color: $weuiBtnWarnActiveBg;
     }

data/vendor/assets/stylesheets/widget/weui_button/weui_button.scss CHANGED

@@ -1,7 +1,7 @@
 @import "../../base/fn";
-.weui_btn {
-    &.weui_btn_mini {
+.#{$weui_ns}btn {
+    &.#{$weui_ns}btn_mini {
         line-height: $weuiBtnMiniHeight;
         font-size: $weuiBtnMiniFontSize;
         padding: 0 .75em;
@@ -10,7 +10,7 @@
 }
 button, input {
-    &.weui_btn {
+    &.#{$weui_ns}btn {
         width: 100%;
         border-width: 0;
         outline: 0;
@@ -19,26 +19,26 @@ button, input {
             outline: 0;
         }
     }
-    &.weui_btn_inline,&.weui_btn_mini {
+    &.#{$weui_ns}btn_inline,&.#{$weui_ns}btn_mini {
         width: auto;
     }
 }
 /*gap between btn*/
-.weui_btn + .weui_btn {
+.#{$weui_ns}btn + .#{$weui_ns}btn {
     margin-top: $weuiBtnDefaultGap;
 }
-.weui_btn.weui_btn_inline + .weui_btn.weui_btn_inline {
+.#{$weui_ns}btn.#{$weui_ns}btn_inline + .#{$weui_ns}btn.#{$weui_ns}btn_inline {
     margin-top: auto;
     margin-left: $weuiBtnDefaultGap;
 }
-.weui_btn_area {
+.#{$weui_ns}btn_area {
     margin: $weuiCellsMarginTop $weuiBtnDefaultGap .3em;
-    &.weui_btn_area_inline {
+    &.#{$weui_ns}btn_area_inline {
         display: flex;
-        .weui_btn {
+        .#{$weui_ns}btn {
             margin-top: auto;
             margin-right: $weuiBtnDefaultGap;
             width: 100%;

data/vendor/assets/stylesheets/widget/weui_cell/weui_access.scss CHANGED

@@ -1,17 +1,17 @@
 @import "../../base/fn";
-.weui_cells_access {
-    .weui_cell:not(.no_access) {
+.#{$weui_ns}cells_access {
+    .#{$weui_ns}cell:not(.no_access) {
         // 在cell_access和其它类型的cell混着用的场景下，其它cell要加no_access，避免有点击态
         @include setTapColor();
         &:active {
             background-color: #ECECEC;
         }
     }
-    a.weui_cell {
+    a.#{$weui_ns}cell {
         color: inherit;
     }
-    .weui_cell_ft {
+    .#{$weui_ns}cell_ft {
         &:after {
             content: " ";
             @include setArrow_Wap(right, 6px, #C8C8CD, 2px);

data/vendor/assets/stylesheets/widget/weui_cell/weui_cell_global.scss CHANGED

@@ -1,6 +1,6 @@
 @import "../../base/fn";
-.weui_cell {
+.#{$weui_ns}cell {
     // onepx
     position: relative;
     &:before {
@@ -13,7 +13,7 @@
         }
     }
 }
-.weui_cells {
+.#{$weui_ns}cells {
     margin-top: $weuiCellsMarginTop;
     background-color: $weuiCellBg;
     line-height: $weuiCellLineHeight;
@@ -32,19 +32,20 @@
     }
 }
-.weui_cells_title {
+.#{$weui_ns}cells_title {
     margin-top: .77em;
+    margin-bottom: .3em;
     padding-left: $weuiCellGapH;
     padding-right: $weuiCellGapH;
     color: $globalTextColor;
     font-size: $weuiCellTipsFontSize;
-    & + .weui_cells{
+    & + .#{$weui_ns}cells{
         margin-top: 0;
     }
 }
-.weui_cells_tips{
+.#{$weui_ns}cells_tips{
     margin-top: .3em; // 8px - 行高
     color: $globalTextColor;
     padding-left: 15px;
@@ -52,18 +53,18 @@
     font-size: $weuiCellTipsFontSize;
 }
-.weui_cell {
+.#{$weui_ns}cell {
     padding: $weuiCellGapV $weuiCellGapH;
     position: relative; //这个是为了兼容cells容器onepx方案被before挡住而做的
     display: flex;
     align-items: center;
 }
-.weui_cell_ft {
+.#{$weui_ns}cell_ft {
     text-align:right;
     color: $globalTextColor;
 }
-.weui_cell_primary {
+.#{$weui_ns}cell_primary {
     flex: 1;
 }