Skip to content

Commit

Permalink
fix(SPA): 解决某些情况下边框消失的问题(no 1px to rem)
Browse files Browse the repository at this point in the history
  • Loading branch information
mutoe committed Dec 5, 2018
1 parent 45a66be commit 4c960e6
Show file tree
Hide file tree
Showing 39 changed files with 66 additions and 88 deletions.
2 changes: 1 addition & 1 deletion resources/spa/src/components/ActionSheet.vue
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ export default {
height: 90px;
line-height: 90px;
text-align: center;
border-bottom: 1px solid @border-color;
border-bottom: 1px solid @border-color; /*no*/
}
a {
Expand Down
2 changes: 1 addition & 1 deletion resources/spa/src/components/CommentInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ export default {
min-height: 100px;
padding: 20px;
background-color: @body-bg;
border-top: 1px solid @border-color;
border-top: 1px solid @border-color;/*no*/
.textarea-wrap {
flex: auto;
Expand Down
2 changes: 1 addition & 1 deletion resources/spa/src/components/DiySelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export default {
position: fixed;
left: 0;
right: 0;
box-shadow: -1px 0 3px #ededed;
box-shadow: -1px 0 3px #ededed;/*no*/
}
&--option {
Expand Down
26 changes: 9 additions & 17 deletions resources/spa/src/components/HeadTop.vue
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export default {
line-height: 90px;
color: #333;
background: #fff;
border-bottom: 1px solid #ededed;
border-bottom: 1px solid #ededed; /* no */
/* no */
transition: all 0.3s;
&.transparent {
Expand Down Expand Up @@ -147,8 +147,7 @@ export default {
text-align: center;
font-size: 32px;
width: 90px;
border-bottom: 2px solid transparent;
/* no */
border-bottom: 2px solid transparent; /* no */
& + & {
margin-left: 50px;
}
Expand Down Expand Up @@ -176,26 +175,19 @@ export default {
color: @primary;
height: 60px;
line-height: 60px;
border-width: 1px 0;
/*no*/
border-width: 1px 0; /*no*/
border-style: solid;
border-color: @primary;
&:first-child {
border-left-width: 1px;
/*no*/
border-top-left-radius: 4px;
/*no*/
border-bottom-left-radius: 4px;
/*no*/
border-left-width: 1px; /*no*/
border-top-left-radius: 4px; /*no*/
border-bottom-left-radius: 4px; /*no*/
}
&:last-child {
border-right-width: 1px;
/*no*/
border-top-right-radius: 4px;
/*no*/
border-bottom-right-radius: 4px;
/*no*/
border-right-width: 1px; /*no*/
border-top-right-radius: 4px; /*no*/
border-bottom-right-radius: 4px; /*no*/
}
&.router-link-active {
Expand Down
2 changes: 1 addition & 1 deletion resources/spa/src/components/ImagePoster.vue
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ export default {
max-height: 40vh;
width: 85px * 10;
height: 54px * 10;
border: 1px solid @border-color;
border: 1px solid @border-color; /* no */
margin: 20px auto;
&.loading,
Expand Down
2 changes: 1 addition & 1 deletion resources/spa/src/components/PayFor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ export default {
margin-bottom: 30px;
font-size: 60px;
color: #fca308;
letter-spacing: 1px;
letter-spacing: 1px; /* no */
}
}
.m-payfor-foot {
Expand Down
4 changes: 2 additions & 2 deletions resources/spa/src/components/PopupDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ export default {
main {
flex: auto;
overflow: auto;
border: 1px solid #ededed;
border-width: 1px 0;
border: 1px solid #ededed; /* no */
border-width: 1px 0; /* no */
padding: 20px 0;
}
Expand Down
2 changes: 1 addition & 1 deletion resources/spa/src/components/Report.vue
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export default {
.reason {
padding: 20px;
border: 1px solid @border-color;
border: 1px solid @border-color; /* no */
background-color: #f4f5f6;
}
}
Expand Down
4 changes: 2 additions & 2 deletions resources/spa/src/components/UserItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export default {
background-color: #fff;
& + & {
border-top: 1px solid #ededed;
border-top: 1px solid #ededed; /* no */
}
.user-item-body {
Expand Down Expand Up @@ -119,7 +119,7 @@ export default {
height: 1.8em;
background: #fff;
color: @primary;
border: 1px solid currentColor;
border: 1px solid currentColor; /* no */
border-radius: 8px;
white-space: nowrap;
Expand Down
2 changes: 1 addition & 1 deletion resources/spa/src/components/common/CommonHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export default {
justify-content: space-between;
overflow: hidden;
background: #fff;
border-bottom: 1px solid #ededed;
border-bottom: 1px solid #ededed; /* no */
font-size: 32px;
color: inherit;
z-index: 10;
Expand Down
2 changes: 1 addition & 1 deletion resources/spa/src/components/common/NavTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default {
align-items: center;
height: 90px;
width: 100%;
border-bottom: 1px solid @border-color;
border-bottom: 1px solid @border-color; /* no */
background-color: #fff;
z-index: 10;
Expand Down
4 changes: 2 additions & 2 deletions resources/spa/src/components/common/PasswordConfirm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export default {
}
.common-header {
margin-bottom: -1px;
margin-bottom: -1px;/*no*/
font-size: 30px;
}
Expand All @@ -128,7 +128,7 @@ export default {
input[type="password"] {
flex: auto;
border: 1px solid @border-color;
border: 1px solid @border-color;/*no*/
border-radius: 16px 0 0 16px;
}
Expand Down
2 changes: 1 addition & 1 deletion resources/spa/src/components/common/SearchBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default {
display: flex;
align-items: center;
background-color: #fff;
border-bottom: 1px solid @border-color;
border-bottom: 1px solid @border-color;/*no*/
width: 100%;
height: 90px;
padding: 0 20px;
Expand Down
15 changes: 5 additions & 10 deletions resources/spa/src/components/common/badge.vue
Original file line number Diff line number Diff line change
Expand Up @@ -125,19 +125,14 @@ export default {
position: absolute;
transform: translateX(-50%);
transform-origin: 0 center;
top: -3px;
/* no */
right: -6px;
/* no */
height: 6px;
/* no */
width: 6px;
/* no */
top: -3px; /* no */
right: -6px; /* no */
height: 6px; /* no */
width: 6px; /* no */
border-radius: 100%;
background: @error;
z-index: 10;
box-shadow: 0 0 0 1px @error;
/* no */
box-shadow: 0 0 0 1px @error; /* no */
}
}
</style>
12 changes: 4 additions & 8 deletions resources/spa/src/components/common/btnSwitch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ export default {
align-items: center;
justify-content: space-between;
& + & {
border-top: 1px solid #ededed;
/*no*/
border-top: 1px solid #ededed; /*no*/
}
}
&-text {
Expand All @@ -117,8 +116,7 @@ export default {
position: relative;
width: 60px;
height: 34px;
border: 1px solid #ededed;
/*no*/
border: 1px solid #ededed; /*no*/
outline: 0;
border-radius: 34/2px;
box-sizing: border-box;
Expand Down Expand Up @@ -149,8 +147,7 @@ export default {
width: 30px;
height: 30px;
border-radius: 15px;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
/*no*/
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4); /*no*/
transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
}
}
Expand Down Expand Up @@ -182,8 +179,7 @@ export default {
/*overflow: hidden;*/
width: 30px;
height: 30px;
border: 1px solid #ccc;
/*no*/
border: 1px solid #ccc; /*no*/
background-color: #fff;
position: relative;
}
Expand Down
2 changes: 1 addition & 1 deletion resources/spa/src/components/feedimages.vue
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export default {
right: 5px;
content: "长图";
background-color: #c8a06c;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.5);
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.5); /* no */
background-image: -webkit-linear-gradient(
25deg,
#e8d1b3 0%,
Expand Down
2 changes: 1 addition & 1 deletion resources/spa/src/components/form/FormAvatarItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export default {
form .c-form-avatar-item {
height: 160px;
border-bottom: 1px solid @border-color !important;
border-bottom: 1px solid @border-color !important; /* no */
padding-right: 20px;
.avatar-wrap {
Expand Down
2 changes: 1 addition & 1 deletion resources/spa/src/components/form/FormInputItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export default {
+ .c-form-item {
.textarea-wrap {
border-top: 1px solid @border-color;
border-top: 1px solid @border-color; /* no */
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions resources/spa/src/components/form/FormSwitchItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export default {
position: relative;
width: 60px;
height: 34px;
border: 1px solid #ededed;
border: 1px solid #ededed; /* no */
outline: 0;
border-radius: 34/2px;
box-sizing: border-box;
Expand Down Expand Up @@ -113,7 +113,7 @@ export default {
width: 30px;
height: 30px;
border-radius: 15px;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4); /* no */
/*no*/
transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
}
Expand Down
4 changes: 2 additions & 2 deletions resources/spa/src/components/form/formItem.less
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
font-size: 30px;
padding-left: 20px;
color: #999;
border-bottom: 1px solid @border-color;
border-bottom: 1px solid @border-color; /* no */

> label {
display: inline-block;
Expand Down Expand Up @@ -36,6 +36,6 @@ form {
}

.input-wrap {
border-bottom: 1px solid @border-color;
border-bottom: 1px solid @border-color; /* no */
}
}
4 changes: 2 additions & 2 deletions resources/spa/src/icons/CircleLoading.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ export default {
position: absolute;
left: 50%;
bottom: calc(~"50% - 18px");
margin-left: -1px;
width: 2px;
margin-left: -1px; /* no */
width: 2px; /* no */
height: 8px;
border-radius: 2px; /* no */
transform-origin: center -10px;
Expand Down
2 changes: 1 addition & 1 deletion resources/spa/src/page/PostMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ export default {
height: 100px;
width: 100%;
background-color: #fff;
box-shadow: 0 -1px 3px rgba(26, 26, 26, 0.1);
box-shadow: 0 -1px 3px rgba(26, 26, 26, 0.1); /* no */
}
.fadeIn-enter-active,
Expand Down
2 changes: 1 addition & 1 deletion resources/spa/src/page/UserHome.vue
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ export default {
background-image: url("../images/user_home_default_cover.png");
font-size: 28px;
color: #fff;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.5);
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.5); /* no */
h3 {
margin: 20px 0;
font-size: 32px;
Expand Down
2 changes: 1 addition & 1 deletion resources/spa/src/page/article/ArticleCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ export default {
height: 95px;
font-size: 24px;
background-color: #fff;
border-top: 1px solid @border-color;
border-top: 1px solid @border-color; /* no */
a {
color: #b3b3b3;
Expand Down
3 changes: 1 addition & 2 deletions resources/spa/src/page/common/chooseLocation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,7 @@ export default {
background-color: #fff;
padding: 0 30px;
&-item {
border-bottom: 1px solid #ededed;
/*no*/
border-bottom: 1px solid #ededed; /*no*/
width: 100%;
height: 100px;
line-height: 98px;
Expand Down
3 changes: 1 addition & 2 deletions resources/spa/src/page/common/postGroupFeed/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,7 @@ export default {
display: flex;
align-items: conter;
height: 100px;
border-bottom: 1px solid #dedede;
/*no*/
border-bottom: 1px solid #dedede; /*no*/
input {
font-size: 30px;
padding: 0 20px;
Expand Down
2 changes: 1 addition & 1 deletion resources/spa/src/page/group/components/GroupItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ export default {
width: 126px;
height: 50px;
border: 1px solid currentColor;
border: 1px solid currentColor; /* no */
border-radius: 8px;
background-color: #fff;
Expand Down
4 changes: 2 additions & 2 deletions resources/spa/src/page/message/style.less
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
}
&-item {
padding: 20px;
border-bottom: #f6f6f6 1px solid;
border-bottom: #f6f6f6 1px solid; /* no */
background-color: #fff;

.red {
Expand Down Expand Up @@ -212,7 +212,7 @@
.audit-operation {
margin-right: 0;
color: #4bb893;
border: 1px solid #4bb893;
border: 1px solid #4bb893; /* no */
border-radius: 20px;
padding: 0px 20px;
font-size: 22px;
Expand Down
Loading

0 comments on commit 4c960e6

Please sign in to comment.