diff options
| author | silverwind <me@silverwind.io> | 2020-11-15 21:58:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-15 15:58:16 -0500 |
| commit | 0de546009e466486cd88dfa98d07d8775bd3087d (patch) | |
| tree | 9150f26ad2580337acace452363a3081942d366d /integrations/pull_merge_test.go | |
| parent | 7a30e97002ec8bd601b93549d4efc51743ecf2b3 (diff) | |
| download | gitea-0de546009e466486cd88dfa98d07d8775bd3087d.tar.gz gitea-0de546009e466486cd88dfa98d07d8775bd3087d.zip | |
CSS color variables, less bold font weight and more (#13567)
* CSS color variables, less bold font weight
- Define color variables for fully saturated colors and apply them where
it made sense
- Add background color helper classes
- Globally reduce bold font weight from 700 to 500
- Remove border from timeline icons
- Unify dropzone styling
- Various border style consolidations
* attempt to fix test
* another attempt at tests
* fix contains
Diffstat (limited to 'integrations/pull_merge_test.go')
| -rw-r--r-- | integrations/pull_merge_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go index 04e68ff3dc..b5edb41eec 100644 --- a/integrations/pull_merge_test.go +++ b/integrations/pull_merge_test.go @@ -194,7 +194,7 @@ func TestCantMergeWorkInProgress(t *testing.T) { req := NewRequest(t, "GET", resp.Header().Get("Location")) resp = session.MakeRequest(t, req, http.StatusOK) htmlDoc := NewHTMLParser(t, resp.Body) - text := strings.TrimSpace(htmlDoc.doc.Find(".attached.merge-section.no-header > .text.grey").Last().Text()) + text := strings.TrimSpace(htmlDoc.doc.Find(".merge-section > .item").Last().Text()) assert.NotEmpty(t, text, "Can't find WIP text") // remove <strong /> from lang |