Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Style OK #62

Merged
merged 3 commits into from
Mar 23, 2019
Merged

Style OK #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ccf3759
Admin header style
youweics Mar 22, 2019
bdbb91d
Change theme
youweics Mar 23, 2019
64020dc
Style OK
youweics Mar 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions jvue-admin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"private": true,
"scripts": {
"serve": "vue-cli-service serve --port 3001",
"dev": "npm run serve",
"build": "vue-cli-service build",
"start": "vue-cli-service serve --port 3001 --mode production",
"lint-cli": "vue-cli-service lint --fix",
Expand Down
2 changes: 1 addition & 1 deletion jvue-admin/src/components/common/MHeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export default {
.header-right {
list-style: none;
float: right;
margin: 0 15px 0 0;
margin: 0 35px 0 0;
color: #7f8c8d;
}

Expand Down
18 changes: 15 additions & 3 deletions jvue-front/components/themes/dark/Aside.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,20 @@
</el-col>
<el-col :xs="24" :md="post.thumbnails.length > 0 ? 18 : 24">
<div>
<h2 :class="post.thumbnails.length > 0 ? 'has-image-title' : ''">
{{ post.title === "" ? "暂无标题" : post.title }}
</h2>
<nuxt-link
class="aside-link-dark"
:to="
post.name === ''
? '/post-dark/' + post.id + '.html'
: '/post-dark/' + post.name + '.html'
"
>
<h2
:class="post.thumbnails.length > 0 ? 'has-image-title' : ''"
>
{{ post.title === "" ? "暂无标题" : post.title }}
</h2>
</nuxt-link>
</div>
</el-col>
</el-row>
Expand Down Expand Up @@ -48,6 +59,7 @@ export default {
<style scoped>
#aside {
background-color: #212121;
padding-top: 10px;
}
.el-card {
background-color: #212121;
Expand Down
3 changes: 2 additions & 1 deletion jvue-front/components/themes/dark/Header.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@
</div>
</el-col>
<el-col :xs="24" :sm="24" :md="6">
<div class="search">
<div class="search s-dark">
<el-input v-model="s" placeholder="请输入关键字" clearable>
<el-button
slot="append"
class="s-dark-btn"
type="primary"
icon="el-icon-search"
@click="doSearch"
Expand Down
22 changes: 18 additions & 4 deletions jvue-front/components/themes/dark/PostList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,16 @@
<img :src="post.thumbnails[0]" class="image" alt="image" />
</el-col>
<el-col :xs="24" :md="post.thumbnails.length > 0 ? 18 : 24">
<div>
<h2>{{ post.title === "" ? "暂无标题" : post.title }}</h2>
<div class="post-list-title-dark">
<nuxt-link
:to="
post.name === ''
? '/post-dark/' + post.id + '.html'
: '/post-dark/' + post.name + '.html'
"
>
<h2>{{ post.title === "" ? "暂无标题" : post.title }}</h2>
</nuxt-link>
<div class="bottom clearfix">
<div class="page desc">
{{ post.desc === "" ? "暂无简介" : post.desc }}
Expand All @@ -39,7 +47,9 @@
: '/post-dark/' + post.name + '.html'
"
>
<el-button type="text" class="read-more">查看全文</el-button>
<el-button type="text" class="read-more-dark"
>查看全文</el-button
>
</nuxt-link>
</div>
</el-col>
Expand Down Expand Up @@ -92,13 +102,17 @@ export default {
line-height: 12px;
}

.read-more {
.read-more-dark {
padding: 0;
margin-top: 15px;
float: left;
color: #e78c6c;
}

.read-more-dark:hover {
color: #ffcb6b;
}

.image {
width: 100%;
max-height: 150px;
Expand Down
17 changes: 14 additions & 3 deletions jvue-front/components/themes/default/Aside.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,20 @@
</el-col>
<el-col :xs="24" :md="post.thumbnails.length > 0 ? 18 : 24">
<div>
<h2 :class="post.thumbnails.length > 0 ? 'has-image-title' : ''">
{{ post.title === "" ? "暂无标题" : post.title }}
</h2>
<nuxt-link
class="aside-link"
:to="
post.name === ''
? '/post-dark/' + post.id + '.html'
: '/post-dark/' + post.name + '.html'
"
>
<h2
:class="post.thumbnails.length > 0 ? 'has-image-title' : ''"
>
{{ post.title === "" ? "暂无标题" : post.title }}
</h2>
</nuxt-link>
</div>
</el-col>
</el-row>
Expand Down
18 changes: 15 additions & 3 deletions jvue-front/components/themes/default/PostList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,16 @@
<img :src="post.thumbnails[0]" class="image" alt="image" />
</el-col>
<el-col :xs="24" :md="post.thumbnails.length > 0 ? 18 : 24">
<div>
<h2>{{ post.title === "" ? "暂无标题" : post.title }}</h2>
<div class="post-list-title">
<nuxt-link
:to="
post.name === ''
? '/post/' + post.id + '.html'
: '/post/' + post.name + '.html'
"
>
<h2>{{ post.title === "" ? "暂无标题" : post.title }}</h2>
</nuxt-link>
<div class="bottom clearfix">
<div class="page">
{{ post.desc === "" ? "暂无简介" : post.desc }}
Expand All @@ -39,7 +47,7 @@
: '/post/' + post.name + '.html'
"
>
<el-button type="text" class=".read-more">查看全文</el-button>
<el-button type="text" class="read-more">查看全文</el-button>
</nuxt-link>
</div>
</el-col>
Expand Down Expand Up @@ -92,6 +100,10 @@ export default {
float: left;
}

.read-more:hover {
color: #212121;
}

.image {
width: 100%;
max-height: 150px;
Expand Down
28 changes: 21 additions & 7 deletions jvue-front/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 10 additions & 7 deletions jvue-front/pages/about-dark.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<template>
<el-container>
<el-main>
<el-main class="el-container-dark">
<el-row>
<el-col :xs="0" :md="2">&nbsp;</el-col>
<el-col :xs="24" :md="20">
<el-main>
<el-main class="el-main-dark">
<el-container>
<el-main>
<el-main class="el-main-dark">
<el-container>
<el-header>
<el-header class="el-header-dark">
<HeaderTime />
</el-header>
<el-header>
<el-header class="el-header-dark">
<Header />
</el-header>
<el-main>
<div class="about">
<el-main class="el-main-dark">
<div class="about about-dark">
<div class="visit">
谢谢您，您是第
<img
Expand Down Expand Up @@ -104,8 +104,11 @@ export default {
</script>

<style lang="scss">
@import "./common.css";
@import "./dark.css";
</style>

<style lang="scss" scoped>
.visit {
font-size: 24px;
}
Expand Down
3 changes: 3 additions & 0 deletions jvue-front/pages/about.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,11 @@ export default {
</script>

<style lang="scss" scoped>
@import "./common.css";
@import "./default.css";
</style>

<style lang="scss" scoped>
.visit {
font-size: 24px;
}
Expand Down
Loading