From 003e608705aafc3ab1d808f1b98244b6e614d031 Mon Sep 17 00:00:00 2001 From: Benature Date: Sat, 18 Apr 2020 20:13:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=BF=80=E6=B4=BB=E7=8A=B6=E6=80=81(`.enable?= =?UTF-8?q?d`)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 ++++-- apps/review/templates/review.pug | 2 +- doc/install.md | 8 ++++---- index.html | 2 +- static/js/review.js | 9 +++++---- static/scss/review.scss | 8 ++++++++ staticsfile/scss/review.css | 8 +++++++- 7 files changed, 30 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 58336b4..9ea6d17 100644 --- a/README.md +++ b/README.md @@ -115,9 +115,10 @@ conda activate # 小白流程不用这条命令 python manage.py runserver ``` -打开[localhost:8000](localhost:8000/)，开始背单词之旅吧 🤓 +默认情况下会自动在默认浏览器打开，开始背单词之旅吧 🤓 +>如果您没有修改过配置但不能自动打开浏览器，请[提交 issue 反馈](https://github.com/Benature/WordReview/issues)。 -当你想要更新代码的时候，请 +当您想要更新代码的时候，请 ```shell git pull @@ -171,6 +172,7 @@ tain ### 更新日志 - 2020.04 + - update: 导航栏样式增加激活状态(`.enabled`) @04-18 - update: 配置文件更换为`.conf`文件（以支持默认参数） @04-18 - feature: 命令行启动后自动打开浏览器 ([Issue#4](https://github.com/Benature/WordReview/issues/4)) @04-16 - feature: 新增[在线预览](https://benature.github.io/WordReview/) @04-16 diff --git a/apps/review/templates/review.pug b/apps/review/templates/review.pug index b8a348f..0c20466 100644 --- a/apps/review/templates/review.pug +++ b/apps/review/templates/review.pug @@ -18,7 +18,7 @@ nav.navbar.navbar-light.bg-light.sticky-top button#btn-quick-jump.btn 跳转 div.navbar-nav.ml-auto.flex-row li.nav-item(style="margin-right:20px;") - a.nav-link.repeat.cur-p 重现模式:开 + a.nav-link.repeat.cur-p.enabled 重现模式:开 li.nav-item a.nav-link.sort-array 顺序 li.nav-item diff --git a/doc/install.md b/doc/install.md index 34868d0..4104193 100644 --- a/doc/install.md +++ b/doc/install.md @@ -16,7 +16,7 @@ git clone https://github.com/Benature/WordReview.git
-进入项目文件夹内，复制一份`./config_sample.py`文件，改名为`./config.py`。 +进入项目文件夹内，复制一份`./config_sample.conf`文件，改名为`./config.conf`。 # 2. Python 环境 @@ -24,7 +24,7 @@ git clone https://github.com/Benature/WordReview.git 1. Install `Miniconda` (recommanded) or `Anaconda` at first. 2. create a virtual environment - 名字随便定，这里以`tgword`为例 + 名字随便定，这里以`word`为例 ```shell conda create -n tgword python=3 @@ -35,10 +35,10 @@ conda create -n tgword python=3 3. activate the environment ```shell -source activate tgword +source activate word ``` -此时命令行左边应该有显示`(tgword)` +此时命令行左边应该有显示`(word)` 4. install requirements diff --git a/index.html b/index.html index b859194..fd1df71 100644 --- a/index.html +++ b/index.html @@ -32,7 +32,7 @@
-
  • 重现模式:开 +
  • 重现模式:开
  • 顺序
    • diff --git a/static/js/review.js b/static/js/review.js index 51d97eb..8a26a2f 100644 --- a/static/js/review.js +++ b/static/js/review.js @@ -375,9 +375,6 @@ $(function () { } } - function selectWord() { - return ++wordIndex; - } // ============================================================= // 页面初始渲染 // ============================================================= @@ -575,7 +572,7 @@ $(function () { wordCount++; hotUpdate(remember); if (wordIndex != wordArray.length - 1) { - wordIndex = selectWord(); + wordIndex++; $('.hide').addClass('d-none') renderWord(wordArray[wordIndex]); } else { @@ -673,6 +670,8 @@ $(function () { default: console.error('未知' + text); } + $('.sort-array').removeClass('enabled'); + $(this).addClass('enabled'); $('.hide').addClass('d-none'); sortMode = text; console.log(text); @@ -688,10 +687,12 @@ $(function () { if ($(this).text() == '重现模式:关') { repeatMode = true $(this).text('重现模式:开') + .addClass('enabled'); layer.msg('重现模式已开') } else if ($(this).text() == '重现模式:开') { repeatMode = false $(this).text('重现模式:关') + .removeClass('enabled'); layer.msg('重现模式已关') } else { layer.msg('未知选择：' + $(this).text()) diff --git a/static/scss/review.scss b/static/scss/review.scss index 4f952c7..1d63d87 100644 --- a/static/scss/review.scss +++ b/static/scss/review.scss @@ -178,6 +178,9 @@ i{ font-size: 16px; color: #c46943; // text-align: center; + background: #f3f4f4; + border-radius: 0.25rem; + padding: 0px 2px; } } @@ -203,3 +206,8 @@ i{ } } +.nav-item{ + .enabled{ + color: black !important; + } +} \ No newline at end of file diff --git a/staticsfile/scss/review.css b/staticsfile/scss/review.css index 0fa7f66..f862d8c 100644 --- a/staticsfile/scss/review.css +++ b/staticsfile/scss/review.css @@ -138,7 +138,10 @@ i { font-size: 20px; } .word-block .word-explain { font-size: 16px; - color: #c46943; } + color: #c46943; + background: #f3f4f4; + border-radius: 0.25rem; + padding: 0px 2px; } .break-words { display: flex; @@ -155,4 +158,7 @@ i { width: 100%; margin: 0px 5px; } +.nav-item .enabled { + color: black !important; } + /*# sourceMappingURL=review.css.map */ \ No newline at end of file