diff --git a/assets/css/styles.scss b/assets/css/styles.scss index 4a890ddbc..08289d3da 100644 --- a/assets/css/styles.scss +++ b/assets/css/styles.scss @@ -1,4 +1,4 @@ -$responsiveWidth: 720px; +$responsiveWidth: 768px; html { scroll-behavior: smooth; @@ -78,7 +78,7 @@ a { header, footer { - &>div { + & > div { display: flex; padding: 16px; width: 100%; @@ -127,13 +127,17 @@ footer { color: var(--ac-color); } -.nav-first { +.nav-first, +.sticky-inner { display: flex; order: 1; flex-flow: column; position: sticky; top: 0; align-self: flex-start; +} + +.nav-first { z-index: 1; } @@ -521,7 +525,7 @@ input[type="checkbox"] { display: none; &, - &+label { + & + label { vertical-align: middle; cursor: pointer; @@ -540,7 +544,7 @@ input[type="checkbox"] { } } - &:checked+label:before { + &:checked + label:before { background-color: var(--ac-color); border-color: var(--ac-color); color: var(--act-color); @@ -600,6 +604,10 @@ ol li { display: none; } +.show-on-large-screen { + display: inline-flex; +} + #installPWA { display: none; } @@ -628,22 +636,6 @@ ol li { background-color: var(--err-color); } -fieldset#history { - .method-list-item { - position: relative; - - span { - position: absolute; - top: 8px; - right: 8px; - font-family: 'Roboto Mono', monospace; - background-color: var(--bg-color); - padding: 4px 8px; - border-radius: 8px; - } - } -} - .align-left { text-align: left; } @@ -692,7 +684,7 @@ fieldset#history { position: fixed; top: 12px; right: 12px; - z-index: 1; + z-index: 2; #hidden-message { display: block; @@ -706,18 +698,18 @@ section { flex-wrap: wrap; } -div.tab { +.tab { width: 100%; order: 1; } input[type="file"], input[type="radio"], -div.tab { +.tab { display: none; } -input[type="radio"]+label { +input[type="radio"] + label { padding: 8px 16px; border-bottom: 2px solid transparent; cursor: pointer; @@ -730,11 +722,11 @@ input[type="radio"]+label { } } -input[type="radio"]:checked+label { +input[type="radio"]:checked + label { border-color: var(--fg-color); } -input[type="radio"]:checked+label+div.tab { +input[type="radio"]:checked + label + .tab { display: block; } @@ -751,7 +743,29 @@ input[type="radio"]:checked+label+div.tab { color: inherit !important; } +.page-columns { + display: flex; + flex: 1; + flex-flow: column; +} + +.inner-left { + display: flex; + order: 1; + margin-right: 16px; +} + +.inner-right { + display: flex; + width: 25%; + order: 2; +} + @media (max-width: $responsiveWidth) { + .content { + flex-flow: column; + } + .columns { flex-flow: column; } @@ -791,4 +805,14 @@ input[type="radio"]:checked+label+div.tab { .show-on-small-screen { display: inline-flex; } + + .sticky-inner { + position: relative; + width: 100%; + } + + .inner-left { + order: 0; + margin-right: 0; + } } diff --git a/components/collections/collection.vue b/components/collections/collection.vue index e58e09b18..0a7efe21c 100644 --- a/components/collections/collection.vue +++ b/components/collections/collection.vue @@ -9,30 +9,7 @@ {{ collection.name }} -
- - - -
- + @@ -40,12 +17,12 @@
@@ -62,12 +39,12 @@
diff --git a/components/collections/folder.vue b/components/collections/folder.vue index 3517c6277..0fd38c244 100644 --- a/components/collections/folder.vue +++ b/components/collections/folder.vue @@ -9,30 +9,11 @@ {{ folder.name }}
-
- - -
- + diff --git a/components/collections/index.vue b/components/collections/index.vue index 22f17bd2f..b347ed4c0 100644 --- a/components/collections/index.vue +++ b/components/collections/index.vue @@ -50,9 +50,8 @@ TODO:
-
-
    -
  • - -
  • -
  • - -
  • -
+ +
    +
  • + +
  • +
  • + +
  • +
+
@@ -322,6 +333,7 @@ import { findStatusGroup } from "../pages/index"; const updateOnLocalStorage = (propertyName, property) => window.localStorage.setItem(propertyName, JSON.stringify(property)); + export default { components: { "pw-section": () => import("./section"), @@ -341,7 +353,7 @@ export default { reverse_sort_status_code: false, reverse_sort_url: false, reverse_sort_path: false, - show: false + showMore: false }; }, computed: { @@ -482,7 +494,7 @@ export default { this.reverse_sort_duration = !this.reverse_sort_duration; }, toggleCollapse() { - this.show = !this.show; + this.showMore = !this.showMore; }, toggleStar(index) { this.history[index]["star"] = !this.history[index]["star"]; diff --git a/layouts/default.vue b/layouts/default.vue index 2daac1679..8fbc70f66 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -137,16 +137,6 @@ cloud_download
-
  • - - folder_special - -
  • -
  • - - watch_later - -
  • @@ -239,22 +229,22 @@
    - Ctrl G + ⌘ G

    - Ctrl S + ⌘ S

    - Ctrl K + ⌘ K

    - Ctrl L + ⌘ L

    diff --git a/pages/index.vue b/pages/index.vue index ecaa41970..5e4367bf9 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -1,696 +1,706 @@