diff options
| -rw-r--r-- | templates/repo/clone_buttons.tmpl | 6 | ||||
| -rw-r--r-- | templates/repo/empty.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/home.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/wiki/revision.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/wiki/view.tmpl | 2 | ||||
| -rw-r--r-- | web_src/css/repo.css | 32 | ||||
| -rw-r--r-- | web_src/css/repo/wiki.css | 2 |
7 files changed, 18 insertions, 32 deletions
diff --git a/templates/repo/clone_buttons.tmpl b/templates/repo/clone_buttons.tmpl index a664c4bda8..89daba9dc9 100644 --- a/templates/repo/clone_buttons.tmpl +++ b/templates/repo/clone_buttons.tmpl @@ -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> diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl index a858a728e9..d3665a9f8b 100644 --- a/templates/repo/empty.tmpl +++ b/templates/repo/empty.tmpl @@ -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> diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index ef10904bcc..24bafb8d9d 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -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}} diff --git a/templates/repo/wiki/revision.tmpl b/templates/repo/wiki/revision.tmpl index 647c331d55..182635e011 100644 --- a/templates/repo/wiki/revision.tmpl +++ b/templates/repo/wiki/revision.tmpl @@ -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> diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 19da3fd199..fefa9c589e 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -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> diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 848eb53327..4503bd69e3 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -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 */ } -.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; } @@ -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; diff --git a/web_src/css/repo/wiki.css b/web_src/css/repo/wiki.css index 1302e9cb5c..bb6f364557 100644 --- a/web_src/css/repo/wiki.css +++ b/web_src/css/repo/wiki.css @@ -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, |