Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor clone-panel styles #29861

Merged
merged 4 commits into from
Mar 17, 2024
Merged

Refactor clone-panel styles #29861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b65dc5
fix
wxiaoguang Mar 17, 2024
cb6b43e
merge media width
wxiaoguang Mar 17, 2024
9d8a12e
Merge branch 'main' into fix-clone-panel
GiteaBot Mar 17, 2024
3b0c226
Merge branch 'main' into fix-clone-panel
GiteaBot Mar 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions templates/repo/clone_buttons.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<!-- there is always at least one button (by context/repo.go) -->
{{if $.CloneButtonShowHTTPS}}
<button class="ui small compact clone button" id="repo-clone-https" data-link="{{$.CloneButtonOriginLink.HTTPS}}">
<button class="ui small button" id="repo-clone-https" data-link="{{$.CloneButtonOriginLink.HTTPS}}">
HTTPS
</button>
{{end}}
{{if $.CloneButtonShowSSH}}
<button class="ui small compact clone button" id="repo-clone-ssh" data-link="{{$.CloneButtonOriginLink.SSH}}">
<button class="ui small button" id="repo-clone-ssh" data-link="{{$.CloneButtonOriginLink.SSH}}">
SSH
</button>
{{end}}
<input id="repo-clone-url" size="20" class="js-clone-url" value="{{$.CloneButtonOriginLink.HTTPS}}" readonly>
<button class="ui basic small compact icon button" id="clipboard-btn" data-tooltip-content="{{ctx.Locale.Tr "copy_url"}}" data-clipboard-target="#repo-clone-url" aria-label="{{ctx.Locale.Tr "copy_url"}}">
<button class="ui small icon button" id="clipboard-btn" data-tooltip-content="{{ctx.Locale.Tr "copy_url"}}" data-clipboard-target="#repo-clone-url" aria-label="{{ctx.Locale.Tr "copy_url"}}">
{{svg "octicon-copy" 14}}
</button>
2 changes: 1 addition & 1 deletion templates/repo/empty.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</a>
{{end}}
{{end}}
<div class="ui action small input gt-df gt-f1">
<div class="clone-panel ui action small input tw-flex-1">
{{template "repo/clone_buttons" .}}
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions templates/repo/home.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@
<div class="gt-df gt-ac">
<!-- Only show clone panel in repository home page -->
{{if eq $n 0}}
<div class="ui action tiny input" id="clone-panel">
<div class="clone-panel ui action tiny input">
{{template "repo/clone_buttons" .}}
<button id="more-btn" class="ui basic small compact jump dropdown icon button" data-tooltip-content="{{ctx.Locale.Tr "repo.more_operations"}}">
<button class="ui small jump dropdown icon button" data-tooltip-content="{{ctx.Locale.Tr "repo.more_operations"}}">
{{svg "octicon-kebab-horizontal"}}
<div class="menu">
{{if not $.DisableDownloadSourceArchives}}
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/wiki/revision.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</div>
</div>
<div class="ui eight wide column text right">
<div class="ui action small input" id="clone-panel">
<div class="clone-panel ui action small input">
{{template "repo/clone_buttons" .}}
{{template "repo/clone_script" .}}
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/wiki/view.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</div>
</div>
</div>
<div class="ui action small input gt-df gt-ac" id="clone-panel">
<div class="clone-panel ui action small input">
{{template "repo/clone_buttons" .}}
{{template "repo/clone_script" .}}
</div>
Expand Down
32 changes: 9 additions & 23 deletions web_src/css/repo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,41 +143,31 @@
margin-bottom: 12px;
}

.repository #clone-panel #repo-clone-url {
.repository .clone-panel #repo-clone-url {
width: 320px;
border-radius: 0;
}

@media (min-width: 768px) and (max-width: 991.98px) {
.repository #clone-panel #repo-clone-url {
@media (max-width: 991.98px) {
.repository .clone-panel #repo-clone-url {
width: 200px;
}
}

@media (max-width: 767.98px) {
.repository #clone-panel #repo-clone-url {
width: 200px;
}
}

.repository #clone-panel #repo-clone-https,
.repository #clone-panel #repo-clone-ssh {
border-right: none;
.repository .ui.action.input.clone-panel > button + button,
.repository .ui.action.input.clone-panel > button + input {
margin-left: -1px; /* make the borders overlap to avoid double borders */
delvh marked this conversation as resolved.
Show resolved Hide resolved
}

.repository #clone-panel #more-btn {
border-left: none;
}

.repository #clone-panel button:first-of-type {
.repository .clone-panel > button:first-of-type {
border-radius: var(--border-radius) 0 0 var(--border-radius) !important;
}

.repository #clone-panel button:last-of-type {
.repository .clone-panel > button:last-of-type {
border-radius: 0 var(--border-radius) var(--border-radius) 0 !important;
}

.repository #clone-panel .dropdown .menu {
.repository .clone-panel .dropdown .menu {
right: 0 !important;
left: auto !important;
}
Expand Down Expand Up @@ -1759,10 +1749,6 @@
font-weight: var(--font-weight-normal);
}

.repository.quickstart .guide .clone.button:first-child {
border-radius: var(--border-radius) 0 0 var(--border-radius);
}

.repository.quickstart .guide #repo-clone-url {
border-radius: 0;
padding: 5px 10px;
Expand Down
2 changes: 1 addition & 1 deletion web_src/css/repo/wiki.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
}

@media (max-width: 767.98px) {
.repository.wiki #clone-panel #repo-clone-url {
.repository.wiki .clone-panel #repo-clone-url {
width: 160px;
}
.repository.wiki .wiki-content-main.with-sidebar,
Expand Down