Skip to content

Commit

Permalink
修改样式
Browse files Browse the repository at this point in the history
  • Loading branch information
bbbbbbbbbbbbba committed Mar 29, 2020
1 parent fa081eb commit f3d67bd
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 15 deletions.
16 changes: 7 additions & 9 deletions site/assets/styles/common.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
html,
body {
font-family: '-apple-system', 'system-ui', 'Helvetica Neue', 'Luxi Sans',
'DejaVu Sans', Tahoma, 'Hiragino Sans GB', STHeiti, sans-serif !important;
font-family: "SF Pro SC", "SF Pro Text", "SF Pro Icons", PingFang SC, Lantinghei SC, Microsoft Yahei, Hiragino Sans GB, Microsoft Sans Serif, WenQuanYi Micro Hei, sans-serif;
// background: #e5e5e5;
// background: #f7f7f7;
background: url(../images/bg.gif) repeat;
color: #222831;
}

.column {
Expand Down Expand Up @@ -153,8 +153,9 @@ $sidebar-margin: 10px; // 侧边栏之间的缝隙

.widget {
background: #fff;
padding: 0 6px;
padding: 0 12px;
margin-top: 10px;
border-radius: calc(.25rem - 1px);

&:first-child {
margin: 0;
Expand All @@ -169,11 +170,11 @@ $sidebar-margin: 10px; // 侧边栏之间的缝隙
}

& > .widget-header {
// padding-bottom: 8px;
padding: 8px 0;
font-size: 16px;
font-weight: bold;
border-bottom: 1px dashed #ddd;
//font-weight: bold;
//border-bottom: 1px dashed #ddd;
border-bottom: 1px solid #f1f1f1;

.slot {
float: right;
Expand All @@ -186,9 +187,6 @@ $sidebar-margin: 10px; // 侧边栏之间的缝隙
}

& > .widget-content {
// background-color: #fff;
// font-size: 12px;
// margin-top: 8px;
padding: 8px 0;
word-break: break-all;
}
Expand Down
1 change: 1 addition & 0 deletions site/components/MsgNotice.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
:class="{ 'msg-flicker': msgcount > 0 }"
href="/user/messages"
class="msgicon"
title="消息"
>
<i class="iconfont icon-bell"></i>
<sup v-if="msgcount > 0">{{ msgcount > 9 ? '9+' : msgcount }}</sup>
Expand Down
20 changes: 19 additions & 1 deletion site/components/MyNav.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<template>
<nav ref="nav" class="navbar" role="navigation" aria-label="main navigation">
<nav
ref="nav"
class="navbar has-shadow"
role="navigation"
aria-label="main navigation"
>
<div class="container">
<div class="navbar-brand">
<a href="/" class="navbar-item">
Expand Down Expand Up @@ -52,6 +57,12 @@
</div>
-->

<div class="navbar-item dropdown is-hoverable is-right">
<a href="/topic/create" title="发表话题" class="publish">
<i class="iconfont icon-publish"></i>
</a>
</div>

<msg-notice />

<div v-if="user" class="navbar-item has-dropdown is-hoverable">
Expand Down Expand Up @@ -150,6 +161,13 @@ export default {
.navbar-item {
font-weight: 700;
}
.publish {
color: #448ef6;
&:hover {
color: #222;
}
}
}
.searchFormDiv {
Expand Down
9 changes: 4 additions & 5 deletions site/components/TopicSide.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<template>
<div class="right-container">
<!--<post-btns :current-node-id="currentNodeId" />-->
<site-notice />
<div v-if="scoreRank && scoreRank.length" class="widget">
<div class="widget-header">积分排行</div>
<div class="widget-header">
<span class="widget-title">积分排行</span>
</div>
<div class="widget-content">
<ul class="score-rank">
<li v-for="user in scoreRank" :key="user.id">
Expand Down Expand Up @@ -61,12 +62,10 @@
</template>

<script>
// import PostBtns from '~/components/PostBtns'
import SiteNotice from '~/components/SiteNotice'
export default {
components: {
// PostBtns,
SiteNotice
},
props: {
Expand Down Expand Up @@ -95,7 +94,7 @@ export default {
li {
display: flex;
list-style: none;
margin: 8px;
margin: 8px 0;
font-size: 13px;
position: relative;
Expand Down

0 comments on commit f3d67bd

Please sign in to comment.