diff --git a/templates/repo/editor/cherry_pick.tmpl b/templates/repo/editor/cherry_pick.tmpl index 55c6252991a..4f1937b8481 100644 --- a/templates/repo/editor/cherry_pick.tmpl +++ b/templates/repo/editor/cherry_pick.tmpl @@ -8,21 +8,19 @@ -
-
-
- {{$shaurl := printf "%s/commit/%s" $.RepoLink (PathEscape .SHA)}} - {{$shalink := printf "%s" (Escape $shaurl) (ShortSha .SHA)}} - {{if eq .CherryPickType "revert"}} - {{.locale.Tr "repo.editor.revert" $shalink | Str2html}} - {{else}} - {{.locale.Tr "repo.editor.cherry_pick" $shalink | Str2html}} - {{end}} - {{.Repository.FullName}} -
:
- {{.BranchName}} - {{.locale.Tr "repo.editor.or"}} {{.locale.Tr "repo.editor.cancel_lower"}} -
+
+
+ {{$shaurl := printf "%s/commit/%s" $.RepoLink (PathEscape .SHA)}} + {{$shalink := printf "%s" (Escape $shaurl) (ShortSha .SHA)}} + {{if eq .CherryPickType "revert"}} + {{.locale.Tr "repo.editor.revert" $shalink | Str2html}} + {{else}} + {{.locale.Tr "repo.editor.cherry_pick" $shalink | Str2html}} + {{end}} + {{.Repository.FullName}} +
:
+ {{.BranchName}} + {{.locale.Tr "repo.editor.or"}} {{.locale.Tr "repo.editor.cancel_lower"}}
{{template "repo/editor/commit_form" .}} diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index fe0bd466357..2f47616dc5d 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -7,24 +7,22 @@ {{.CsrfTokenHtml}} -
-
-
- {{.Repository.Name}} - {{$n := len .TreeNames}} - {{$l := Eval $n "-" 1}} - {{range $i, $v := .TreeNames}} -
/
- {{if eq $i $l}} - - {{svg "octicon-info"}} - {{else}} - {{$v}} - {{end}} +
+
+ {{.Repository.Name}} + {{$n := len .TreeNames}} + {{$l := Eval $n "-" 1}} + {{range $i, $v := .TreeNames}} +
/
+ {{if eq $i $l}} + + {{svg "octicon-info"}} + {{else}} + {{$v}} {{end}} - {{.locale.Tr "repo.editor.or"}} {{.locale.Tr "repo.editor.cancel_lower"}} - -
+ {{end}} + {{.locale.Tr "repo.editor.or"}} {{.locale.Tr "repo.editor.cancel_lower"}} +
diff --git a/templates/repo/editor/patch.tmpl b/templates/repo/editor/patch.tmpl index 99c13c1fc52..4f4032e81c3 100644 --- a/templates/repo/editor/patch.tmpl +++ b/templates/repo/editor/patch.tmpl @@ -7,17 +7,15 @@ {{.CsrfTokenHtml}} -
-
-
- {{.locale.Tr "repo.editor.patching"}} - {{.Repository.FullName}} -
:
- {{.BranchName}} - {{.locale.Tr "repo.editor.or"}} {{.locale.Tr "repo.editor.cancel_lower"}} - - -
+
+
+ {{.locale.Tr "repo.editor.patching"}} + {{.Repository.FullName}} +
:
+ {{.BranchName}} + {{.locale.Tr "repo.editor.or"}} {{.locale.Tr "repo.editor.cancel_lower"}} + +
diff --git a/templates/repo/editor/upload.tmpl b/templates/repo/editor/upload.tmpl index 88cdf61c74c..d9408c9eee2 100644 --- a/templates/repo/editor/upload.tmpl +++ b/templates/repo/editor/upload.tmpl @@ -5,24 +5,22 @@ {{template "base/alert" .}}
{{.CsrfTokenHtml}} -
-
-
- {{.Repository.Name}} - {{$n := len .TreeNames}} - {{$l := Eval $n "-" 1}} - {{range $i, $v := .TreeNames}} -
/
- {{if eq $i $l}} - - {{svg "octicon-info"}} - {{else}} - {{$v}} - {{end}} +
+
+ {{.Repository.Name}} + {{$n := len .TreeNames}} + {{$l := Eval $n "-" 1}} + {{range $i, $v := .TreeNames}} +
/
+ {{if eq $i $l}} + + {{svg "octicon-info"}} + {{else}} + {{$v}} {{end}} - {{.locale.Tr "repo.editor.or"}} {{.locale.Tr "repo.editor.cancel_lower"}} - -
+ {{end}} + {{.locale.Tr "repo.editor.or"}} {{.locale.Tr "repo.editor.cancel_lower"}} +
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 1db073c3260..f9dbf49e5b6 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -109,7 +109,7 @@ {{end}} {{if ne $n 0}} - + {{StringUtils.EllipsisString .Repository.Name 30}} {{- range $i, $v := .TreeNames -}} / diff --git a/web_src/css/base.css b/web_src/css/base.css index ed51892044c..e10d3d1213c 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -332,8 +332,7 @@ progress::-moz-progress-bar { user-select: none; } -a, -.ui.breadcrumb a { +a { color: var(--color-primary); cursor: pointer; text-decoration-skip-ink: all; @@ -347,8 +346,7 @@ a.muted, a:hover, a.muted:hover, a.muted:hover [class*="color-text"], -.muted-links a:hover, -.ui.breadcrumb a:hover { +.muted-links a:hover { color: var(--color-primary); } @@ -737,14 +735,6 @@ a.label, padding-bottom: 7.42px !important; } -.ui.breadcrumb a:hover { - text-decoration: underline !important; -} - -.ui.breadcrumb .divider { - color: var(--color-text-light-2); -} - .ui.divider:not(.vertical,.horizontal) { border-top-color: var(--color-secondary) !important; border-bottom: none !important; diff --git a/web_src/css/editor.css b/web_src/css/editor.css index ba35036e4f3..62ac915505e 100644 --- a/web_src/css/editor.css +++ b/web_src/css/editor.css @@ -12,6 +12,12 @@ border-bottom: 0; } +.repo-editor-header { + display: flex; + margin: 1rem 0; + padding: 3px 0; +} + .editor-toolbar { border-color: var(--color-secondary); } diff --git a/web_src/css/index.css b/web_src/css/index.css index d6ef1da9b92..e01dfb7a736 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -11,6 +11,7 @@ @import "./features/projects.css"; @import "./modules/tippy.css"; @import "./modules/modal.css"; +@import "./modules/breadcrumb.css"; @import "./code/linebutton.css"; @import "./markup/content.css"; @import "./markup/codecopy.css"; diff --git a/web_src/css/modules/breadcrumb.css b/web_src/css/modules/breadcrumb.css new file mode 100644 index 00000000000..67830e562a5 --- /dev/null +++ b/web_src/css/modules/breadcrumb.css @@ -0,0 +1,9 @@ +.breadcrumb .divider { + color: var(--color-text-light-2); + margin-left: 3px; + margin-right: 3px; +} + +.breadcrumb > * { + display: inline; +} diff --git a/web_src/css/repository.css b/web_src/css/repository.css index 259cfda3a1a..32ff51c920e 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -223,11 +223,6 @@ word-break: break-word; } -.repository.file.list .repo-path .section, -.repository.file.list .repo-path .divider { - display: inline; -} - .repository.file.list #repo-files-table { table-layout: fixed; } @@ -448,16 +443,15 @@ width: 16px; } -.repository.file.editor .treepath { +.repo-editor-header { width: 100%; } -.repository.file.editor .treepath input { - vertical-align: middle; - box-shadow: rgba(0, 0, 0, 0.0745098) 0 1px 2px inset; - width: inherit; - padding: 7px 8px; - margin-right: 5px; +.repo-editor-header input { + vertical-align: middle !important; + width: auto !important; + padding: 7px 8px !important; + margin-right: 5px !important; } .repository.file.editor .tabular.menu .svg { diff --git a/web_src/fomantic/build/semantic.css b/web_src/fomantic/build/semantic.css index dd6637981be..be6547e47a8 100644 --- a/web_src/fomantic/build/semantic.css +++ b/web_src/fomantic/build/semantic.css @@ -8,151 +8,6 @@ * http://opensource.org/licenses/MIT * */ -/*! - * # Fomantic-UI - Breadcrumb - * http://github.com/fomantic/Fomantic-UI/ - * - * - * Released under the MIT license - * http://opensource.org/licenses/MIT - * - */ - -/******************************* - Breadcrumb -*******************************/ - -.ui.breadcrumb { - line-height: 1.4285em; - display: inline-block; - margin: 0 0; - vertical-align: middle; -} - -.ui.breadcrumb:first-child { - margin-top: 0; -} - -.ui.breadcrumb:last-child { - margin-bottom: 0; -} - -/******************************* - Content -*******************************/ - -/* Divider */ - -.ui.breadcrumb .divider { - display: inline-block; - opacity: 0.7; - margin: 0 0.21428571rem 0; - font-size: 0.92857143em; - color: rgba(0, 0, 0, 0.4); - vertical-align: baseline; -} - -/* Link */ - -.ui.breadcrumb a { - color: #4183C4; -} - -.ui.breadcrumb a:hover { - color: #1e70bf; -} - -/* Icon Divider */ - -.ui.breadcrumb .icon.divider { - font-size: 0.85714286em; - vertical-align: baseline; -} - -/* Section */ - -.ui.breadcrumb a.section { - cursor: pointer; -} - -.ui.breadcrumb .section { - display: inline-block; - margin: 0; - padding: 0; -} - -/* Loose Coupling */ - -.ui.breadcrumb.segment { - display: inline-block; - padding: 0.78571429em 1em; -} - -/* Inverted */ - -.ui.inverted.breadcrumb { - color: #DCDDDE; -} - -.ui.inverted.breadcrumb > .active.section { - color: #FFFFFF; -} - -.ui.inverted.breadcrumb > .divider { - color: rgba(255, 255, 255, 0.7); -} - -/******************************* - States -*******************************/ - -.ui.breadcrumb .active.section { - font-weight: 500; -} - -/******************************* - Variations -*******************************/ - -.ui.breadcrumb { - font-size: 1rem; -} - -.ui.mini.breadcrumb { - font-size: 0.78571429rem; -} - -.ui.tiny.breadcrumb { - font-size: 0.85714286rem; -} - -.ui.small.breadcrumb { - font-size: 0.92857143rem; -} - -.ui.large.breadcrumb { - font-size: 1.14285714rem; -} - -.ui.big.breadcrumb { - font-size: 1.28571429rem; -} - -.ui.huge.breadcrumb { - font-size: 1.42857143rem; -} - -.ui.massive.breadcrumb { - font-size: 1.71428571rem; -} - -/******************************* - Theme Overrides -*******************************/ - -/******************************* - Site Overrides -*******************************/ /*! * # Fomantic-UI - Button * http://github.com/fomantic/Fomantic-UI/ diff --git a/web_src/fomantic/semantic.json b/web_src/fomantic/semantic.json index 3c6f3b7435b..06d57a18497 100644 --- a/web_src/fomantic/semantic.json +++ b/web_src/fomantic/semantic.json @@ -22,7 +22,6 @@ "admin": false, "components": [ "api", - "breadcrumb", "button", "card", "checkbox",