Skip to content

Commit

Permalink
Merge pull request #49 from itk-dev/fix/underlining
Browse files Browse the repository at this point in the history
2213: Scope link underlining til paragraphs
  • Loading branch information
rimi-itk authored Aug 29, 2024
2 parents c7a48d0 + 152f1d7 commit d253038
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ See [keep a changelog] for information about writing changes to this log.

## [Unreleased]

* [PR-49](https://github.com/itk-dev/giv-din-stemme/pull/49)
Fix underlining
* [PR-44](https://github.com/itk-dev/giv-din-stemme/pull/44)
Stop recording after a minute.
* [PR-46](https://github.com/itk-dev/giv-din-stemme/pull/46)
Expand Down
17 changes: 8 additions & 9 deletions web/themes/custom/giv_din_stemme_theme/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@

/* Define common buttons */
.btn-primary {
@apply border border-brand bg-brand text-white rounded-lg px-3 py-2 min-h-9 hover:bg-orange-700 hover:border-orange-700 transition-colors;
@apply border border-brand bg-brand text-white rounded-lg px-3 py-2 min-h-9 hover:bg-orange-700 hover:border-orange-700 transition-colors no-underline;
}
.btn-secondary {
@apply border border-gray-300 bg-gray-300 text-gray-900 rounded-lg px-3 py-2 min-h-9 hover:bg-gray-400 hover:text-gray-950 hover:border-gray-400 transition-colors w-full md:w-auto;
@apply border border-gray-300 bg-gray-300 text-gray-900 rounded-lg px-3 py-2 min-h-9 hover:bg-gray-400 hover:text-gray-950 hover:border-gray-400 transition-colors w-full md:w-auto no-underline;
}
.btn-default {
@apply border border-black bg-black text-white rounded-lg px-3 py-2 min-h-9 hover:bg-stone-700 hover:border-stone-700 transition-colors w-full md:w-auto;
@apply border border-black bg-black text-white rounded-lg px-3 py-2 min-h-9 hover:bg-stone-700 hover:border-stone-700 transition-colors w-full md:w-auto no-underline;
}
.btn-danger {
@apply border border-secondary bg-red-600 text-white rounded-lg px-3 py-2 min-h-9 hover:bg-red-700 transition-colors;
@apply border border-secondary bg-red-600 text-white rounded-lg px-3 py-2 min-h-9 hover:bg-red-700 transition-colors no-underline;
}
.disabled, button:disabled {
@apply border border-secondary bg-gray-400 text-gray-200 cursor-not-allowed hover:bg-gray-400 hover:text-gray-200 hover:border-secondary;
@apply border border-secondary bg-gray-400 text-gray-200 cursor-not-allowed hover:bg-gray-400 hover:text-gray-200 hover:border-secondary no-underline;
}

.btn-icon {
Expand Down Expand Up @@ -123,8 +123,7 @@
display: none;
}

/* Static content */

/* Static content */
.static-content ul {
@apply list-disc list-inside;
}
Expand All @@ -149,8 +148,8 @@
@apply mb-1;
}

.static-content a,
.content a {
.static-content p > a,
.content p > a {
@apply underline;
}

Expand Down

0 comments on commit d253038

Please sign in to comment.