Skip to content

Commit

Permalink
[feat] remove /* px */ marker
Browse files Browse the repository at this point in the history
  • Loading branch information
jin5354 committed Apr 27, 2017
1 parent 26d0873 commit 1619ff8
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 31 deletions.
10 changes: 5 additions & 5 deletions packages/ActionSheet/src/ActionSheet.vue
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@
background-color: #FFF;
.wd-actionsheet-header {
padding: 0 40px;
height: $header-line-height; /* px */
line-height: $header-line-height; /* px */
font-size: $header-text-size; /* px */
height: $header-line-height;
line-height: $header-line-height;
font-size: $header-text-size;
color: $header-text-color;
}
.wd-actionsheet-content {
Expand All @@ -149,11 +149,11 @@
span {
display: flex;
flex: 1;
height: 104px; /* px */
height: 104px;
align-items: center;
justify-content: center;
flex-direction: row;
font-size: $content-text-size; /* px */
font-size: $content-text-size;
color: $content-text-color;
background-color: $button-background-color;
&:first-child {
Expand Down
22 changes: 11 additions & 11 deletions packages/ActionSheet/src/ActionSheetSlot.vue
Original file line number Diff line number Diff line change
Expand Up @@ -126,27 +126,27 @@ export default {
.wd-actionsheet-listitem {
position: relative;
padding-right: 40px;
height: $content-line-height; /* px */
line-height: $content-line-height; /* px */
font-size: $content-text-size; /* px */
height: $content-line-height;
line-height: $content-line-height;
font-size: $content-text-size;
color: $content-text-color;
border-top: 1px solid $border-color; /* no */
span {
display: inline-block;
&.wd-item-sub {
position: absolute;
right: 40px;
font-size: $header-text-size; /* px */
color: $header-text-color; /* px */
font-size: $header-text-size;
color: $header-text-color;
}
}
&.checked:after {
content: "";
width: 10px; /* px */
height: 18px; /* px */
width: 10px;
height: 18px;
position: absolute;
right: 43px;
top: 43px; /* px */
top: 43px;
border-bottom: 2px solid #e9071f; /* no */
border-right: 2px solid #e9071f; /* no */
-webkit-transform: rotate(45deg);
Expand All @@ -158,14 +158,14 @@ export default {
label {
overflow: hidden;
display: block;
height: $content-line-height; /* px */
height: $content-line-height;
.wd-actionsheet-checkbox {
height: $content-line-height !important; /* px */
height: $content-line-height !important;
&.custome-checkbox-item {
float: none !important;
margin: 0 !important;
+ span.wd-item-title {
margin-left: 16px; /* px */
margin-left: 16px;
vertical-align: top;
}
}
Expand Down
3 changes: 2 additions & 1 deletion packages/Button/src/Button.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export default {
type: String,
default: 'primary',
validator(value) {
/* istanbul ignore next */
return [
'primary',
'gray',
Expand Down Expand Up @@ -145,7 +146,7 @@ $button-disabled-opacity: 0.4;
}
label {
font-size: $button-text-size; /* px */
font-size: $button-text-size;
}
}
</style>
2 changes: 1 addition & 1 deletion packages/Cell/src/Cell.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ $cell-right-color: #9a9a9a;
& + .wd-cell {
.wd-cell-inner-wrapper {
border-top: 1px solid rgba(0, 0, 0, 0.15); /* px */
border-top: 1px solid rgba(0, 0, 0, 0.15); /* no */
}
}
Expand Down
6 changes: 3 additions & 3 deletions packages/Header/src/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export default {
content {
display: flex;
justify-content: center;
font-size: 36px; /* px */
font-size: 36px;
font-weight: bold;
color: #fff;
}
Expand All @@ -67,7 +67,7 @@ export default {
height: 100%;
display: flex;
align-items: center;
font-size: 28px; /* px */
font-size: 28px;
color: #fff;
}
Expand All @@ -78,7 +78,7 @@ export default {
height: 100%;
display: flex;
align-items: center;
font-size: 28px; /* px */
font-size: 28px;
color: #fff;
}
}
Expand Down
8 changes: 4 additions & 4 deletions packages/MessageBox/src/MessageBox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,13 @@ export default {
margin-bottom: 16px;
text-align: center;
align-self: stretch;
font-size: $title-font-size; /* px */
font-size: $title-font-size;
line-height: 50px;
color: $title-color;
font-weight: bold;
&+.wd-messagebox-content-text {
font-size: 28px; /* px */
font-size: 28px;
color: $text-color;
line-height: 40px;
}
Expand All @@ -187,7 +187,7 @@ export default {
.wd-messagebox-content-text {
text-align: center;
line-height: 50px;
font-size: $title-font-size; /* px */
font-size: $title-font-size;
}
input {
Expand All @@ -213,7 +213,7 @@ export default {
height: 88px;
align-items: center;
justify-content: center;
font-size: $button-font-size; /* px */
font-size: $button-font-size;
color: $button-text-color;
&.disabled {
Expand Down
2 changes: 1 addition & 1 deletion packages/Navbar/src/Navbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ $navbar-border-color: #dddddd;
height: $navbar-height;
line-height: $navbar-height;
background-color: $navbar-background-color;
font-size: $navbar-font-size; /* px */
font-size: $navbar-font-size;
color: $navbar-color;
box-sizing: border-box;
border-bottom: 1px solid $navbar-border-color; /* no */
Expand Down
4 changes: 2 additions & 2 deletions packages/Picker/src/Picker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ $fence-color: #cdcdcd;
.wd-picker-header {
overflow: hidden;
line-height: 88px; /* px */
line-height: 88px;
align-items: center;
.wd-picker-header-cancel {
Expand All @@ -170,7 +170,7 @@ $fence-color: #cdcdcd;
&>p {
padding: 0 40px;
color: $button-color;
font-size: $button-text-size; /* px */
font-size: $button-text-size;
}
}
.wd-picker-slots-container {
Expand Down
3 changes: 2 additions & 1 deletion packages/Picker/src/PickerSlot.vue
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ export default {
* bindEvents 绑定滑动事件
*/
bindEvents() {
/* istanbul ignore next */
draggable(this.$el, {
start: (event) => {
/*
Expand Down Expand Up @@ -168,7 +169,7 @@ $selected-text-color: #404040;
$basic-text-color: #B3B3B3;
.wd-picker-slot {
font-size: $slot-text-size; /* px */
font-size: $slot-text-size;
color: $basic-text-color;
transition-duration: 0.3s;
transition-timing-function: ease-out;
Expand Down
2 changes: 1 addition & 1 deletion packages/Tabbar/src/Tabbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ $tabbar-border-color: #dddddd;
height: $tabbar-height;
line-height: $tabbar-height;
background-color: $tabbar-background-color;
font-size: $tabbar-font-size; /* px */
font-size: $tabbar-font-size;
color: $tabbar-color;
box-sizing: border-box;
border-top: 1px solid $tabbar-border-color; /* no */
Expand Down
2 changes: 1 addition & 1 deletion packages/Toast/src/Toast.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
left:50%;
max-width: 480px;
box-sizing: border-box;
font-size: 32px; /* px */
font-size: 32px;
line-height: 45px;
transform: translate(-50%, -50%);
outline: none;
Expand Down

0 comments on commit 1619ff8

Please sign in to comment.