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

Jump to bottom

Fix front #86

Merged
merged 2 commits into from
Mar 31, 2019
Merged

Fix front #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38c3c9c
Fix layout
youweics Mar 31, 2019
95c4cd3
Fix front
youweics Mar 31, 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
16 changes: 8 additions & 8 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
# docker-compose --log-level INFO up -d --build --force-recreate jvue-front

# oracle doc
# DB_SID
# This parameter changes the ORACLE_SID of the database. The default value is set to ORCLCDB.
# To connect from outside the container using SQL*Plus,
# $ sqlplus sys/Oradoc_db1@ORCLCDB as sysdba
# Changing default password for SYS user
# alter user sys identified by <new-password>;
# The database alert log can be viewed with
# $ docker logs <Oracle-DB>
# DB_SID
# This parameter changes the ORACLE_SID of the database. The default value is set to ORCLCDB.
# To connect from outside the container using SQL*Plus,
# $ sqlplus sys/Oradoc_db1@ORCLCDB as sysdba
# Changing default password for SYS user
# alter user sys identified by <new-password>;
# The database alert log can be viewed with
# $ docker logs <Oracle-DB>

version: '3'
services:
Expand Down
4 changes: 2 additions & 2 deletions jvue-front/components/themes/dark/Header.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<el-row>
<el-col :xs="24" :sm="3" :md="3">
<el-col :xs="24" :md="5" :xl="3">
<div class="img-wrap">
<nuxt-link to="/" class="float-left">
<div class="img-align-middle">
Expand All @@ -14,7 +14,7 @@
</nuxt-link>
</div>
</el-col>
<el-col :xs="0" :sm="15" :md="15">
<el-col :xs="0" :md="13" :xl="15">
<div class="grid-content bg-purple-light">
<HeaderMenu />
</div>
Expand Down
3 changes: 2 additions & 1 deletion jvue-front/components/themes/dark/HeaderMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export default {
link: "/cat/essay",
icon: "fa fa-pencil"
},
{
/* {
id: 3,
name: "技巧",
link: "/cat/skill",
Expand Down Expand Up @@ -95,6 +95,7 @@ export default {
],
link: "/cat/special"
},
*/
{
id: 6,
name: "笔记",
Expand Down
4 changes: 2 additions & 2 deletions jvue-front/components/themes/default/Header.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<el-row>
<el-col :xs="24" :sm="3" :md="3">
<el-col :xs="24" :md="5" :xl="3">
<div class="img-wrap">
<nuxt-link to="/index-default" class="float-left">
<div class="img-align-middle">
Expand All @@ -14,7 +14,7 @@
</nuxt-link>
</div>
</el-col>
<el-col :xs="0" :sm="15" :md="15">
<el-col :xs="0" :md="13" :xl="15">
<div class="grid-content bg-purple-light">
<HeaderMenu />
</div>
Expand Down
3 changes: 2 additions & 1 deletion jvue-front/components/themes/default/HeaderMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export default {
link: "/cat/essay",
icon: "fa fa-pencil"
},
{
/* {
id: 3,
name: "技巧",
link: "/cat/skill",
Expand Down Expand Up @@ -94,6 +94,7 @@ export default {
],
link: "/cat/special"
},
*/
{
id: 6,
name: "关于",
Expand Down
4 changes: 3 additions & 1 deletion jvue-front/components/themes/default/PostList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,12 @@ export default {
padding: 0;
margin-top: 15px;
float: left;
font-weight: bold;
color: #212121 !important;
}

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

.image {
Expand Down
8 changes: 4 additions & 4 deletions jvue-front/pages/default.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
* css名称必须有default关键字
*/
.post-list-title h2{
color: #409EFF;
color: #000000;
}
.post-list-title h2:hover{
color: #000000;
color: #409EFF;
}
.aside-link h2{
color: #409EFF;
color: #000000;
}
.aside-link h2:hover{
color: #000000;
color: #409EFF;
}
/* 加载更多 */
.loadmore-default {
Expand Down