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>tags/v1.20.0-rc1
@@ -5,5 +5,6 @@ | |||
/templates/swagger/v1_json.tmpl linguist-generated | |||
/vendor/** -text -eol linguist-vendored | |||
/web_src/fomantic/build/** linguist-generated | |||
/web_src/fomantic/_site/globals/site.variables linguist-language=Less | |||
/web_src/js/vendor/** -text -eol linguist-vendored | |||
Dockerfile.* linguist-language=Dockerfile |
@@ -197,22 +197,6 @@ a.btn:hover { | |||
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 */ | |||
.ui.red.labels .label, |
@@ -5,16 +5,17 @@ | |||
@bold: 500; | |||
@useCustomScrollbars: false; | |||
@disabledOpacity: var(--opacity-disabled); | |||
@variationPopupTooltip: false; | |||
@linkHoverUnderline: underline; | |||
@variationButtonSocial: false; | |||
@pageOverflowX: visible; | |||
/* disable all inverted variations */ | |||
@variationAccordionInverted: false; | |||
@variationBreadcrumbInverted: false; | |||
@variationButtonAnimated: false; | |||
@variationButtonAnimatedFade: false; | |||
@variationButtonAttached: false; | |||
@variationButtonInverted: false; | |||
@variationButtonSocial: false; | |||
@variationButtonTertiary: false; | |||
@variationCalendarInverted: false; | |||
@variationCardInverted: false; | |||
@variationCheckboxInverted: false; | |||
@@ -25,12 +26,18 @@ | |||
@variationFeedInverted: false; | |||
@variationFlyoutInverted: false; | |||
@variationFormInverted: false; | |||
@variationFormTransparent: false; | |||
@variationGridDoubling: false; | |||
@variationGridInverted: false; | |||
@variationHeaderInverted: false; | |||
@variationIconInverted: false; | |||
@variationInputInverted: false; | |||
@variationItemInverted: false; | |||
@variationLabelCorner: false; | |||
@variationLabelImage: false; | |||
@variationLabelInverted: false; | |||
@variationLabelRibbon: false; | |||
@variationLabelTag: false; | |||
@variationListInverted: false; | |||
@variationMenuInverted: false; | |||
@variationMessageInverted: false; | |||
@@ -38,12 +45,17 @@ | |||
@variationNagInverted: false; | |||
@variationPlaceholderInverted: false; | |||
@variationPopupInverted: false; | |||
@variationPopupTooltip: false; | |||
@variationProgressInverted: false; | |||
@variationSegmentInverted: false; | |||
@variationSegmentPiled: false; | |||
@variationSegmentStacked: false; | |||
@variationSliderInverted: false; | |||
@variationStatisticInverted: false; | |||
@variationStepInverted: false; | |||
@variationTableInverted: false; | |||
@variationTableMarked: false; | |||
@variationTableStackable: false; | |||
@variationTextInverted: false; | |||
@variationToastInverted: false; | |||
@variationTransitionInverted: false; |
@@ -27,13 +27,9 @@ | |||
<div class="field"> | |||
<textarea name="merge_message_field" rows="5" :placeholder="mergeForm.mergeMessageFieldPlaceHolder" v-model="mergeMessageFieldValue"/> | |||
<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 }} | |||
</button> | |||
<div class="ui label"> | |||
<!-- TODO: Convert to tooltip once we can use tooltips in Vue templates --> | |||
{{ mergeForm.textClearMergeMessageHint }} | |||
</div> | |||
</template> | |||
</div> | |||
</template> |