Skip to content

Commit

Permalink
Merge branch 'main' into fix/org_nabvar
Browse files Browse the repository at this point in the history
  • Loading branch information
@GiteaBot
GiteaBot authored Mar 27, 2024
2 parents 4d923f4 + 0922ce8 commit 5e8e83e
Show file tree
Hide file tree
Showing 10 changed files with 486 additions and 1,478 deletions.
14 changes: 10 additions & 4 deletions modules/markup/markdown/transform_blockquote.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,16 @@ func (g *ASTTransformer) transformBlockquote(v *ast.Blockquote, reader text.Read
if firstParagraph.ChildCount() < 3 {
return ast.WalkContinue, nil
}
node1, ok1 := firstParagraph.FirstChild().(*ast.Text)
node2, ok2 := node1.NextSibling().(*ast.Text)
node3, ok3 := node2.NextSibling().(*ast.Text)
if !ok1 || !ok2 || !ok3 {
node1, ok := firstParagraph.FirstChild().(*ast.Text)
if !ok {
return ast.WalkContinue, nil
}
node2, ok := node1.NextSibling().(*ast.Text)
if !ok {
return ast.WalkContinue, nil
}
node3, ok := node2.NextSibling().(*ast.Text)
if !ok {
return ast.WalkContinue, nil
}
val1 := string(node1.Segment.Value(reader.Source()))
Expand Down
200 changes: 1 addition & 199 deletions web_src/css/base.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -835,14 +835,6 @@ input:-webkit-autofill:active,
font-weight: var(--font-weight-normal);
}

.ui.floating.label {
z-index: 10;
}

.ui.transparent.label {
background-color: transparent;
}

/* replace fomantic popover box shadows */
.ui.dropdown .menu,
.ui.upward.dropdown > .menu,
Expand Down Expand Up @@ -877,14 +869,6 @@ input:-webkit-autofill:active,
width: 100%;
}

.ui.dropdown .menu > .item > .floating.label {
z-index: 11;
}

.ui.dropdown .menu .menu > .item > .floating.label {
z-index: 21;
}

.ui.dropdown .menu > .header {
font-size: 0.8em;
}
Expand Down Expand Up @@ -1214,44 +1198,11 @@ overflow-menu .ui.label {
margin-top: 1px;
}

.ui.label {
padding: 0.3em 0.5em;
transition: none;
white-space: nowrap;
}

.ui.label,
.ui.menu .item > .label,
.ui.grey.labels .label,
.ui.ui.ui.grey.label {
.ui.menu .item > .label {
background: var(--color-label-bg);
color: var(--color-label-text);
}

.ui.label > a {
opacity: .75; /* increase contrast over default fomantic .5 */
}

.ui.active.label {
background: var(--color-label-active-bg);
border-color: var(--color-label-active-bg);
color: var(--color-label-text);
}

.ui.labels a.label:hover,
a.ui.label:hover {
background: var(--color-label-hover-bg);
border-color: var(--color-label-hover-bg);
color: var(--color-label-text);
}

.ui.labels a.active.label:hover,
a.ui.active.label:hover {
background: var(--color-label-active-bg);
border-color: var(--color-label-active-bg);
color: var(--color-label-text);
}

.lines-blame-btn {
padding: 0 0 0 5px;
display: flex;
Expand Down Expand Up @@ -1417,146 +1368,6 @@ a.ui.active.label:hover {
width: 100%;
}

.ui.primary.label,
.ui.primary.labels .label,
.ui.ui.ui.primary.label {
background-color: var(--color-primary);
border-color: var(--color-primary-dark-2);
}

.ui.basic.labels .primary.label,
.ui.ui.ui.basic.primary.label {
background: transparent;
border-color: var(--color-primary);
color: var(--color-primary);
}

.ui.basic.labels a.primary.label:hover,
a.ui.ui.ui.basic.primary.label:hover {
background: var(--color-hover);
border-color: var(--color-primary-dark-1);
color: var(--color-primary-dark-1);
}

.ui.basic.labels .secondary.label,
.ui.ui.ui.basic.secondary.label {
background: transparent;
border-color: var(--color-secondary);
color: var(--color-secondary);
}

.ui.basic.labels .orange.label,
.ui.ui.ui.basic.orange.label {
background: transparent;
border-color: var(--color-orange);
color: var(--color-orange);
}

.ui.basic.labels .green.label,
.ui.ui.ui.basic.green.label {
background: transparent;
border-color: var(--color-green);
color: var(--color-green);
}

.ui.basic.labels .olive.label,
.ui.ui.ui.basic.olive.label {
background: transparent;
border-color: var(--color-olive);
color: var(--color-olive);
}

.ui.basic.labels .teal.label,
.ui.ui.ui.basic.teal.label {
background: transparent;
border-color: var(--color-teal);
color: var(--color-teal);
}

.ui.basic.labels .blue.label,
.ui.ui.ui.basic.blue.label {
background: transparent;
border-color: var(--color-blue);
color: var(--color-blue);
}

.ui.basic.labels .violet.label,
.ui.ui.ui.basic.violet.label {
background: transparent;
border-color: var(--color-violet);
color: var(--color-violet);
}

.ui.basic.labels .purple.label,
.ui.ui.ui.basic.purple.label {
background: transparent;
border-color: var(--color-purple);
color: var(--color-purple);
}

.ui.basic.labels .pink.label,
.ui.ui.ui.basic.pink.label {
background: transparent;
border-color: var(--color-pink);
color: var(--color-pink);
}

.ui.basic.labels .red.label,
.ui.ui.ui.basic.red.label {
background: transparent;
border-color: var(--color-red);
color: var(--color-red);
}

.ui.basic.labels .brown.label,
.ui.ui.ui.basic.brown.label {
background: transparent;
border-color: var(--color-brown);
color: var(--color-brown);
}

.ui.basic.labels .yellow.label,
.ui.ui.ui.basic.yellow.label {
background: transparent;
border-color: var(--color-yellow);
color: var(--color-yellow);
}

.ui.basic.labels .grey.label,
.ui.ui.ui.basic.grey.label {
background: transparent;
border-color: var(--color-grey);
color: var(--color-grey);
}

.ui.basic.labels .black.label,
.ui.ui.ui.basic.black.label {
background: transparent;
border-color: var(--color-black);
color: var(--color-black);
}

.ui.basic.labels .label,
.ui.basic.label,
.ui.secondary.labels .ui.basic.label {
background: var(--color-button);
border-color: var(--color-light-border);
color: var(--color-text-light);
}

.ui.basic.labels a.label:hover,
a.ui.basic.label:hover {
color: var(--color-text);
border-color: var(--color-light-border);
background: var(--color-hover);
}

.ui.label > img {
width: auto !important;
vertical-align: middle;
height: 2.1666em !important;
}

.migrate .svg.gitea-git {
color: var(--color-git);
}
Expand All @@ -1568,10 +1379,6 @@ a.ui.basic.label:hover {
width: 14px;
}

.ui.label > .color-icon {
margin-left: 0;
}

.rss-icon {
display: inline-flex;
color: var(--color-text-light-1);
Expand Down Expand Up @@ -1769,7 +1576,6 @@ table th[data-sortt-desc] .svg {
.btn,
.ui.ui.button,
.ui.ui.dropdown,
.ui.ui.label,
.flex-text-inline {
display: inline-flex;
align-items: center;
Expand All @@ -1785,10 +1591,6 @@ table th[data-sortt-desc] .svg {
vertical-align: middle;
}

.ui.ui.circular.label {
justify-content: center;
}

.ui.ui.labeled.button {
gap: 0;
align-items: stretch;
Expand Down
17 changes: 0 additions & 17 deletions web_src/css/dashboard.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,6 @@
width: 75%;
}

.dashboard.feeds .filter.menu .item .floating.label,
.dashboard.issues .filter.menu .item .floating.label {
top: 7px;
left: 90%;
width: 15%;
}

@media (max-width: 767.98px) {
.dashboard.feeds .filter.menu .item .floating.label,
.dashboard.issues .filter.menu .item .floating.label {
top: 10px;
left: auto;
width: auto;
right: 13px;
}
}

/* Sort */
.dashboard.feeds .filter.menu .jump.item,
.dashboard.issues .filter.menu .jump.item {
Expand Down
1 change: 1 addition & 0 deletions web_src/css/index.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
@import "./modules/container.css";
@import "./modules/divider.css";
@import "./modules/header.css";
@import "./modules/label.css";
@import "./modules/segment.css";
@import "./modules/grid.css";
@import "./modules/message.css";
Expand Down
Loading

0 comments on commit 5e8e83e

Please sign in to comment.