diff --git a/scrapydweb/default_settings.py b/scrapydweb/default_settings.py index ce05a30..419fdce 100644 --- a/scrapydweb/default_settings.py +++ b/scrapydweb/default_settings.py @@ -182,7 +182,7 @@ ########## slack ########## # How to create a slack app: # 1. Visit https://api.slack.com/apps and press the "Create New App" button. -# 2. Enter your App Name (e.g. mybot)and select one of your Slack Workspaces, the press "Create App". +# 2. Enter your App Name (e.g. myapp)and select one of your Slack Workspaces, the press "Create App". # 3. Click the "OAuth & Permissions" menu in the sidebar on the left side of the page. # 4. Scroll down the page and find out "Select Permission Scopes" in the "Scopes" section # 5. Enter "send" and select "Send messages as ", then press "Save Changes" diff --git a/scrapydweb/run.py b/scrapydweb/run.py index e3b1e86..5ffe87b 100644 --- a/scrapydweb/run.py +++ b/scrapydweb/run.py @@ -133,8 +133,8 @@ def load_custom_settings(config): "Then add your SCRAPYD_SERVERS in the config file and restart scrapydweb.\n".format( file=SCRAPYDWEB_SETTINGS_PY)) else: - sys.exit("\nATTENTION:\nYou may encounter ERROR if there are any timer tasks added in v1.2.0,\n" - "and you have to restart scrapydweb and manually restart the stopped tasks.\n" + sys.exit("\nATTENTION:\nYou may encounter ERROR if there are any running timer tasks added in v1.2.0,\n" + "and you have to restart scrapydweb and manually edit the tasks to resume them.\n" "\nThe config file '{file}' has been copied to current working directory.\n" "Please add your SCRAPYD_SERVERS in the config file and restart scrapydweb.\n".format( file=SCRAPYDWEB_SETTINGS_PY)) diff --git a/scrapydweb/static/v130/css/style.css b/scrapydweb/static/v130/css/style.css index f3f02dc..5d61786 100644 --- a/scrapydweb/static/v130/css/style.css +++ b/scrapydweb/static/v130/css/style.css @@ -75,14 +75,18 @@ ol { list-style: none; } -ul#links{ - position: absolute; - bottom: 0; - margin-top: 30px; - margin-bottom: 30px; -} -@media (max-height: 800px) { - ul#links { position: relative; } +/* ul#links{ */ + /* position: absolute; */ + /* bottom: 0; */ + /* margin-top: 30px; */ + /* margin-bottom: 30px; */ +/* } */ +/* @media (max-height: 800px) { */ + /* ul#links { position: relative; } */ +/* } */ + +.github { + margin: 16px 0 16px 20px; } .clear-float { @@ -206,12 +210,23 @@ main>aside { box-sizing: border-box; min-width: 160px; background-color: #343131; - padding: 50px 0; + /* padding: 50px 0; */ + padding-top: 24px; + display: flex; + flex-direction: column; + overflow-y: auto; + /* overflow-y: hidden; */ + /* flex-grow: 1; */ + /* overflow-y: scroll; */ +} + +main>aside:hover { + /* overflow-y: scroll; */ } main>aside h3 { color: #fcfcfc; - line-height: 40px; + line-height: 32px; cursor: default; font-size: 16px; padding: 0 20px; @@ -222,12 +237,18 @@ main>aside a { box-sizing: border-box; width: 100%; display: inline-block; - line-height: 30px; + line-height: 24px; padding-left: 20px; font-size: 14px; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol"; } +main>aside ul { + transition: height .1s ease-in-out; + overflow: hidden; + /* height: auto; */ +} + main>aside li a:hover { background: #fcfcfc; fill: #555; @@ -244,10 +265,10 @@ main>aside li a > span { } -main>aside li#scrapydweb_version{ +main>aside #scrapydweb_version{ color: #67c23a; height: 30px; - padding-left: 20px; + padding-left: 0px; } main>aside li#pypi{height: 35px;} @@ -288,7 +309,7 @@ main>.content-wrap { overflow-x: hidden; overflow-y: scroll; margin-right: -15px; - padding: 16px 48px; + padding: 16px 24px; /* font-family: Consolas, 'Lucida Console', 'DejaVu Sans Mono', monospace; */ font-family: "Gotham Rounded A", "Gotham Rounded B", "Gotham Rounded", "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: 400; @@ -707,18 +728,24 @@ table>tbody tr:last-child { /* https://www.w3schools.com/howto/howto_css_custom_scrollbar.asp START */ /* Width */ +main>aside::-webkit-scrollbar, .folders-content::-webkit-scrollbar, #checkboxes::-webkit-scrollbar { width: 10px; } /* Track */ +main>aside::-webkit-scrollbar-track, .folders-content::-webkit-scrollbar-track, #checkboxes::-webkit-scrollbar-track { border-radius: 10px; } /* Handle */ +main>aside::-webkit-scrollbar-thumb { + background: #bdbdbd; + border-radius: 10px; +} .folders-content::-webkit-scrollbar-thumb, #checkboxes::-webkit-scrollbar-thumb { background: #9093994d; @@ -726,6 +753,10 @@ table>tbody tr:last-child { } /* Handle on hover */ +main>aside::-webkit-scrollbar-thumb:hover { + background: #9e9e9e; + /* opacity: 0.7; */ +} .folders-content::-webkit-scrollbar-thumb:hover, #checkboxes::-webkit-scrollbar-thumb:hover { background: #90939980; diff --git a/scrapydweb/templates/base.html b/scrapydweb/templates/base.html index df3ca97..0211fc1 100644 --- a/scrapydweb/templates/base.html +++ b/scrapydweb/templates/base.html @@ -61,18 +61,18 @@