diff options
author | He Yeshuang <yeshuanghe@gmail.com> | 2020-05-05 14:04:09 +0300 |
---|---|---|
committer | He Yeshuang <yeshuanghe@gmail.com> | 2020-05-18 15:15:49 +0300 |
commit | 183992603422952cda424745c7d857f9f390ee9b (patch) | |
tree | 26261019e7096786c6122532deed647defdc876a | |
parent | cd4a30371c715a4fa2e1e5523a02cf99554b2b1b (diff) |
playing w/ terms
-rwxr-xr-x | layouts/_default/baseof.html | 2 | ||||
-rwxr-xr-x | layouts/_default/list.html | 21 | ||||
-rw-r--r-- | layouts/_default/terms.html | 32 | ||||
-rw-r--r-- | static/dist/app.css | 40 | ||||
-rw-r--r-- | static/dist/app.js | 4 | ||||
-rw-r--r-- | tailwind.config.js | 4 |
6 files changed, 81 insertions, 22 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 00f8fa9..68a067d 100755 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -40,7 +40,7 @@ <body class="bg-gray-100 text-gray-700"> <div class="p-6 sm:p-10 md:p-16 flex flex-wrap"> <header class="w-full md:w-2/5 xl:w-1/2 md:pr-12 lg:pr-20 xl:pr-24 order-1 md:order-1 max-w-2xl"> - <div class="z-50 bg-gray-100 max-w-xl md:float-right md:text-right leading-loose tracking-tight md:sticky md:top-0 pt-2"> + <div class="z-50 bg-gray-100 lg:min-w-0.7 max-w-xl md:float-right md:text-right leading-loose tracking-tight md:sticky md:top-0 pt-2"> {{ block "header" . }}{{ partial "site-header.html" .}}{{ end }} </div> </header> diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 06a293e..4afa8d0 100755 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -5,22 +5,23 @@ </section> <section> {{ range (.Paginator 25).Pages.GroupByDate "2006" }} - <!-- <hr class="pt-4" /> --> - <section class="flex flex-col md:flex-row items-start justify-between"> - <div class="pl-4 pb-2 md:sticky top-0 order-1 md:order-2"> - <h2 class="">{{ .Key }}</h2> + <hr class="p-0 m-0" /> + <section class="flex flex-col md:flex-row items-start items-baseline"> + <div class="pl-4 pb-2 md:sticky top-0 order-1 pr-6"> + <h2 class=" text-eucalyptus-600">{{ .Key }}</h2> </div> - <ul class="order-2 md:order-1"> + <ul class="order-2 flex-grow"> {{ range .Pages }} - <div> - <div> + <div class="py-1 flex"> + <span class="font-serif pr-4">{{.Date.Format "01-02"}}</span> + <div class="font-serif font-medium"> <a href="{{ .Permalink }}"> {{ .Title }} </a> + {{ with .Description }} + <div class="pl-4 font-serif font-light italic">{{.}}</div> + {{ end }} </div> - {{ with .Description }} - <div>{{.}}</div> - {{ end }} </div> {{ end }} </ul> diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index 4b2c2d4..23592db 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -1,4 +1,5 @@ {{ define "main" }} +{{ $pageCount := 8 }} {{ $data := .Data }} <article> <div> @@ -6,16 +7,29 @@ </div> </article> <div> - <section> + <section class="flex flex-wrap"> {{ range $key, $value := .Data.Terms }} - <h2> - <a href="{{ "/" | relLangURL }}{{ $.Data.Plural | urlize }}/{{ $key | urlize }}"> - {{ $.Data.Singular | humanize }}: {{ $key }} - </a> - </h2> - {{ range $value.Pages }} - {{ partial "summary.html" . }} - {{ end }} + <section class="w-full xl:w-1/2 xl:pr-4"> + <hr class="p-0 my-4" /> + <div class="clearfix"> + <span class="float-left text-3xl pr-6 font-serif pt-1"> + <a href="{{ "/" | relLangURL }}{{ $.Data.Plural | urlize }}/{{ $key | urlize }}"> + {{ $key }} + </a> + </span> + {{$count:=len ( first $pageCount $value.Pages ) }} + {{ range $k,$v:=( first $pageCount $value.Pages ) }} + <a class="leading-relaxed text-gray-600 hover:text-gray-700 focus:text-gray-700 font-light " + href="{{ .Permalink }}"> + {{ $v.Title }} + </a> + <span class="text-gray-600">{{ if lt $k (sub $count 1) }} / {{ end }}</span> + {{ end }} + {{ if gt (len $value.Pages) $pageCount }} + <span class="text-gray-600"> / …</span> + {{ end }} + </div> + </section> {{ end }} </section> </div> diff --git a/static/dist/app.css b/static/dist/app.css index 8b163ae..3596902 100644 --- a/static/dist/app.css +++ b/static/dist/app.css @@ -6374,6 +6374,14 @@ a:hover, a:focus { min-width: 100%; } +.min-w-0\.7 { + min-width: 70%; +} + +.min-w-0\.4 { + min-width: 40%; +} + .object-contain { -o-object-fit: contain; object-fit: contain; @@ -22692,6 +22700,14 @@ a:hover, a:focus { min-width: 100%; } + .sm\:min-w-0\.7 { + min-width: 70%; + } + + .sm\:min-w-0\.4 { + min-width: 40%; + } + .sm\:object-contain { -o-object-fit: contain; object-fit: contain; @@ -39011,6 +39027,14 @@ a:hover, a:focus { min-width: 100%; } + .md\:min-w-0\.7 { + min-width: 70%; + } + + .md\:min-w-0\.4 { + min-width: 40%; + } + .md\:object-contain { -o-object-fit: contain; object-fit: contain; @@ -55330,6 +55354,14 @@ a:hover, a:focus { min-width: 100%; } + .lg\:min-w-0\.7 { + min-width: 70%; + } + + .lg\:min-w-0\.4 { + min-width: 40%; + } + .lg\:object-contain { -o-object-fit: contain; object-fit: contain; @@ -71649,6 +71681,14 @@ a:hover, a:focus { min-width: 100%; } + .xl\:min-w-0\.7 { + min-width: 70%; + } + + .xl\:min-w-0\.4 { + min-width: 40%; + } + .xl\:object-contain { -o-object-fit: contain; object-fit: contain; diff --git a/static/dist/app.js b/static/dist/app.js index 5432386..7966053 100644 --- a/static/dist/app.js +++ b/static/dist/app.js @@ -103,9 +103,9 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _sas !*** ./sass/style.scss ***! \*************************/ /*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { +/***/ (function(module, exports) { -eval("// extracted by mini-css-extract-plugin//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vLi9zYXNzL3N0eWxlLnNjc3M/MGEyZSJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSIsImZpbGUiOiIuL3Nhc3Mvc3R5bGUuc2Nzcy5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vIGV4dHJhY3RlZCBieSBtaW5pLWNzcy1leHRyYWN0LXBsdWdpbiJdLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///./sass/style.scss\n"); +eval("throw new Error(\"Module build failed (from ../node_modules/mini-css-extract-plugin/dist/loader.js):\\nModuleBuildError: Module build failed (from ../node_modules/sass-loader/dist/cjs.js):\\nError: Node Sass does not yet support your current environment: Linux 64-bit with Unsupported runtime (83)\\nFor more information on which environments are supported please see:\\nhttps://github.com/sass/node-sass/releases/tag/v4.13.1\\n at module.exports (/home/hh/playground/hugo-theme-testbed/22/themes/theme01/node_modules/node-sass/lib/binding.js:13:13)\\n at Object.<anonymous> (/home/hh/playground/hugo-theme-testbed/22/themes/theme01/node_modules/node-sass/lib/index.js:14:35)\\n at Module._compile (internal/modules/cjs/loader.js:1176:30)\\n at Object.Module._extensions..js (internal/modules/cjs/loader.js:1196:10)\\n at Module.load (internal/modules/cjs/loader.js:1040:32)\\n at Function.Module._load (internal/modules/cjs/loader.js:929:14)\\n at Module.require (internal/modules/cjs/loader.js:1080:19)\\n at require (internal/modules/cjs/helpers.js:72:18)\\n at getDefaultSassImplementation (/home/hh/playground/hugo-theme-testbed/22/themes/theme01/node_modules/sass-loader/dist/getDefaultSassImplementation.js:24:10)\\n at getSassImplementation (/home/hh/playground/hugo-theme-testbed/22/themes/theme01/node_modules/sass-loader/dist/getSassImplementation.js:19:72)\\n at /home/hh/playground/hugo-theme-testbed/22/themes/theme01/node_modules/webpack/lib/NormalModule.js:316:20\\n at /home/hh/playground/hugo-theme-testbed/22/themes/theme01/node_modules/loader-runner/lib/LoaderRunner.js:367:11\\n at /home/hh/playground/hugo-theme-testbed/22/themes/theme01/node_modules/loader-runner/lib/LoaderRunner.js:233:18\\n at runSyncOrAsync (/home/hh/playground/hugo-theme-testbed/22/themes/theme01/node_modules/loader-runner/lib/LoaderRunner.js:143:3)\\n at iterateNormalLoaders (/home/hh/playground/hugo-theme-testbed/22/themes/theme01/node_modules/loader-runner/lib/LoaderRunner.js:232:2)\\n at Array.<anonymous> (/home/hh/playground/hugo-theme-testbed/22/themes/theme01/node_modules/loader-runner/lib/LoaderRunner.js:205:4)\\n at Storage.finished (/home/hh/playground/hugo-theme-testbed/22/themes/theme01/node_modules/enhanced-resolve/lib/CachedInputFileSystem.js:55:16)\\n at /home/hh/playground/hugo-theme-testbed/22/themes/theme01/node_modules/enhanced-resolve/lib/CachedInputFileSystem.js:91:9\\n at /home/hh/playground/hugo-theme-testbed/22/themes/theme01/node_modules/graceful-fs/graceful-fs.js:115:16\\n at FSReqCallback.readFileAfterClose [as oncomplete] (internal/fs/read_file_context.js:63:3)\");//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsImZpbGUiOiIuL3Nhc3Mvc3R5bGUuc2Nzcy5qcyIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///./sass/style.scss\n"); /***/ }), diff --git a/tailwind.config.js b/tailwind.config.js index d8d14f8..da49d93 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -17,6 +17,10 @@ module.exports = { minHeight:{ '70vh':'70vh' }, + minWidth:{ + '0.7':"70%", + '0.4':"40%" + }, inset:{ "-1":"-0.25rem" }, |