back interdiff of round #2 and #1

appview/pages: show trending repos in the timeline #515

merged
opened by anirudh.fi targeting master from push-zxovstvplnok
files
appview
db
pages
templates
layouts
timeline
user
fragments
state
ERROR
appview/db/db.go

Failed to calculate interdiff for this file.

ERROR
appview/db/star.go

Failed to calculate interdiff for this file.

ERROR
appview/pages/pages.go

Failed to calculate interdiff for this file.

REVERTED
appview/pages/templates/layouts/base.html
···
</head>
<body class="min-h-screen grid grid-cols-1 grid-rows-[min-content_auto_min-content] md:grid-cols-12 gap-4 bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200">
{{ block "topbarLayout" . }}
+
<header class="px-1 col-span-1 md:col-start-3 md:col-span-8" style="z-index: 20;">
-
<header class="px-1 col-span-full" style="z-index: 20;">
{{ template "layouts/topbar" . }}
</header>
{{ end }}
{{ block "mainLayout" . }}
-
<!-- Mobile trending carousel at top - full width -->
-
<div class="px-1 col-span-full lg:hidden">
-
{{ block "contentRight" . }} {{ end }}
-
</div>
-
<div class="px-1 col-span-1 md:col-start-3 md:col-span-8 flex flex-col gap-4">
-
{{ block "contentLayout" . }}
+
<main class="col-span-1 md:col-span-8">
+
{{ block "content" . }}{{ end }}
+
</main>
-
<div class="grid grid-cols-1 lg:grid-cols-12 gap-4">
-
<div class="lg:col-span-2">
-
{{ block "contentLeft" . }} {{ end }}
-
</div>
-
<main class="lg:col-span-8">
-
{{ block "content" . }}{{ end }}
-
</main>
-
<!-- Desktop trending sidebar -->
-
<div class="hidden lg:block lg:col-span-2">
-
{{ block "contentRight" . }} {{ end }}
-
</div>
-
</div>
{{ end }}
+
-
{{ block "contentAfterLayout" . }}
+
<main class="col-span-1 md:col-span-8">
+
{{ block "contentAfter" . }}{{ end }}
+
</main>
-
<div class="grid grid-cols-1 lg:grid-cols-12 gap-4">
-
<div class="lg:col-span-2">
-
{{ block "contentAfterLeft" . }} {{ end }}
-
</div>
-
<main class="lg:col-span-8">
-
{{ block "contentAfter" . }}{{ end }}
-
</main>
-
<div class="lg:col-span-2">
-
{{ block "contentAfterRight" . }} {{ end }}
-
</div>
-
</div>
{{ end }}
</div>
{{ end }}
{{ block "footerLayout" . }}
+
<footer class="px-1 col-span-1 md:col-start-3 md:col-span-8 mt-12">
-
<footer class="px-1 col-span-full mt-12">
{{ template "layouts/footer" . }}
</footer>
{{ end }}
ERROR
appview/pages/templates/timeline/fragments/topStarredRepos.html

Failed to calculate interdiff for this file.

ERROR
appview/pages/templates/timeline/timeline.html

Failed to calculate interdiff for this file.

ERROR
appview/pages/templates/user/fragments/repoCard.html

Failed to calculate interdiff for this file.

ERROR
appview/state/router.go

Failed to calculate interdiff for this file.

ERROR
appview/state/state.go

Failed to calculate interdiff for this file.