Skip to content

Commit 8fe2b3b

Browse files
committed
fix dirty hacks
1 parent 791aa53 commit 8fe2b3b

File tree

10 files changed

+39
-43
lines changed

10 files changed

+39
-43
lines changed

templates/base/footer_content.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<footer role="group" aria-label="{{.locale.Tr "aria.footer"}}">
2-
<div class="gt-float-left left-links" role="contentinfo" aria-label="{{.locale.Tr "aria.footer.software"}}">
1+
<footer class="page-footer" role="group" aria-label="{{.locale.Tr "aria.footer"}}">
2+
<div class="left-links" role="contentinfo" aria-label="{{.locale.Tr "aria.footer.software"}}">
33
<a target="_blank" rel="noopener noreferrer" href="https://gitea.io">{{.locale.Tr "powered_by" "Gitea"}}</a>
44
{{if (or .ShowFooterVersion .PageIsAdmin)}}
55
{{.locale.Tr "version"}}:
@@ -14,7 +14,7 @@
1414
{{.locale.Tr "template"}}{{if .TemplateName}} {{.TemplateName}}{{end}}: <strong>{{call .TemplateLoadTimes}}</strong>
1515
{{end}}
1616
</div>
17-
<div class="gt-float-right right-links" role="group" aria-label="{{.locale.Tr "aria.footer.links"}}">
17+
<div class="right-links" role="group" aria-label="{{.locale.Tr "aria.footer.links"}}">
1818
<div class="ui dropdown upward language">
1919
<span>{{svg "octicon-globe"}} {{.locale.LangName}}</span>
2020
<div class="menu language-menu">

templates/base/head.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
{{template "custom/body_inner_pre" .}}
8484

8585
{{if not .PageIsInstall}}
86-
<div class="ui top secondary stackable main menu following bar light no-vertical-tabs">
86+
<div class="ui top secondary stackable main menu following bar light">
8787
{{template "base/head_navbar" .}}
8888
</div><!-- end bar -->
8989
{{end}}

templates/repo/cite/cite_modal.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{{.locale.Tr "repo.cite_this_repo"}}
44
</div>
55
<div class="content">
6-
<div class="ui stackable secondary menu mobile--margin-between-items mobile--no-negative-margins no-vertical-tabs">
6+
<div class="ui stackable secondary menu">
77
<div class="fitted item">
88
<div class="ui action input" id="citation-panel">
99
{{template "repo/cite/cite_buttons" .}}

templates/repo/header.tmpl

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
{{end}}
152152
<div class="ui tabs container">
153153
{{if not (or .Repository.IsBeingCreated .Repository.IsBroken)}}
154-
<div class="ui tabular stackable menu navbar">
154+
<div class="ui tabular menu navbar gt-overflow-x-auto gt-overflow-y-hidden">
155155
{{if .Permission.CanRead $.UnitTypeCode}}
156156
<a class="{{if .PageIsViewCode}}active {{end}}item" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL}}{{end}}">
157157
{{svg "octicon-code"}} {{.locale.Tr "repo.code"}}
@@ -236,16 +236,14 @@
236236
{{template "custom/extra_tabs" .}}
237237

238238
{{if .Permission.IsAdmin}}
239-
<div class="right menu">
240-
<a class="{{if .PageIsRepoSettings}}active {{end}}item" href="{{.RepoLink}}/settings">
241-
{{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}}
242-
</a>
243-
</div>
239+
<a class="{{if .PageIsRepoSettings}}active {{end}}right item" href="{{.RepoLink}}/settings">
240+
{{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}}
241+
</a>
244242
{{end}}
245243
</div>
246244
{{else if .Permission.IsAdmin}}
247-
<div class="ui tabular stackable menu navbar">
248-
<div class="right menu">
245+
<div class="ui tabular menu navbar">
246+
<div class="right item">
249247
<a class="{{if .PageIsRepoSettings}}active {{end}}item" href="{{.RepoLink}}/settings">
250248
{{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}}
251249
</a>

templates/repo/issue/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
{{template "repo/issue/openclose" .}}
3535
</div>
3636
<div class="ten wide right aligned column">
37-
<div class="ui secondary filter stackable menu labels">
37+
<div class="ui secondary filter menu labels gt-overflow-x-auto gt-overflow-y-hidden">
3838
<!-- Label -->
3939
<div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item label-filter" style="margin-left: auto">
4040
<span class="text">

templates/repo/issue/milestone_issues.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
{{template "repo/issue/openclose" .}}
5151
</div>
5252
<div class="ten wide right aligned column">
53-
<div class="ui secondary filter stackable menu labels">
53+
<div class="ui secondary filter menu labels">
5454
<!-- Label -->
5555
<div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item label-filter" style="margin-left: auto">
5656
<span class="text">

templates/user/dashboard/navbar.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="dashboard-navbar">
2-
<div class="ui secondary stackable menu">
2+
<div class="ui secondary stackable menu g-menu-stackable-scrollable">
33
<div class="item">
44
<div class="ui floating dropdown jump">
55
<span class="text truncated-item-container">

web_src/css/base.css

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2766,21 +2766,16 @@ table th[data-sortt-desc] .svg {
27662766
height: 15px;
27672767
}
27682768

2769-
@media (max-width: 767px) {
2770-
.ui.stackable.menu:not(.no-vertical-tabs) {
2771-
overflow-y: hidden;
2772-
overflow-x: auto;
2773-
flex-direction: row;
2774-
flex-wrap: nowrap !important;
2775-
}
2776-
.ui.stackable.menu:not(.no-vertical-tabs) .item {
2777-
width: initial !important;
2778-
}
2779-
.ui.stackable.menu:not(.no-vertical-tabs) > .dropdown.item {
2780-
position: initial;
2781-
}
2782-
.ui.stackable.menu:not(.no-vertical-tabs) .menu {
2783-
flex-direction: row;
2769+
.g-menu-stackable-scrollable {
2770+
overflow-y: hidden;
2771+
overflow-x: auto;
2772+
}
2773+
2774+
@media only screen and (max-width: 767.98px) {
2775+
/* also respect Fomantic's "stackable" definition */
2776+
.g-menu-stackable-scrollable {
2777+
overflow-x: unset;
2778+
overflow-y: unset;
27842779
}
27852780
}
27862781

web_src/css/helpers.css

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,16 @@ Gitea's private styles use `g-` prefix.
6666
.gt-cursor-default { cursor: default !important; }
6767
.gt-invisible { visibility: hidden !important; }
6868
.gt-items-start { align-items: flex-start !important; }
69-
.gt-overflow-x-scroll { overflow-x: scroll !important; }
7069
.gt-pointer-events-none { pointer-events: none !important; }
7170
.gt-relative { position: relative !important; }
7271
.gt-whitespace-nowrap { white-space: nowrap !important; }
7372
.gt-whitespace-pre { white-space: pre !important; }
7473
.gt-whitespace-pre-wrap { white-space: pre-wrap !important; }
7574

75+
.gt-overflow-x-auto { overflow-x: auto !important; }
76+
.gt-overflow-x-scroll { overflow-x: scroll !important; }
77+
.gt-overflow-y-hidden { overflow-y: hidden !important; }
78+
7679
.gt-w-screen { width: 100vw !important; }
7780
.gt-h-screen { height: 100vh !important; }
7881

web_src/css/home.css

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,39 +43,39 @@
4343
color: var(--color-green);
4444
}
4545

46-
footer {
46+
.page-footer {
47+
width: 100vw;
48+
display: flex;
4749
background-color: var(--color-footer);
4850
border-top: 1px solid var(--color-secondary);
4951
line-height: 39px;
50-
flex-basis: 40px;
51-
color: var(--color-text-light);
5252
padding: 0 20px;
5353
}
5454

55-
footer .right-links {
55+
.page-footer .left-links {
56+
flex: 1;
57+
}
58+
59+
.page-footer .right-links {
5660
min-width: 180px; /* make sure the menu dropdown doesn't overflow horizontally when language name is short */
5761
}
5862

59-
footer .right-links > a {
63+
.page-footer .right-links > a {
6064
border-left: 1px solid var(--color-secondary-dark-1);
6165
padding-left: 8px;
6266
margin-left: 5px;
6367
}
6468

65-
footer .ui.dropdown.language .menu {
69+
.page-footer .ui.dropdown.language .menu {
6670
height: 500px;
6771
max-height: calc(100vh - 60px);
6872
overflow-y: auto;
6973
margin-bottom: 10px;
7074
}
7175

72-
7376
@media (max-width: 880px) {
74-
footer .left-links,
75-
footer .right-right {
76-
width: 100%;
77+
.page-footer {
7778
display: block;
7879
text-align: center;
79-
float: none;
8080
}
8181
}

0 commit comments

Comments
 (0)