From b5b5d4625d64ad83fff1f267d1a35dac69bdec69 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 22 Mar 2020 12:06:41 +0100 Subject: [PATCH 01/17] styles/me: Move `#stats` styling into `dashboard` file --- app/styles/dashboard.scss | 15 +++++++++++++++ app/styles/me.scss | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/styles/dashboard.scss b/app/styles/dashboard.scss index 4058dec56de..74170dbba0c 100644 --- a/app/styles/dashboard.scss +++ b/app/styles/dashboard.scss @@ -1,3 +1,18 @@ +#stats { + margin-left: auto; + padding: 10px; + + span { margin-left: 10px; } + .num { + font-size: 30px; + font-weight: bold; + } + .downloads { + display: flex; + align-items: center; + } +} + #my-crate-lists { flex-direction: column; flex-grow: 2; diff --git a/app/styles/me.scss b/app/styles/me.scss index 65c67641086..c6c6767ddad 100644 --- a/app/styles/me.scss +++ b/app/styles/me.scss @@ -260,18 +260,3 @@ } } } - -#stats { - margin-left: auto; - padding: 10px; - - span { margin-left: 10px; } - .num { - font-size: 30px; - font-weight: bold; - } - .downloads { - display: flex; - align-items: center; - } -} From 5e557af34eade0a6094d916d36d068ad37b87215 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 22 Mar 2020 14:11:41 +0100 Subject: [PATCH 02/17] dashboard: Move `stats` CSS class into CSS module --- app/styles/dashboard.module.scss | 14 ++++++++++++++ app/styles/dashboard.scss | 15 --------------- app/templates/dashboard.hbs | 6 +++--- 3 files changed, 17 insertions(+), 18 deletions(-) create mode 100644 app/styles/dashboard.module.scss diff --git a/app/styles/dashboard.module.scss b/app/styles/dashboard.module.scss new file mode 100644 index 00000000000..3d634e09a05 --- /dev/null +++ b/app/styles/dashboard.module.scss @@ -0,0 +1,14 @@ +.stats { + margin-left: auto; + padding: 10px; + + span { margin-left: 10px; } + .num { + font-size: 30px; + font-weight: bold; + } + .downloads { + display: flex; + align-items: center; + } +} diff --git a/app/styles/dashboard.scss b/app/styles/dashboard.scss index 74170dbba0c..4058dec56de 100644 --- a/app/styles/dashboard.scss +++ b/app/styles/dashboard.scss @@ -1,18 +1,3 @@ -#stats { - margin-left: auto; - padding: 10px; - - span { margin-left: 10px; } - .num { - font-size: 30px; - font-weight: bold; - } - .downloads { - display: flex; - align-items: center; - } -} - #my-crate-lists { flex-direction: column; flex-grow: 2; diff --git a/app/templates/dashboard.hbs b/app/templates/dashboard.hbs index ac70ee33c7b..77669257120 100644 --- a/app/templates/dashboard.hbs +++ b/app/templates/dashboard.hbs @@ -3,10 +3,10 @@
{{svg-jar "dashboard"}}

My Dashboard

-
-
+
+
- {{format-num this.visibleStats.total_downloads}} + {{format-num this.visibleStats.total_downloads}} Total Downloads
From ed9cfa82736d8dfeb4b8ea47633fd0bdfc2863dd Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 22 Mar 2020 14:12:03 +0100 Subject: [PATCH 03/17] dashboard: Remove unused `download` CSS class assignment --- app/templates/dashboard.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/dashboard.hbs b/app/templates/dashboard.hbs index 77669257120..10528ac238d 100644 --- a/app/templates/dashboard.hbs +++ b/app/templates/dashboard.hbs @@ -5,7 +5,7 @@

My Dashboard

- + {{format-num this.visibleStats.total_downloads}} Total Downloads
From 8ad9d38d751634c9dcd44344b318ad47ca88ad15 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 22 Mar 2020 14:15:16 +0100 Subject: [PATCH 04/17] dashboard: Remove unnecessary `my-following` wrapper element --- app/styles/dashboard.scss | 2 +- app/templates/dashboard.hbs | 25 ++++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/app/styles/dashboard.scss b/app/styles/dashboard.scss index 4058dec56de..661d8274b28 100644 --- a/app/styles/dashboard.scss +++ b/app/styles/dashboard.scss @@ -23,7 +23,7 @@ order: 1; margin-right: 0; } - #my-crates, #my-following { margin: 0; } + #my-crates { margin: 0; } } } diff --git a/app/templates/dashboard.hbs b/app/templates/dashboard.hbs index 10528ac238d..c04a39944e1 100644 --- a/app/templates/dashboard.hbs +++ b/app/templates/dashboard.hbs @@ -30,21 +30,20 @@
-
-
-

- {{svg-jar "following"}} - Following -

- {{#if this.hasMoreFollowing}} - - Show all - - {{/if}} -
- +
+

+ {{svg-jar "following"}} + Following +

+ + {{#if this.hasMoreFollowing}} + + Show all + + {{/if}}
+
From a5b95ab8cdc497c5c7d9472cc81189a0031c2a81 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 22 Mar 2020 14:15:57 +0100 Subject: [PATCH 05/17] dashboard: Remove unnecessary `my-crates` wrapper element --- app/styles/dashboard.scss | 1 - app/templates/dashboard.hbs | 24 +++++++++++------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/app/styles/dashboard.scss b/app/styles/dashboard.scss index 661d8274b28..fd8decca2a1 100644 --- a/app/styles/dashboard.scss +++ b/app/styles/dashboard.scss @@ -23,7 +23,6 @@ order: 1; margin-right: 0; } - #my-crates { margin: 0; } } } diff --git a/app/templates/dashboard.hbs b/app/templates/dashboard.hbs index c04a39944e1..389783a32e5 100644 --- a/app/templates/dashboard.hbs +++ b/app/templates/dashboard.hbs @@ -15,21 +15,19 @@
-
-
-

- {{svg-jar "my-packages"}} - My Crates -

+
+

+ {{svg-jar "my-packages"}} + My Crates +

- {{#if this.hasMoreCrates}} - - Show all - - {{/if}} -
- + {{#if this.hasMoreCrates}} + + Show all + + {{/if}}
+

From d90870c2a38517dadde4eed721212359edc10f6a Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 22 Mar 2020 14:19:28 +0100 Subject: [PATCH 06/17] dashboard: Move `my-crate-lists` CSS class into CSS module --- app/styles/dashboard.module.scss | 17 +++++++++++++++++ app/styles/dashboard.scss | 16 ---------------- app/templates/dashboard.hbs | 4 ++-- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/app/styles/dashboard.module.scss b/app/styles/dashboard.module.scss index 3d634e09a05..24559101902 100644 --- a/app/styles/dashboard.module.scss +++ b/app/styles/dashboard.module.scss @@ -12,3 +12,20 @@ align-items: center; } } + +.my-crate-lists { + flex-direction: column; + flex-grow: 2; + margin-right: 20px; + + .header { + display: flex; + justify-content: space-between; + align-items: center; + } + + @media only screen and (max-width: 750px) { + order: 1; + margin-right: 0; + } +} diff --git a/app/styles/dashboard.scss b/app/styles/dashboard.scss index fd8decca2a1..87a12284476 100644 --- a/app/styles/dashboard.scss +++ b/app/styles/dashboard.scss @@ -1,15 +1,3 @@ -#my-crate-lists { - flex-direction: column; - flex-grow: 2; - margin-right: 20px; - - .header { - display: flex; - justify-content: space-between; - align-items: center; - } -} - #my-info { display: flex; @@ -19,10 +7,6 @@ #my-feed { order: 0; } - #my-crate-lists { - order: 1; - margin-right: 0; - } } } diff --git a/app/templates/dashboard.hbs b/app/templates/dashboard.hbs index 389783a32e5..e64daa7ad38 100644 --- a/app/templates/dashboard.hbs +++ b/app/templates/dashboard.hbs @@ -14,8 +14,8 @@
-
-
+
+

{{svg-jar "my-packages"}} My Crates From 1f7901a3563605c4c919c7e7f610ceba97273158 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 22 Mar 2020 14:22:25 +0100 Subject: [PATCH 07/17] dashboard: Move `load-more` CSS class into CSS module --- app/styles/dashboard.module.scss | 12 ++++++++++++ app/styles/dashboard.scss | 12 ------------ app/templates/dashboard.hbs | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/styles/dashboard.module.scss b/app/styles/dashboard.module.scss index 24559101902..97fb04cb710 100644 --- a/app/styles/dashboard.module.scss +++ b/app/styles/dashboard.module.scss @@ -29,3 +29,15 @@ margin-right: 0; } } + +.load-more { + $bg: rgb(219, 217, 207); + text-align: center; + padding: 10px; + outline: 0; + border: 0; + margin-bottom: 20px; + background-color: $bg; + color: white; + &:hover, &:focus { background-color: darken($bg, 10%); } +} diff --git a/app/styles/dashboard.scss b/app/styles/dashboard.scss index 87a12284476..4149dd4d90a 100644 --- a/app/styles/dashboard.scss +++ b/app/styles/dashboard.scss @@ -28,16 +28,4 @@ .date { flex-grow: 2; text-align: right; } } - - .load-more { - $bg: rgb(219, 217, 207); - text-align: center; - padding: 10px; - outline: 0; - border: 0; - margin-bottom: 20px; - background-color: $bg; - color: white; - &:hover, &:focus { background-color: darken($bg, 10%); } - } } diff --git a/app/templates/dashboard.hbs b/app/templates/dashboard.hbs index e64daa7ad38..a11b39063b6 100644 --- a/app/templates/dashboard.hbs +++ b/app/templates/dashboard.hbs @@ -66,12 +66,12 @@ {{/each}} {{#if this.loadingMore}} - + {{else}} {{#if this.hasMore}} - {{/if}} From 9006d345034219e036597786d19a7676567c31f2 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 22 Mar 2020 14:29:29 +0100 Subject: [PATCH 08/17] dashboard: Move `row` CSS class into CSS module --- app/styles/dashboard.module.scss | 6 ++++++ app/styles/dashboard.scss | 5 ----- app/templates/dashboard.hbs | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/styles/dashboard.module.scss b/app/styles/dashboard.module.scss index 97fb04cb710..23530ba93c6 100644 --- a/app/styles/dashboard.module.scss +++ b/app/styles/dashboard.module.scss @@ -30,6 +30,12 @@ } } +.feed-row { + composes: row from global; + display: flex; + flex-direction: column; +} + .load-more { $bg: rgb(219, 217, 207); text-align: center; diff --git a/app/styles/dashboard.scss b/app/styles/dashboard.scss index 4149dd4d90a..842e0d4b55a 100644 --- a/app/styles/dashboard.scss +++ b/app/styles/dashboard.scss @@ -14,11 +14,6 @@ flex-grow: 5; h2 { font-size: 105%; } - .row { - display: flex; - flex-direction: column; - } - .small { padding-left: 10px; } .info { diff --git a/app/templates/dashboard.hbs b/app/templates/dashboard.hbs index a11b39063b6..4dc7b7fc4aa 100644 --- a/app/templates/dashboard.hbs +++ b/app/templates/dashboard.hbs @@ -52,7 +52,7 @@
{{#each this.myFeed as |version|}} -
+
{{ version.crateName }} From 1f7c33ae67f3f9964991653839c72eb637ee71e1 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 22 Mar 2020 14:31:20 +0100 Subject: [PATCH 09/17] dashboard: Move `info` CSS class into CSS module --- app/styles/dashboard.module.scss | 10 ++++++++++ app/styles/dashboard.scss | 10 ---------- app/templates/dashboard.hbs | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/styles/dashboard.module.scss b/app/styles/dashboard.module.scss index 23530ba93c6..8c8cd97d581 100644 --- a/app/styles/dashboard.module.scss +++ b/app/styles/dashboard.module.scss @@ -36,6 +36,16 @@ flex-direction: column; } +.info { + display: flex; + align-items: baseline; + justify-content: space-between; + + span { padding-left: 10px; } + + .date { flex-grow: 2; text-align: right; } +} + .load-more { $bg: rgb(219, 217, 207); text-align: center; diff --git a/app/styles/dashboard.scss b/app/styles/dashboard.scss index 842e0d4b55a..32c2c861b48 100644 --- a/app/styles/dashboard.scss +++ b/app/styles/dashboard.scss @@ -13,14 +13,4 @@ #my-feed { flex-grow: 5; h2 { font-size: 105%; } - - .small { padding-left: 10px; } - - .info { - display: flex; - align-items: baseline; - justify-content: space-between; - - .date { flex-grow: 2; text-align: right; } - } } diff --git a/app/templates/dashboard.hbs b/app/templates/dashboard.hbs index 4dc7b7fc4aa..0945fcc3571 100644 --- a/app/templates/dashboard.hbs +++ b/app/templates/dashboard.hbs @@ -53,12 +53,12 @@
{{#each this.myFeed as |version|}}
-
+
{{ version.crateName }} {{ version.num }} - + {{moment-from-now version.created_at}}
From 907acc332e5a702311d7ff08250421e3eb31c3bc Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 22 Mar 2020 14:32:41 +0100 Subject: [PATCH 10/17] dashboard: Move `my-feed` CSS class into CSS module --- app/styles/dashboard.module.scss | 9 +++++++++ app/styles/dashboard.scss | 9 --------- app/templates/dashboard.hbs | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/styles/dashboard.module.scss b/app/styles/dashboard.module.scss index 8c8cd97d581..7b1eaed5281 100644 --- a/app/styles/dashboard.module.scss +++ b/app/styles/dashboard.module.scss @@ -30,6 +30,15 @@ } } +.my-feed { + flex-grow: 5; + h2 { font-size: 105%; } + + @media only screen and (max-width: 750px) { + order: 0; + } +} + .feed-row { composes: row from global; display: flex; diff --git a/app/styles/dashboard.scss b/app/styles/dashboard.scss index 32c2c861b48..470f79d0450 100644 --- a/app/styles/dashboard.scss +++ b/app/styles/dashboard.scss @@ -3,14 +3,5 @@ @media only screen and (max-width: 750px) { flex-direction: column; - - #my-feed { - order: 0; - } } } - -#my-feed { - flex-grow: 5; - h2 { font-size: 105%; } -} diff --git a/app/templates/dashboard.hbs b/app/templates/dashboard.hbs index 0945fcc3571..493db14e1d6 100644 --- a/app/templates/dashboard.hbs +++ b/app/templates/dashboard.hbs @@ -44,7 +44,7 @@
-
+

{{svg-jar "latest-updates"}} Latest Updates From 09e0f894b047ae9671de29537a8408141c19f03f Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 22 Mar 2020 14:33:54 +0100 Subject: [PATCH 11/17] dashboard: Move `my-info` CSS class into CSS module --- app/styles/app.scss | 1 - app/styles/dashboard.module.scss | 8 ++++++++ app/styles/dashboard.scss | 7 ------- app/templates/dashboard.hbs | 3 +-- 4 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 app/styles/dashboard.scss diff --git a/app/styles/app.scss b/app/styles/app.scss index de035c373bd..ba65396f94d 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -12,7 +12,6 @@ $link-color: rgb(0, 172, 91); @import "home"; @import "crate"; -@import "dashboard"; @import "me"; @import "modules"; diff --git a/app/styles/dashboard.module.scss b/app/styles/dashboard.module.scss index 7b1eaed5281..5096b4111bb 100644 --- a/app/styles/dashboard.module.scss +++ b/app/styles/dashboard.module.scss @@ -13,6 +13,14 @@ } } +.my-info { + display: flex; + + @media only screen and (max-width: 750px) { + flex-direction: column; + } +} + .my-crate-lists { flex-direction: column; flex-grow: 2; diff --git a/app/styles/dashboard.scss b/app/styles/dashboard.scss deleted file mode 100644 index 470f79d0450..00000000000 --- a/app/styles/dashboard.scss +++ /dev/null @@ -1,7 +0,0 @@ -#my-info { - display: flex; - - @media only screen and (max-width: 750px) { - flex-direction: column; - } -} diff --git a/app/templates/dashboard.hbs b/app/templates/dashboard.hbs index 493db14e1d6..ffef10ad5f6 100644 --- a/app/templates/dashboard.hbs +++ b/app/templates/dashboard.hbs @@ -12,8 +12,7 @@

- -
+

From 655c4ce57c78c67605405573f1a3adc3db3058a0 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 22 Mar 2020 14:42:48 +0100 Subject: [PATCH 12/17] CrateDownloadsList: Use CSS module for styling --- app/components/crate-downloads-list.hbs | 8 ++++---- .../crate-downloads-list.module.scss | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 app/components/crate-downloads-list.module.scss diff --git a/app/components/crate-downloads-list.hbs b/app/components/crate-downloads-list.hbs index 4725ca240ce..d86d0b485a8 100644 --- a/app/components/crate-downloads-list.hbs +++ b/app/components/crate-downloads-list.hbs @@ -1,9 +1,9 @@ -
    +
      {{#each @crates as |crate|}} -
    • - +
    • + {{ crate.name }} ({{ crate.max_version }}) -
      +
      {{svg-jar "download-clear-back"}} {{ format-num crate.downloads }}
      diff --git a/app/components/crate-downloads-list.module.scss b/app/components/crate-downloads-list.module.scss new file mode 100644 index 00000000000..0beb4f72fa5 --- /dev/null +++ b/app/components/crate-downloads-list.module.scss @@ -0,0 +1,18 @@ +.list { + list-style: none; + padding: 0; +} + +.row { + margin: 8px 0; +} + +.link { + color: #525252; + background-color: #edebdd; + font-size: 90%; + padding: 20px 10px; + display: flex; + justify-content: space-between; + align-items: center; +} From 2bf81251f331b5b0ecfcc997c0ac08d177692aaa Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 22 Mar 2020 15:32:07 +0100 Subject: [PATCH 13/17] dashboard: Adjust `header` elements --- app/styles/dashboard.module.scss | 5 +++++ app/templates/dashboard.hbs | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/styles/dashboard.module.scss b/app/styles/dashboard.module.scss index 5096b4111bb..d7e820a1b8a 100644 --- a/app/styles/dashboard.module.scss +++ b/app/styles/dashboard.module.scss @@ -30,6 +30,11 @@ display: flex; justify-content: space-between; align-items: center; + + h2 { + font-size: 105%; + line-height: 20px; + } } @media only screen and (max-width: 750px) { diff --git a/app/templates/dashboard.hbs b/app/templates/dashboard.hbs index ffef10ad5f6..cc715b2a54e 100644 --- a/app/templates/dashboard.hbs +++ b/app/templates/dashboard.hbs @@ -13,7 +13,7 @@
      -
      +

      {{svg-jar "my-packages"}} @@ -28,7 +28,7 @@

      -
      +

      {{svg-jar "following"}} Following From d21b108d3ba4963d85bb3696934a2742f94b1556 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 22 Mar 2020 14:49:53 +0100 Subject: [PATCH 14/17] index: Move `crate-lists` CSS class into CSS module --- app/styles/app.scss | 1 - app/styles/home.scss | 43 ------------------------------------ app/styles/index.module.scss | 39 ++++++++++++++++++++++++++++++++ app/templates/index.hbs | 2 +- 4 files changed, 40 insertions(+), 45 deletions(-) delete mode 100644 app/styles/home.scss diff --git a/app/styles/app.scss b/app/styles/app.scss index ba65396f94d..6f74c2c3dd6 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -10,7 +10,6 @@ $link-color: rgb(0, 172, 91); @import "buttons"; -@import "home"; @import "crate"; @import "me"; diff --git a/app/styles/home.scss b/app/styles/home.scss deleted file mode 100644 index 33292ce5f7b..00000000000 --- a/app/styles/home.scss +++ /dev/null @@ -1,43 +0,0 @@ -.crate-lists { - display: flex; - - h2 { - font-size: 105%; - line-height: 20px; - } - - > section { margin: 0 15px; } - - > section[aria-busy="true"] > h2::after { - content: ''; - background-image: url('/assets/ajax-loader.gif'); - display: inline-block; - height: 16px; - width: 16px; - } - - ul, ol { list-style: none; padding: 0; } - li { margin: 8px 0; } - - li a { - width: 100%; - color: lighten($main-color, 10%); - text-decoration: none; - background-color: $main-bg-dark; - font-size: 90%; - padding: 20px 10px; - display: flex; - justify-content: space-between; - align-items: center; - - span { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - - img { vertical-align: middle; } - } - li a:hover { background-color: darken($main-bg-dark, 5%); } - -} diff --git a/app/styles/index.module.scss b/app/styles/index.module.scss index 5b269c0521b..6b281c05c59 100644 --- a/app/styles/index.module.scss +++ b/app/styles/index.module.scss @@ -58,6 +58,7 @@ } .lists { + display: flex; flex-wrap: wrap; justify-content: left; @@ -72,4 +73,42 @@ width: 100%; } } + + h2 { + font-size: 105%; + line-height: 20px; + } + + > section[aria-busy="true"] > h2::after { + content: ''; + background-image: url('/assets/ajax-loader.gif'); + display: inline-block; + height: 16px; + width: 16px; + } + + ul, ol { list-style: none; padding: 0; } + li { margin: 8px 0; } + + li a { + width: 100%; + color: lighten($main-color, 10%); + text-decoration: none; + background-color: $main-bg-dark; + font-size: 90%; + padding: 20px 10px; + display: flex; + justify-content: space-between; + align-items: center; + + &:hover { background-color: darken($main-bg-dark, 5%); } + + span { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + img { vertical-align: middle; } + } } diff --git a/app/templates/index.hbs b/app/templates/index.hbs index 207840e9c05..355358049ae 100644 --- a/app/templates/index.hbs +++ b/app/templates/index.hbs @@ -35,7 +35,7 @@

      -
      +

      New Crates

      From 28bb25bdfbe555895213110395bf552d9dba4e81 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 22 Mar 2020 15:09:34 +0100 Subject: [PATCH 15/17] dashboard: Extract `my/followed-crates-link` CSS classes --- app/styles/dashboard.module.scss | 12 ++++++++++++ app/templates/dashboard.hbs | 8 ++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/styles/dashboard.module.scss b/app/styles/dashboard.module.scss index d7e820a1b8a..44449f59995 100644 --- a/app/styles/dashboard.module.scss +++ b/app/styles/dashboard.module.scss @@ -43,6 +43,18 @@ } } +.my-crates-link, +.followed-crates-link { + color: $main-color-light; + text-decoration: underline; + font-size: 90%; + font-weight: normal; + + &:hover { + color: darken($main-color-light, 10%); + } +} + .my-feed { flex-grow: 5; h2 { font-size: 105%; } diff --git a/app/templates/dashboard.hbs b/app/templates/dashboard.hbs index cc715b2a54e..4eda2fbb541 100644 --- a/app/templates/dashboard.hbs +++ b/app/templates/dashboard.hbs @@ -21,9 +21,7 @@

{{#if this.hasMoreCrates}} - - Show all - + Show all {{/if}}
@@ -35,9 +33,7 @@

{{#if this.hasMoreFollowing}} - - Show all - + Show all {{/if}}
From 14301fc51a2f253e6c16c1154afd9ce44c92721b Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 22 Mar 2020 15:12:36 +0100 Subject: [PATCH 16/17] dashboard: Extract `label` CSS classes --- app/styles/dashboard.module.scss | 5 +++++ app/templates/dashboard.hbs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/styles/dashboard.module.scss b/app/styles/dashboard.module.scss index 44449f59995..277e27861ce 100644 --- a/app/styles/dashboard.module.scss +++ b/app/styles/dashboard.module.scss @@ -11,6 +11,11 @@ display: flex; align-items: center; } + + .label { + color: #858585; + font-size: 80%; + } } .my-info { diff --git a/app/templates/dashboard.hbs b/app/templates/dashboard.hbs index 4eda2fbb541..8dade379c11 100644 --- a/app/templates/dashboard.hbs +++ b/app/templates/dashboard.hbs @@ -7,7 +7,7 @@
{{format-num this.visibleStats.total_downloads}} - Total Downloads + Total Downloads
From a813e0ee1d5528c988976585f165bf52b174c3ea Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 22 Mar 2020 15:52:04 +0100 Subject: [PATCH 17/17] dashboard: Replace `white-rows` CSS class usage --- app/styles/dashboard.module.scss | 34 +++++++++++++++++++++++++++++--- app/templates/dashboard.hbs | 16 +++++++-------- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/app/styles/dashboard.module.scss b/app/styles/dashboard.module.scss index 277e27861ce..11f203c7c41 100644 --- a/app/styles/dashboard.module.scss +++ b/app/styles/dashboard.module.scss @@ -13,7 +13,7 @@ } .label { - color: #858585; + color: $main-color-light; font-size: 80%; } } @@ -69,10 +69,37 @@ } } +.feed { + background: white; + padding: 0 20px; +} + +.feed-list { + margin: 0; + padding: 0; +} + .feed-row { - composes: row from global; display: flex; - flex-direction: column; + align-items: baseline; + padding: 20px 0; + border-bottom: 2px solid $gray-border; + + &:last-of-type { + border: none; + } + + .version { + color: $main-color-light; + font-size: 80%; + } + + .date { + flex-grow: 1; + text-align: right; + color: $main-color-light; + font-size: 80%; + } } .info { @@ -88,6 +115,7 @@ .load-more { $bg: rgb(219, 217, 207); text-align: center; + width: 100%; padding: 10px; outline: 0; border: 0; diff --git a/app/templates/dashboard.hbs b/app/templates/dashboard.hbs index 8dade379c11..a0e0220a97d 100644 --- a/app/templates/dashboard.hbs +++ b/app/templates/dashboard.hbs @@ -45,20 +45,20 @@ Latest Updates

-
- {{#each this.myFeed as |version|}} -
-
+
+
    + {{#each this.myFeed as |version|}} +
    {{ version.crateName }} - {{ version.num }} + {{ version.num }} - + {{moment-from-now version.created_at}}
    -
- {{/each}} + {{/each}} + {{#if this.loadingMore}}