Skip to content

Commit

Permalink
🎨 fixed b3log#607
Browse files Browse the repository at this point in the history
  • Loading branch information
@Vanessa219
Vanessa219 committed Apr 6, 2018
1 parent 5af7dfb commit c3b34d2
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 91 deletions.
2 changes: 1 addition & 1 deletion src/main/webapp/css/mobile-base.css
View file

Large diffs are not rendered by default.

13 changes: 3 additions & 10 deletions src/main/webapp/scss/mobile-base.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.8.0.1, Aug 22, 2017
* @version 1.8.0.2, Apr 6, 2018
*/
@import "variables";
@import "common";
Expand Down Expand Up @@ -1388,13 +1388,13 @@ label.cmt-anonymous {
.domains a {
height: 17px;
text-align: center;
padding: 10px 5px;
padding: 10px 2px;
color: #999;
text-decoration: none;
font-size: 12px;
line-height: 16px;
display: block;
flex: 1;
font-size: 12px;
}

.domains a.selected {
Expand Down Expand Up @@ -2346,13 +2346,6 @@ code .dec {
overflow: hidden;
}

.settings-secret label {
display: block;
width: 100%;
margin: 5px 0;
float: none;
}

.settings-avatar .btn {
margin-top: 0;
}
Expand Down
159 changes: 79 additions & 80 deletions src/main/webapp/skins/mobile/home/settings/privacy.ftl
View file
Original file line number Diff line number Diff line change
@@ -1,93 +1,92 @@
<#include "macro-settings.ftl">
<@home "privacy">
<div class="module">
<div class="module-header">${privacyTipLabel}</div>
<div class="module-header"><h2>${privacyTipLabel}</h2></div>
<div class="module-panel form fn-clear">
<div class="fn-clear settings-secret">
<div>
<label>
<input id="userArticleStatus" <#if 0 == currentUser.userArticleStatus> checked="checked"</#if> type="checkbox" />
${userArticleStatusLabel}
</label>
</div>
<div>
<label>
<input id="userCommentStatus" <#if 0 == currentUser.userCommentStatus> checked="checked"</#if> type="checkbox" />
${userCommentStatusLabel}
</label>
</div>
<div class="fn-clear">
<label>
<input id="userArticleStatus" <#if 0 == currentUser.userArticleStatus> checked="checked"</#if>
type="checkbox"/>
${userArticleStatusLabel}
</label>
</div>
<div class="fn-clear settings-secret">
<div>
<label>
<input id="userFollowingUserStatus" <#if 0 == currentUser.userFollowingUserStatus> checked="checked"</#if> type="checkbox" />
${userFollowingUserStatusLabel}
</label>
</div>
<div>
<label>
<input id="userFollowingTagStatus" <#if 0 == currentUser.userFollowingTagStatus> checked="checked"</#if> type="checkbox" />
${userFollowingTagStatusLabel}
</label>
</div>
<div class="fn-clear">
<label>
<input id="userCommentStatus" <#if 0 == currentUser.userCommentStatus> checked="checked"</#if>
type="checkbox"/>
${userCommentStatusLabel}
</label>
</div>
<div class="fn-clear settings-secret">
<div>
<label>
<input id="userFollowingArticleStatus" <#if 0 == currentUser.userFollowingArticleStatus> checked="checked"</#if> type="checkbox" />
${userFollowingArticleStatusLabel}
</label>
</div>
<div>
<label>
<input id="userFollowerStatus" <#if 0 == currentUser.userFollowerStatus> checked="checked"</#if> type="checkbox" />
${userFollowerStatusLabel}
</label>
</div>
<div class="fn-clear">
<label>
<input id="userFollowingUserStatus" <#if 0 == currentUser.userFollowingUserStatus>
checked="checked"</#if> type="checkbox"/>
${userFollowingUserStatusLabel}
</label>
</div>
<div class="fn-clear settings-secret">
<div>
<label>
<input id="userWatchingArticleStatus" <#if 0 == currentUser.userWatchingArticleStatus> checked="checked"</#if> type="checkbox" />
${userWatchingArticleStatusLabel}
</label>
</div>
<div>
<label>
<input id="userPointStatus" <#if 0 == currentUser.userPointStatus> checked="checked"</#if> type="checkbox" />
${userPointStatusLabel}
</label>
</div>
<div class="fn-clear">
<label>
<input id="userFollowingTagStatus" <#if 0 == currentUser.userFollowingTagStatus>
checked="checked"</#if> type="checkbox"/>
${userFollowingTagStatusLabel}
</label>
</div>
<div class="fn-clear settings-secret">
<div>
<label>
<input id="userUAStatus" <#if 0 == currentUser.userUAStatus> checked="checked"</#if> type="checkbox" />
${displayUALabel}
</label>
</div>
<div>
<label>
<input id="userOnlineStatus" <#if 0 == currentUser.userOnlineStatus> checked="checked"</#if> type="checkbox" />
${userOnlineStatusLabel}
</label>
</div>
<div class="fn-clear">
<label>
<input id="userFollowingArticleStatus" <#if 0 == currentUser.userFollowingArticleStatus>
checked="checked"</#if> type="checkbox"/>
${userFollowingArticleStatusLabel}
</label>
</div>
<div class="fn-clear settings-secret">
<div>
<label>
<input id="joinPointRank" <#if 0 == currentUser.userJoinPointRank> checked="checked"</#if> type="checkbox" />
${joinBalanceRankLabel}
</label>
</div>
<div>
<label>
<input id="joinUsedPointRank" <#if 0 == currentUser.userJoinUsedPointRank> checked="checked"</#if> type="checkbox" />
${joinCosumptionRankLabel}
</label>
</div>
<div class="fn-clear">
<label>
<input id="userFollowerStatus" <#if 0 == currentUser.userFollowerStatus> checked="checked"</#if>
type="checkbox"/>
${userFollowerStatusLabel}
</label>
</div>
<div class="fn-clear">
<label>
<input id="userWatchingArticleStatus" <#if 0 == currentUser.userWatchingArticleStatus>
checked="checked"</#if> type="checkbox"/>
${userWatchingArticleStatusLabel}
</label>
</div>
<div class="fn-clear">
<label>
<input id="userPointStatus" <#if 0 == currentUser.userPointStatus> checked="checked"</#if>
type="checkbox"/>
${userPointStatusLabel}
</label>
</div>
<div class="fn-clear">
<label>
<input id="userUAStatus" <#if 0 == currentUser.userUAStatus> checked="checked"</#if>
type="checkbox"/>
${displayUALabel}
</label>
</div>
<div class="fn-clear">
<label>
<input id="userOnlineStatus" <#if 0 == currentUser.userOnlineStatus> checked="checked"</#if>
type="checkbox"/>
${userOnlineStatusLabel}
</label>
</div>
<div class="fn-clear">
<label>
<input id="joinPointRank" <#if 0 == currentUser.userJoinPointRank> checked="checked"</#if>
type="checkbox"/>
${joinBalanceRankLabel}
</label>
</div>
<div class="fn-clear">
<label>
<input id="joinUsedPointRank" <#if 0 == currentUser.userJoinUsedPointRank> checked="checked"</#if>
type="checkbox"/>
${joinCosumptionRankLabel}
</label>
</div>

<div id="privacyTip" class="tip"></div>
<div class="fn-hr5"></div>
<button class="green fn-right" onclick="Settings.update('privacy', '${csrfToken}')">${saveLabel}</button>
Expand Down

0 comments on commit c3b34d2

Please sign in to comment.