Skip to content

Remove CSS has selector and improve various styles #26891

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

Merged
merged 2 commits into from
Sep 4, 2023
Merged

Remove CSS has selector and improve various styles #26891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffcc023
fix
wxiaoguang Sep 4, 2023
2fe83bd
fix lint
wxiaoguang Sep 4, 2023
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
8 changes: 8 additions & 0 deletions templates/devtest/gitea-ui.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,14 @@
</div>
</div>

<div>
<h1>Buttons</h1>
<div class="ui buttons"><button class="ui button">1</button><button class="ui button">2</button><button class="ui button">3</button></div>
<div class="ui buttons"><button class="ui button active">1</button><button class="ui button">2</button><button class="ui button">3</button></div>
<div class="ui buttons"><button class="ui button">1</button><button class="ui button active">2</button><button class="ui button">3</button></div>
<div class="ui buttons"><button class="ui button">1</button><button class="ui button">2</button><button class="ui button active">3</button></div>
</div>

<div>
<h1>Tooltip</h1>
<div><span data-tooltip-content="test tooltip">text with tooltip</span></div>
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/view_file.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</div>
<div class="file-header-right file-actions gt-df gt-ac gt-fw">
{{if .HasSourceRenderedToggle}}
<div class="ui compact icon buttons two-toggle-buttons">
<div class="ui compact icon buttons">
<a href="{{$.Link}}?display=source" class="ui mini basic button {{if .IsDisplayingSource}}active{{end}}" data-tooltip-content="{{.locale.Tr "repo.file_view_source"}}">{{svg "octicon-code" 15}}</a>
<a href="{{$.Link}}" class="ui mini basic button {{if .IsDisplayingRendered}}active{{end}}" data-tooltip-content="{{.locale.Tr "repo.file_view_rendered"}}">{{svg "octicon-file" 15}}</a>
</div>
Expand Down
24 changes: 10 additions & 14 deletions web_src/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,8 +485,10 @@ a.label,
border-color: var(--color-primary);
}

.ui.action.input .button {
.ui.action.input .ui.ui.button {
border-color: var(--color-input-border);
padding-top: 0; /* the ".action.input" is "flex + stretch", so let the buttons layout themselves */
padding-bottom: 0;
}

/* currently used for search bar dropdowns in repo search and explore code */
Expand Down Expand Up @@ -2015,25 +2017,19 @@ a.ui.basic.label:hover {
border-color: var(--color-secondary);
}

.ui.attached.header .right .button {
padding: 8px 10px;
font-weight: var(--font-weight-normal);
}

/* reduce height of buttons with dropdown icon */
.ui.attached.header .right .button:has(.dropdown.icon) {
padding-top: 7px;
padding-bottom: 7px;
}

/* fix misaligned right buttons on box headers */
.ui.attached.header .right:not(.dropdown) {
.ui.attached.header > .ui.right {
position: absolute;
right: 0.78571429rem;
top: 0;
bottom: 0;
display: flex;
align-items: center;
}

.ui.attached.header > .ui.right > .button,
.ui.attached.header > .ui.right > .dropdown > .button {
padding: 8px 10px;
font-weight: var(--font-weight-normal);
}

/* if a .top.attached.header is followed by a .segment, add some margin */
Expand Down
26 changes: 15 additions & 11 deletions web_src/css/modules/button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* this contains override styles for buttons and related elements */

/* these styles changed the Fomantic UI's rules, Fomantic UI expects only "basic" buttons have borders */
.ui.button,
.ui.button:focus {
background: var(--color-button);
Expand Down Expand Up @@ -52,26 +53,29 @@ a.btn:hover {
color: inherit;
}

/* other button styles */
/* By default, Fomantic UI doesn't support "bordered" buttons group, but Gitea would like to use it.
And the default buttons always have borders now (not the same as Fomantic UI's default buttons, see above).
It needs some tricks to tweak the left/right borders with active state */

.ui.buttons .button:first-child {
border-left: 1px solid var(--color-light-border);
.ui.buttons .button {
border-right: none;
}

.ui.buttons .button:first-child:has(+ .button.active) {
border-right: none !important;
.ui.buttons .button:first-child {
border-left: 1px solid var(--color-light-border);
}

.ui.buttons .button + .button:not(.active) {
border-left: none;
.ui.buttons .button:last-child {
border-right: 1px solid var(--color-light-border);
}

.two-toggle-buttons .button:not(.active):first-of-type {
border-right: none;
.ui.buttons .button.active {
border-left: 1px solid var(--color-light-border);
border-right: 1px solid var(--color-light-border);
}

.two-toggle-buttons .button.active:last-of-type {
border-left: 1px solid var(--color-light-border);
.ui.buttons .button.active + .button {
border-left: none;
}

.ui.labeled.button.disabled > .button,
Expand Down
17 changes: 4 additions & 13 deletions web_src/css/repo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,8 +437,8 @@
justify-content: center;
}

.pdf-content:has(.pdf-fallback-button) {
height: 100px;
.pdf-content .pdf-fallback-button {
margin: 50px auto;
}

.repository.file.list .non-diff-file-content .plain-text {
Expand Down Expand Up @@ -1054,11 +1054,6 @@
margin: 0;
}

/* fix fomantic's border-radius via :first-child with hidden elements */
.collapsible-comment-box:has(.gt-hidden) {
border-radius: var(--border-radius) !important;
}

.repository.view.issue .comment-list .code-comment .comment-header {
background: transparent;
border-bottom: 0 !important;
Expand Down Expand Up @@ -1637,14 +1632,10 @@
}

.repository .diff-box .header:not(.resolved-placeholder) .button {
padding: 8px 12px;
padding: 0 12px;
flex: 0 0 auto;
margin-right: 0;
}

.repository .diff-box .header:not(.resolved-placeholder) .button:has(svg) {
padding-top: 6px;
padding-bottom: 6px;
height: 30px;
}

.repository .diff-box .resolved-placeholder {
Expand Down