From 55f7d68f862bed335cdf86b0104fef9690de4166 Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 24 Nov 2021 09:49:03 +0800 Subject: [PATCH 1/2] modify code --- templates/explore/data_analysis.tmpl | 9 +++- web_src/js/components/ProAnalysis.vue | 84 +++++++++++++++++++--------------- web_src/js/components/UserAnalysis.vue | 9 +++- 3 files changed, 60 insertions(+), 42 deletions(-) diff --git a/templates/explore/data_analysis.tmpl b/templates/explore/data_analysis.tmpl index 8277dc902..4807e9903 100755 --- a/templates/explore/data_analysis.tmpl +++ b/templates/explore/data_analysis.tmpl @@ -8,7 +8,12 @@ + + +.ui.container{display:block;max-width:100%}@media only screen and (max-width:767.98px){.ui.ui.ui.container:not(.fluid){width:auto;margin-left:1em;margin-right:1em}.ui.ui.ui.grid.container{width:auto}.ui.ui.ui.relaxed.grid.container{width:auto}.ui.ui.ui.very.relaxed.grid.container{width:auto}}@media only screen and (min-width:768px) and (max-width:991.98px){.ui.ui.ui.container:not(.fluid){width:723px;margin-left:auto;margin-right:auto}.ui.ui.ui.grid.container{width:calc(723px + 2rem)}.ui.ui.ui.relaxed.grid.container{width:calc(723px + 3rem)}.ui.ui.ui.very.relaxed.grid.container{width:calc(723px + 5rem)}}@media only screen and (min-width:1900px) and (max-width:1199.98px){.ui.ui.ui.container:not(.fluid){width:933px;margin-left:auto;margin-right:auto}.ui.ui.ui.grid.container{width:calc(933px + 2rem)}.ui.ui.ui.relaxed.grid.container{width:calc(933px + 3rem)}.ui.ui.ui.very.relaxed.grid.container{width:calc(933px + 5rem)}}@media only screen and (min-width:1900px){.ui.ui.ui.container:not(.fluid){width:1900px;margin-left:auto;margin-right:auto}.ui.ui.ui.grid.container{width:calc(1127px + 2rem)}.ui.ui.ui.relaxed.grid.container{width:calc(1127px + 3rem)}.ui.ui.ui.very.relaxed.grid.container{width:calc(1127px + 5rem)}}.ui.text.container{font-family:Roboto,'Helvetica Neue',Arial,Helvetica,sans-serif;max-width:700px;line-height:1.5;font-size:1.14285714rem}.ui.fluid.container{width:100%}.ui[class*="left aligned"].container{text-align:left}.ui[class*="center aligned"].container{text-align:center}.ui[class*="right aligned"].container{text-align:right}.ui.justified.container{text-align:justify;-webkit-hyphens:auto;-ms-hyphens:auto;hyphens:auto} +@media only screen and (min-width:1900px){.following.bar #navbar,footer .container{padding:0px 20px 0px 20px}} + + \ No newline at end of file diff --git a/web_src/js/components/ProAnalysis.vue b/web_src/js/components/ProAnalysis.vue index b3abd1d04..5b61e92a0 100755 --- a/web_src/js/components/ProAnalysis.vue +++ b/web_src/js/components/ProAnalysis.vue @@ -207,44 +207,46 @@
-
贡献者TOP10
-
- - - - - - - - - - - - - +
+
贡献者TOP10
+
+ + + + + + + + + + + + + +
@@ -1206,6 +1208,11 @@ height: 30px; border-radius:0px 4px 4px 0px; } + .btnFirst, .btn, .btnLast { + cursor: pointer; + } + + /* .btn:focus, .btn:active{ @@ -1229,6 +1236,7 @@ .colorChange { background-color: #409effd6; color: #FFFF; + cursor: default; } .items{ text-align: center; diff --git a/web_src/js/components/UserAnalysis.vue b/web_src/js/components/UserAnalysis.vue index a8af042fa..d92148555 100755 --- a/web_src/js/components/UserAnalysis.vue +++ b/web_src/js/components/UserAnalysis.vue @@ -504,6 +504,10 @@ height: 30px; border-radius:0px 4px 4px 0px; } + .btnFirst,.btn,.btnLast { + cursor: pointer; + } + /* .btn:focus, .btn:active{ @@ -524,8 +528,9 @@ } .colorChange { - background-color: #409effd6; - color: #FFFF; + background-color: #409effd6; + color: #FFFF; + cursor: default; } \ No newline at end of file From a65c88ed875a156bfadce43ea3700bd9e83a3717 Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 24 Nov 2021 11:22:47 +0800 Subject: [PATCH 2/2] modify code --- templates/base/footer_content_fluid.tmpl | 42 +++++++ templates/base/footer_fluid.tmpl | 48 +++++++ templates/base/head_fluid.tmpl | 208 +++++++++++++++++++++++++++++++ templates/base/head_navbar_fluid.tmpl | 177 ++++++++++++++++++++++++++ templates/explore/data_analysis.tmpl | 8 +- 5 files changed, 477 insertions(+), 6 deletions(-) create mode 100644 templates/base/footer_content_fluid.tmpl create mode 100644 templates/base/footer_fluid.tmpl create mode 100644 templates/base/head_fluid.tmpl create mode 100644 templates/base/head_navbar_fluid.tmpl diff --git a/templates/base/footer_content_fluid.tmpl b/templates/base/footer_content_fluid.tmpl new file mode 100644 index 000000000..e07a4d5ab --- /dev/null +++ b/templates/base/footer_content_fluid.tmpl @@ -0,0 +1,42 @@ + diff --git a/templates/base/footer_fluid.tmpl b/templates/base/footer_fluid.tmpl new file mode 100644 index 000000000..cb3eb7b29 --- /dev/null +++ b/templates/base/footer_fluid.tmpl @@ -0,0 +1,48 @@ +{{/* + + +
+ */}} + + {{template "custom/body_inner_post" .}} + +
+ + {{template "custom/body_outer_post" .}} + + {{template "base/footer_content_fluid" .}} + + + {{if .RequireSimpleMDE}} + + + + + {{end}} + + + {{if .RequireMinicolors}} + + {{end}} + {{if .RequireU2F}} + + {{end}} + {{if .EnableCaptcha}} + {{if eq .CaptchaType "recaptcha"}} + + {{end}} + {{end}} + {{if .RequireTribute}} + + {{end}} + {{if .PageIsHome}} + + {{end}} + + + {{template "custom/footer" .}} + + + \ No newline at end of file diff --git a/templates/base/head_fluid.tmpl b/templates/base/head_fluid.tmpl new file mode 100644 index 000000000..d16d42200 --- /dev/null +++ b/templates/base/head_fluid.tmpl @@ -0,0 +1,208 @@ + + + + + + + {{if .Title}}{{.Title}} - {{end}} {{if .Repository.Name}}{{.Repository.Name}} - {{end}}{{AppName}} + + {{if UseServiceWorker}} + + {{else}} + + {{end}} + + + + + + + {{if .IsSigned}} + + {{end}} + {{if .ContextUser}} + + {{end}} + {{if .SearchLimit}} + + {{end}} +{{if .GoGetImport}} + + +{{end}} + + + + + + + + +{{if .RequireSimpleMDE}} + +{{end}} + +{{if .RequireTribute}} + +{{end}} + + + +{{if .RequireMinicolors}} + +{{end}} + +{{if .PageIsUserProfile}} + + + + + {{if .Owner.Description}} + + {{end}} +{{else if .Repository}} + {{if .Issue}} + + + {{if .Issue.Content}} + + {{end}} + {{else}} + + + {{if .Repository.Description}} + + {{end}} + {{end}} + + +{{else}} + + + + + +{{end}} + +{{if .IsSigned }} + {{ if ne .SignedUser.Theme "gitea" }} + + {{end}} +{{else if ne DefaultTheme "gitea"}} + +{{end}} +{{template "custom/header" .}} + + + + + + + {{template "custom/body_outer_pre" .}} + +
+ + + {{template "custom/body_inner_pre" .}} + + {{if not .PageIsInstall}} +
+ {{template "base/head_navbar_fluid" .}} +
+ {{end}} +{{/* +
+ + +*/}} diff --git a/templates/base/head_navbar_fluid.tmpl b/templates/base/head_navbar_fluid.tmpl new file mode 100644 index 000000000..11f5e70da --- /dev/null +++ b/templates/base/head_navbar_fluid.tmpl @@ -0,0 +1,177 @@ + diff --git a/templates/explore/data_analysis.tmpl b/templates/explore/data_analysis.tmpl index 4807e9903..34ad3f018 100755 --- a/templates/explore/data_analysis.tmpl +++ b/templates/explore/data_analysis.tmpl @@ -1,10 +1,10 @@ -{{template "base/head" .}} +{{template "base/head_fluid" .}}
-{{template "base/footer" .}} +{{template "base/footer_fluid" .}} \ No newline at end of file