diff --git a/media/css/reader/reader.css b/media/css/reader/reader.css index 6f386d4ac..138d341a5 100644 --- a/media/css/reader/reader.css +++ b/media/css/reader/reader.css @@ -148,8 +148,11 @@ hr { } .NB-account-wide { - max-width: 38%; + flex: 1; margin: 24px 24px 32px 0; +} +.NB-dashboard-account { + margin: 0; display: flex; flex-direction: column; flex: 1; @@ -5906,13 +5909,14 @@ form.opml_import_form input { display: block; } .NB-splash-modules .NB-modules-center, - .NB-splash-modules .NB-account-wide { + .NB-splash-modules .NB-dashboard-account { max-width: none; } - .NB-splash-modules .NB-modules-center { + .NB-splash-modules .NB-modules-center, + .NB-splash-modules .NB-account-wide { margin-right: 0; } - .NB-splash-modules .NB-account-wide { + .NB-splash-modules .NB-dashboard-account { margin: 0 24px; } } @@ -5920,37 +5924,39 @@ form.opml_import_form input { display: block; } .NB-dashboard-columns-single .NB-splash-modules .NB-modules-center, -.NB-dashboard-columns-single .NB-splash-modules .NB-account-wide { +.NB-dashboard-columns-single .NB-splash-modules .NB-dashboard-account { max-width: none; } -.NB-dashboard-columns-single .NB-splash-modules .NB-modules-center { - margin-right: 0; -} +.NB-dashboard-columns-single .NB-splash-modules .NB-modules-center, .NB-dashboard-columns-single .NB-splash-modules .NB-account-wide { - margin: 0 24px; + margin-right: 0; } .NB-dashboard-columns-triple .NB-splash-modules { display: block; } .NB-dashboard-columns-triple .NB-splash-modules .NB-modules-center, -.NB-dashboard-columns-triple .NB-splash-modules .NB-account-wide { +.NB-dashboard-columns-triple .NB-splash-modules .NB-dashboard-account { max-width: none; } -.NB-dashboard-columns-triple .NB-dashboard-rivers-left .NB-module-header { +.NB-dashboard-columns-triple .NB-dashboard-rivers-left .NB-module-header, +.NB-dashboard-columns-triple .NB-dashboard-rivers-right .NB-module-header { margin: 0 0 24px; } -.NB-density-compact.NB-dashboard-columns-triple .NB-dashboard-rivers-left .NB-module-header { +.NB-density-compact.NB-dashboard-columns-triple .NB-dashboard-rivers-left .NB-module-header, +.NB-density-compact.NB-dashboard-columns-triple .NB-dashboard-rivers-right .NB-module-header { margin: 0 0 4px; } -.NB-dashboard-columns-triple .NB-splash-modules .NB-modules-center { +.NB-dashboard-columns-triple .NB-splash-modules .NB-modules-center, +.NB-dashboard-columns-triple .NB-splash-modules .NB-account-wide { margin: 24px 0 0; padding: 0 24px; } -.NB-density-compact.NB-dashboard-columns-triple .NB-splash-modules .NB-modules-center { +.NB-density-compact.NB-dashboard-columns-triple .NB-splash-modules .NB-modules-center, +.NB-density-compact.NB-dashboard-columns-triple .NB-splash-modules .NB-account-wide { margin: 4px 0 0; padding: 0 4px; } -.NB-dashboard-columns-triple .NB-splash-modules .NB-account-wide { +.NB-dashboard-columns-triple .NB-splash-modules .NB-dashboard-account { margin: 0 24px; } .NB-dashboard-columns-triple .NB-dashboard-rivers-left, @@ -7633,7 +7639,8 @@ form.opml_import_form input { /* = Center Modules = */ /* ================== */ -.NB-modules-center { +.NB-modules-center, +.NB-account-wide { margin: 24px 12px 0 0px; padding: 0 24px; flex: 1; diff --git a/media/img/icons/nouns/add-list.svg b/media/img/icons/nouns/add-list.svg index 4fd06d0ee..43cac0747 100644 --- a/media/img/icons/nouns/add-list.svg +++ b/media/img/icons/nouns/add-list.svg @@ -2,7 +2,7 @@ add-list - + diff --git a/media/img/originals/Nouns.sketch b/media/img/originals/Nouns.sketch index b641689ed..7b8cc2d01 100644 Binary files a/media/img/originals/Nouns.sketch and b/media/img/originals/Nouns.sketch differ diff --git a/templates/reader/dashboard.xhtml b/templates/reader/dashboard.xhtml index 2ef2b6e95..790a286f4 100644 --- a/templates/reader/dashboard.xhtml +++ b/templates/reader/dashboard.xhtml @@ -62,96 +62,98 @@ {% render_dashboard_rivers_right dashboard_rivers %} - {% render_features_module %} +
+ {% render_features_module %} - {% if recommended_feeds %} - {% render_recommended_feed recommended_feeds %} - {% endif %} + {% if recommended_feeds %} + {% render_recommended_feed recommended_feeds %} + {% endif %} - {% if user.is_staff and unmoderated_feeds %} - {% render_recommended_feed unmoderated_feeds 1 %} - {% endif %} - - {% render_account_module %} - -
-
- NewsBlur -
- - - -
- -