Backport #25292 by @silverwind Save another 50KB of CSS by removing unused and useless Fomantic variants. Removed the last instance of a `tertiary` button and fixed a TODO: <img width="509" alt="Screenshot 2023-06-15 at 22 34 36" src="https://github.com/go-gitea/gitea/assets/115237/8a16ae7b-2b17-439b-a096-60a52724e3d6"> Co-authored-by: silverwind <me@silverwind.io>
This commit is contained in:
parent
4ea38bba73
commit
e5629d9701
|
@ -5,5 +5,6 @@
|
||||||
/templates/swagger/v1_json.tmpl linguist-generated
|
/templates/swagger/v1_json.tmpl linguist-generated
|
||||||
/vendor/** -text -eol linguist-vendored
|
/vendor/** -text -eol linguist-vendored
|
||||||
/web_src/fomantic/build/** linguist-generated
|
/web_src/fomantic/build/** linguist-generated
|
||||||
|
/web_src/fomantic/_site/globals/site.variables linguist-language=Less
|
||||||
/web_src/js/vendor/** -text -eol linguist-vendored
|
/web_src/js/vendor/** -text -eol linguist-vendored
|
||||||
Dockerfile.* linguist-language=Dockerfile
|
Dockerfile.* linguist-language=Dockerfile
|
||||||
|
|
|
@ -197,22 +197,6 @@ a.btn:hover {
|
||||||
border-color: var(--color-secondary-active);
|
border-color: var(--color-secondary-active);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* tertiary */
|
|
||||||
|
|
||||||
.ui.tertiary.button,
|
|
||||||
.ui.tertiary.button:focus {
|
|
||||||
color: var(--color-text-light);
|
|
||||||
border: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ui.tertiary.button:hover {
|
|
||||||
color: var(--color-text);
|
|
||||||
}
|
|
||||||
|
|
||||||
.ui.tertiary.button:active {
|
|
||||||
color: var(--color-text-dark);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* red */
|
/* red */
|
||||||
|
|
||||||
.ui.red.labels .label,
|
.ui.red.labels .label,
|
||||||
|
|
|
@ -5,16 +5,17 @@
|
||||||
@bold: 500;
|
@bold: 500;
|
||||||
@useCustomScrollbars: false;
|
@useCustomScrollbars: false;
|
||||||
@disabledOpacity: var(--opacity-disabled);
|
@disabledOpacity: var(--opacity-disabled);
|
||||||
@variationPopupTooltip: false;
|
|
||||||
@linkHoverUnderline: underline;
|
@linkHoverUnderline: underline;
|
||||||
@variationButtonSocial: false;
|
|
||||||
@pageOverflowX: visible;
|
@pageOverflowX: visible;
|
||||||
|
|
||||||
/* disable all inverted variations */
|
|
||||||
@variationAccordionInverted: false;
|
@variationAccordionInverted: false;
|
||||||
@variationBreadcrumbInverted: false;
|
@variationBreadcrumbInverted: false;
|
||||||
|
@variationButtonAnimated: false;
|
||||||
|
@variationButtonAnimatedFade: false;
|
||||||
@variationButtonAttached: false;
|
@variationButtonAttached: false;
|
||||||
@variationButtonInverted: false;
|
@variationButtonInverted: false;
|
||||||
|
@variationButtonSocial: false;
|
||||||
|
@variationButtonTertiary: false;
|
||||||
@variationCalendarInverted: false;
|
@variationCalendarInverted: false;
|
||||||
@variationCardInverted: false;
|
@variationCardInverted: false;
|
||||||
@variationCheckboxInverted: false;
|
@variationCheckboxInverted: false;
|
||||||
|
@ -25,12 +26,18 @@
|
||||||
@variationFeedInverted: false;
|
@variationFeedInverted: false;
|
||||||
@variationFlyoutInverted: false;
|
@variationFlyoutInverted: false;
|
||||||
@variationFormInverted: false;
|
@variationFormInverted: false;
|
||||||
|
@variationFormTransparent: false;
|
||||||
|
@variationGridDoubling: false;
|
||||||
@variationGridInverted: false;
|
@variationGridInverted: false;
|
||||||
@variationHeaderInverted: false;
|
@variationHeaderInverted: false;
|
||||||
@variationIconInverted: false;
|
@variationIconInverted: false;
|
||||||
@variationInputInverted: false;
|
@variationInputInverted: false;
|
||||||
@variationItemInverted: false;
|
@variationItemInverted: false;
|
||||||
|
@variationLabelCorner: false;
|
||||||
|
@variationLabelImage: false;
|
||||||
@variationLabelInverted: false;
|
@variationLabelInverted: false;
|
||||||
|
@variationLabelRibbon: false;
|
||||||
|
@variationLabelTag: false;
|
||||||
@variationListInverted: false;
|
@variationListInverted: false;
|
||||||
@variationMenuInverted: false;
|
@variationMenuInverted: false;
|
||||||
@variationMessageInverted: false;
|
@variationMessageInverted: false;
|
||||||
|
@ -38,12 +45,17 @@
|
||||||
@variationNagInverted: false;
|
@variationNagInverted: false;
|
||||||
@variationPlaceholderInverted: false;
|
@variationPlaceholderInverted: false;
|
||||||
@variationPopupInverted: false;
|
@variationPopupInverted: false;
|
||||||
|
@variationPopupTooltip: false;
|
||||||
@variationProgressInverted: false;
|
@variationProgressInverted: false;
|
||||||
@variationSegmentInverted: false;
|
@variationSegmentInverted: false;
|
||||||
|
@variationSegmentPiled: false;
|
||||||
|
@variationSegmentStacked: false;
|
||||||
@variationSliderInverted: false;
|
@variationSliderInverted: false;
|
||||||
@variationStatisticInverted: false;
|
@variationStatisticInverted: false;
|
||||||
@variationStepInverted: false;
|
@variationStepInverted: false;
|
||||||
@variationTableInverted: false;
|
@variationTableInverted: false;
|
||||||
|
@variationTableMarked: false;
|
||||||
|
@variationTableStackable: false;
|
||||||
@variationTextInverted: false;
|
@variationTextInverted: false;
|
||||||
@variationToastInverted: false;
|
@variationToastInverted: false;
|
||||||
@variationTransitionInverted: false;
|
@variationTransitionInverted: false;
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -27,13 +27,9 @@
|
||||||
<div class="field">
|
<div class="field">
|
||||||
<textarea name="merge_message_field" rows="5" :placeholder="mergeForm.mergeMessageFieldPlaceHolder" v-model="mergeMessageFieldValue"/>
|
<textarea name="merge_message_field" rows="5" :placeholder="mergeForm.mergeMessageFieldPlaceHolder" v-model="mergeMessageFieldValue"/>
|
||||||
<template v-if="mergeMessageFieldValue !== mergeForm.defaultMergeMessage">
|
<template v-if="mergeMessageFieldValue !== mergeForm.defaultMergeMessage">
|
||||||
<button @click.prevent="clearMergeMessage" class="ui tertiary button">
|
<button @click.prevent="clearMergeMessage" class="btn gt-mt-2 gt-p-2 interact-fg" :data-tooltip-content="mergeForm.textClearMergeMessageHint">
|
||||||
{{ mergeForm.textClearMergeMessage }}
|
{{ mergeForm.textClearMergeMessage }}
|
||||||
</button>
|
</button>
|
||||||
<div class="ui label">
|
|
||||||
<!-- TODO: Convert to tooltip once we can use tooltips in Vue templates -->
|
|
||||||
{{ mergeForm.textClearMergeMessageHint }}
|
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
Loading…
Reference in New Issue