patch of appview: pages: refactor base layout to be one big grid so we can avoid min-h-screen workarounds that cause permanent scrolling · round #1 · pull #359 · tangled.org/core

+19 -30

appview/pages/templates/layouts/base.html

···

       14
       14
        
                   <title>{{ block "title" . }}{{ end }} · tangled</title>

     

       15
       15
        
                   {{ block "extrameta" . }}{{ end }}

     

       16
       16
        
               </head>

     

       17
       17
       -
               <body class="bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200">

     

       18
       18
       -
                 <div class="px-1">

     

       19
       19
       -
                   {{ block "topbarLayout" . }}

     

       20
       20
       -
                   <div class="grid grid-cols-1 md:grid-cols-12 gap-4">

     

       21
       21
       -
                     <header class="col-span-1 md:col-start-3 md:col-span-8" style="z-index: 20;">

     

       22
       22
       -
                       {{ template "layouts/topbar" . }}

     

       23
       23
       -
                     </header>

     

       24
       24
       -
                   </div>

     

       25
       25
       -
                   {{ end }}

     

       26
       26
       -
                 </div>

     

       17
       17
       +
               <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">

     

       18
       18
       +
                 {{ block "topbarLayout" . }}

     

       19
       19
       +
                   <header class="px-1 col-span-1 md:col-start-3 md:col-span-8" style="z-index: 20;">

     

       20
       20
       +
                     {{ template "layouts/topbar" . }}

     

       21
       21
       +
                   </header>

     

       22
       22
       +
                 {{ end }}

     

       27
       23
        
       

     

       28
       28
       -
                 <div class="px-1 flex flex-col min-h-screen gap-4">

     

       29
       29
       -
                   {{ block "contentLayout" . }}

     

       30
       30
       -
                     <div class="grid grid-cols-1 md:grid-cols-12 gap-4">

     

       24
       24
       +
                 {{ block "mainLayout" . }}

     

       25
       25
       +
                   <div class="px-1 col-span-1 md:col-start-3 md:col-span-8 flex flex-col gap-4">

     

       26
       26
       +
                     {{ block "contentLayout" . }}

     

       31
       27
        
                       <div class="col-span-1 md:col-span-2">

     

       32
       28
        
                         {{ block "contentLeft" . }} {{ end }}

     

       33
       29
        
                       </div>

     
···

       37
       33
        
                       <div class="col-span-1 md:col-span-2">

     

       38
       34
        
                         {{ block "contentRight" . }} {{ end }}

     

       39
       35
        
                       </div>

     

       40
       40
       -
                     </div>

     

       41
       41
       -
                   {{ end }}

     

       42
       42
       -
       

     

       43
       43
       -
                   {{ block "contentAfterLayout" . }}

     

       44
       44
       -
                     <div class="grid grid-cols-1 md:grid-cols-12 gap-4">

     

       36
       36
       +
                     {{ end }}

     

       37
       37
       +
         

     

       38
       38
       +
                     {{ block "contentAfterLayout" . }}

     

       45
       39
        
                       <div class="col-span-1 md:col-span-2">

     

       46
       40
        
                         {{ block "contentAfterLeft" . }} {{ end }}

     

       47
       41
        
                       </div>

     
···

       51
       45
        
                       <div class="col-span-1 md:col-span-2">

     

       52
       46
        
                         {{ block "contentAfterRight" . }} {{ end }}

     

       53
       47
        
                       </div>

     

       54
       54
       -
                     </div>

     

       55
       55
       -
                   {{ end }}

     

       56
       56
       -
                 </div>

     

       57
       57
       -
       

     

       58
       58
       -
                 <div class="px-1 mt-16">

     

       59
       59
       -
                   {{ block "footerLayout" . }}

     

       60
       60
       -
                   <div class="grid grid-cols-1 md:grid-cols-12 gap-4">

     

       61
       61
       -
                     <footer class="col-span-1 md:col-start-3 md:col-span-8">

     

       62
       62
       -
                       {{ template "layouts/footer" . }}

     

       63
       63
       -
                     </footer>

     

       48
       48
       +
                     {{ end }}

     

       64
       49
        
                   </div>

     

       65
       65
       -
                   {{ end }}

     

       66
       66
       -
                 </div>

     

       50
       50
       +
                 {{ end }}

     

       67
       51
        
       

     

       52
       52
       +
                 {{ block "footerLayout" . }}

     

       53
       53
       +
                   <footer class="px-1 col-span-1 md:col-start-3 md:col-span-8 mt-12">

     

       54
       54
       +
                     {{ template "layouts/footer" . }}

     

       55
       55
       +
                   </footer>

     

       56
       56
       +
                 {{ end }}

     

       68
       57
        
               </body>

     

       69
       58
        
           </html>

     

       70
       59
        
       {{ end }}

+1 -1

appview/pages/templates/layouts/topbar.html

···

       1
       1
        
       {{ define "layouts/topbar" }}

     

       2
       2
       -
           <nav class="space-x-4 mb-4 px-6 py-2 rounded bg-white dark:bg-gray-800 dark:text-white drop-shadow-sm">

     

       2
       2
       +
           <nav class="space-x-4 px-6 py-2 rounded bg-white dark:bg-gray-800 dark:text-white drop-shadow-sm">

     

       3
       3
        
               <div class="flex justify-between p-0 items-center">

     

       4
       4
        
                   <div id="left-items">

     

       5
       5
        
                       <a href="/" hx-boost="true" class="flex gap-2 font-semibold italic">

+19 -13

appview/pages/templates/repo/commit.html

···

       80
       80
        
       {{end}}

     

       81
       81
        
       

     

       82
       82
        
       {{ define "topbarLayout" }}

     

       83
       83
       -
         <header style="z-index: 20;">

     

       83
       83
       +
         <header class="px-1 col-span-full" style="z-index: 20;">

     

       84
       84
        
           {{ template "layouts/topbar" . }}

     

       85
       85
        
         </header>

     

       86
       86
        
       {{ end }}

     

       87
       87
        
       

     

       88
       88
       -
       {{ define "contentLayout"  }}

     

       89
       89
       -
         {{ block "content" . }}{{ end }}

     

       90
       90
       -
       {{ end }}

     

       88
       88
       +
       {{ define "mainLayout" }}

     

       89
       89
       +
         <div class="px-1 col-span-full flex flex-col gap-4">

     

       90
       90
       +
           {{ block "contentLayout" . }}

     

       91
       91
       +
             {{ block "content" . }}{{ end }}

     

       92
       92
       +
           {{ end }}

     

       91
       93
        
       

     

       92
       92
       -
       {{ define "contentAfterLayout"  }}

     

       93
       93
       -
         <div class="grid grid-cols-1 md:grid-cols-12 gap-4">

     

       94
       94
       -
           <div class="col-span-1 md:col-span-2">

     

       95
       95
       -
             {{ block "contentAfterLeft" . }} {{ end }}

     

       94
       94
       +
           {{ block "contentAfterLayout" . }}

     

       95
       95
       +
           <div class="grid grid-cols-1 md:grid-cols-12 gap-4">

     

       96
       96
       +
             <div class="col-span-1 md:col-span-2">

     

       97
       97
       +
               {{ block "contentAfterLeft" . }} {{ end }}

     

       98
       98
       +
             </div>

     

       99
       99
       +
             <main class="col-span-1 md:col-span-10">

     

       100
       100
       +
               {{ block "contentAfter" . }}{{ end }}

     

       101
       101
       +
             </main>

     

       96
       102
        
           </div>

     

       97
       97
       -
           <main class="col-span-1 md:col-span-10">

     

       98
       98
       -
             {{ block "contentAfter" . }}{{ end }}

     

       99
       99
       -
           </main>

     

       103
       103
       +
           {{ end }}

     

       100
       104
        
         </div>

     

       101
       105
        
       {{ end }}

     

       102
       106
        
       

     

       103
       103
       -
       {{ define "footerLayout"  }}

     

       104
       104
       -
         {{ template "layouts/footer" . }}

     

       107
       107
       +
       {{ define "footerLayout" }}

     

       108
       108
       +
         <footer class="px-1 col-span-full mt-12">

     

       109
       109
       +
           {{ template "layouts/footer" . }}

     

       110
       110
       +
         </footer>

     

       105
       111
        
       {{ end }}

     

       106
       112
        
       

     

       107
       113
        
       {{ define "contentAfter" }}

+21 -13

appview/pages/templates/repo/compare/compare.html

···

       11
       11
        
       {{ end }}

     

       12
       12
        
       

     

       13
       13
        
       {{ define "topbarLayout" }}

     

       14
       14
       -
         {{ template "layouts/topbar" . }}

     

       14
       14
       +
         <header class="px-1 col-span-full" style="z-index: 20;">

     

       15
       15
       +
           {{ template "layouts/topbar" . }}

     

       16
       16
       +
         </header>

     

       15
       17
        
       {{ end }}

     

       16
       18
        
       

     

       17
       17
       -
       {{ define "contentLayout"  }}

     

       18
       18
       -
         {{ block "content" . }}{{ end }}

     

       19
       19
       -
       {{ end }}

     

       19
       19
       +
       {{ define "mainLayout" }}

     

       20
       20
       +
         <div class="px-1 col-span-full flex flex-col gap-4">

     

       21
       21
       +
           {{ block "contentLayout" . }}

     

       22
       22
       +
             {{ block "content" . }}{{ end }}

     

       23
       23
       +
           {{ end }}

     

       20
       24
        
       

     

       21
       21
       -
       {{ define "contentAfterLayout"  }}

     

       22
       22
       -
         <div class="grid grid-cols-1 md:grid-cols-12 gap-4">

     

       23
       23
       -
           <div class="col-span-1 md:col-span-2">

     

       24
       24
       -
             {{ block "contentAfterLeft" . }} {{ end }}

     

       25
       25
       +
           {{ block "contentAfterLayout" . }}

     

       26
       26
       +
           <div class="grid grid-cols-1 md:grid-cols-12 gap-4">

     

       27
       27
       +
             <div class="col-span-1 md:col-span-2">

     

       28
       28
       +
               {{ block "contentAfterLeft" . }} {{ end }}

     

       29
       29
       +
             </div>

     

       30
       30
       +
             <main class="col-span-1 md:col-span-10">

     

       31
       31
       +
               {{ block "contentAfter" . }}{{ end }}

     

       32
       32
       +
             </main>

     

       25
       33
        
           </div>

     

       26
       26
       -
           <main class="col-span-1 md:col-span-10">

     

       27
       27
       -
             {{ block "contentAfter" . }}{{ end }}

     

       28
       28
       -
           </main>

     

       34
       34
       +
           {{ end }}

     

       29
       35
        
         </div>

     

       30
       36
        
       {{ end }}

     

       31
       37
        
       

     

       32
       32
       -
       {{ define "footerLayout"  }}

     

       33
       33
       -
         {{ template "layouts/footer" . }}

     

       38
       38
       +
       {{ define "footerLayout" }}

     

       39
       39
       +
         <footer class="px-1 col-span-full mt-12">

     

       40
       40
       +
           {{ template "layouts/footer" . }}

     

       41
       41
       +
         </footer>

     

       34
       42
        
       {{ end }}

     

       35
       43
        
       

     

       36
       44
        
       {{ define "contentAfter" }}

+21 -13

appview/pages/templates/repo/pulls/interdiff.html

···

       29
       29
        
       {{ end }}

     

       30
       30
        
       

     

       31
       31
        
       {{ define "topbarLayout" }}

     

       32
       32
       -
         {{ template "layouts/topbar" . }}

     

       32
       32
       +
         <header class="px-1 col-span-full" style="z-index: 20;">

     

       33
       33
       +
           {{ template "layouts/topbar" . }}

     

       34
       34
       +
         </header>

     

       33
       35
        
       {{ end }}

     

       34
       36
        
       

     

       35
       35
       -
       {{ define "contentLayout"  }}

     

       36
       36
       -
         {{ block "content" . }}{{ end }}

     

       37
       37
       -
       {{ end }}

     

       37
       37
       +
       {{ define "mainLayout" }}

     

       38
       38
       +
         <div class="px-1 col-span-full flex flex-col gap-4">

     

       39
       39
       +
           {{ block "contentLayout" . }}

     

       40
       40
       +
             {{ block "content" . }}{{ end }}

     

       41
       41
       +
           {{ end }}

     

       38
       42
        
       

     

       39
       39
       -
       {{ define "contentAfterLayout"  }}

     

       40
       40
       -
         <div class="grid grid-cols-1 md:grid-cols-12 gap-4">

     

       41
       41
       -
           <div class="col-span-1 md:col-span-2">

     

       42
       42
       -
             {{ block "contentAfterLeft" . }} {{ end }}

     

       43
       43
       +
           {{ block "contentAfterLayout" . }}

     

       44
       44
       +
           <div class="grid grid-cols-1 md:grid-cols-12 gap-4">

     

       45
       45
       +
             <div class="col-span-1 md:col-span-2">

     

       46
       46
       +
               {{ block "contentAfterLeft" . }} {{ end }}

     

       47
       47
       +
             </div>

     

       48
       48
       +
             <main class="col-span-1 md:col-span-10">

     

       49
       49
       +
               {{ block "contentAfter" . }}{{ end }}

     

       50
       50
       +
             </main>

     

       43
       51
        
           </div>

     

       44
       44
       -
           <main class="col-span-1 md:col-span-10">

     

       45
       45
       -
             {{ block "contentAfter" . }}{{ end }}

     

       46
       46
       -
           </main>

     

       52
       52
       +
           {{ end }}

     

       47
       53
        
         </div>

     

       48
       54
        
       {{ end }}

     

       49
       55
        
       

     

       50
       50
       -
       {{ define "footerLayout"  }}

     

       51
       51
       -
         {{ template "layouts/footer" . }}

     

       56
       56
       +
       {{ define "footerLayout" }}

     

       57
       57
       +
         <footer class="px-1 col-span-full mt-12">

     

       58
       58
       +
           {{ template "layouts/footer" . }}

     

       59
       59
       +
         </footer>

     

       52
       60
        
       {{ end }}

     

       53
       61
        
       

     

       54
       62

+21 -13

appview/pages/templates/repo/pulls/patch.html

···

       35
       35
        
       {{ end }}

     

       36
       36
        
       

     

       37
       37
        
       {{ define "topbarLayout" }}

     

       38
       38
       -
         {{ template "layouts/topbar" . }}

     

       38
       38
       +
         <header class="px-1 col-span-full" style="z-index: 20;">

     

       39
       39
       +
           {{ template "layouts/topbar" . }}

     

       40
       40
       +
         </header>

     

       39
       41
        
       {{ end }}

     

       40
       42
        
       

     

       41
       41
       -
       {{ define "contentLayout"  }}

     

       42
       42
       -
         {{ block "content" . }}{{ end }}

     

       43
       43
       -
       {{ end }}

     

       43
       43
       +
       {{ define "mainLayout" }}

     

       44
       44
       +
         <div class="px-1 col-span-full flex flex-col gap-4">

     

       45
       45
       +
           {{ block "contentLayout" . }}

     

       46
       46
       +
             {{ block "content" . }}{{ end }}

     

       47
       47
       +
           {{ end }}

     

       44
       48
        
       

     

       45
       45
       -
       {{ define "contentAfterLayout"  }}

     

       46
       46
       -
         <div class="grid grid-cols-1 md:grid-cols-12 gap-4">

     

       47
       47
       -
           <div class="col-span-1 md:col-span-2">

     

       48
       48
       -
             {{ block "contentAfterLeft" . }} {{ end }}

     

       49
       49
       +
           {{ block "contentAfterLayout" . }}

     

       50
       50
       +
           <div class="grid grid-cols-1 md:grid-cols-12 gap-4">

     

       51
       51
       +
             <div class="col-span-1 md:col-span-2">

     

       52
       52
       +
               {{ block "contentAfterLeft" . }} {{ end }}

     

       53
       53
       +
             </div>

     

       54
       54
       +
             <main class="col-span-1 md:col-span-10">

     

       55
       55
       +
               {{ block "contentAfter" . }}{{ end }}

     

       56
       56
       +
             </main>

     

       49
       57
        
           </div>

     

       50
       50
       -
           <main class="col-span-1 md:col-span-10">

     

       51
       51
       -
             {{ block "contentAfter" . }}{{ end }}

     

       52
       52
       -
           </main>

     

       58
       58
       +
           {{ end }}

     

       53
       59
        
         </div>

     

       54
       60
        
       {{ end }}

     

       55
       61
        
       

     

       56
       56
       -
       {{ define "footerLayout"  }}

     

       57
       57
       -
         {{ template "layouts/footer" . }}

     

       62
       62
       +
       {{ define "footerLayout" }}

     

       63
       63
       +
         <footer class="px-1 col-span-full mt-12">

     

       64
       64
       +
           {{ template "layouts/footer" . }}

     

       65
       65
       +
         </footer>

     

       58
       66
        
       {{ end }}

     

       59
       67
        
       

     

       60
       68
        
       {{ define "contentAfter" }}