R11/release11-tools
4
2
Fork 0
Code Issues 9 Pull Requests 4 Packages Projects Releases 6 Wiki Activity

Fixed CSS merge conflicts

Browse Source
This commit is contained in:
Mikolaj Widla
2023-12-29 12:58:34 +01:00
parent ba5d5685b9
commit c3eef96354
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Frontend/src/style.css
View File

@@ -2,14 +2,6 @@
@tailwind components; @tailwind components;
@tailwind utilities; @tailwind utilities;
<<<<<<< HEAD
.inactive-button {
@apply py-2 px-4 h-fit text-slate-400 border border-slate-400 rounded-full
}
.tool-button {
@apply hover:brightness-110 py-2 px-4 h-fit rounded-full bg-gradient-to-r from-blue-400 to-sky-300 dark:text-white dark:from-sky-600 dark:to-sky-800 hover:bg-blue-400
=======
@font-face { @font-face {
font-family: "Raleway"; font-family: "Raleway";
src: url("fonts/Raleway-Variable.ttf"); src: url("fonts/Raleway-Variable.ttf");
@@ -26,14 +18,10 @@
.tool-button { .tool-button {
@apply hover:brightness-110 py-2 px-3 h-fit min-w-fit rounded-full bg-gradient-to-r from-blue-400 to-sky-300 dark:text-white dark:from-sky-600 dark:to-sky-800 hover:bg-blue-400 @apply hover:brightness-110 py-2 px-3 h-fit min-w-fit rounded-full bg-gradient-to-r from-blue-400 to-sky-300 dark:text-white dark:from-sky-600 dark:to-sky-800 hover:bg-blue-400
>>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
} }
.text-field { .text-field {
@apply w-full font-mono dark:text-slate-100 bg-slate-50 dark:bg-gray-600 border border-slate-400 p-2 rounded-lg @apply w-full font-mono dark:text-slate-100 bg-slate-50 dark:bg-gray-600 border border-slate-400 p-2 rounded-lg
<<<<<<< HEAD
}
=======
} }
.file-selector { .file-selector {
@@ -55,4 +43,3 @@
.tab-active { .tab-active {
@apply py-2 px-3 h-fit text-slate-700 border-t border-l border-r border-slate-400 rounded-t-2xl bg-gradient-to-r from-blue-400 to-sky-300 dark:text-white dark:from-sky-600 dark:to-sky-800 hover:bg-blue-400 @apply py-2 px-3 h-fit text-slate-700 border-t border-l border-r border-slate-400 rounded-t-2xl bg-gradient-to-r from-blue-400 to-sky-300 dark:text-white dark:from-sky-600 dark:to-sky-800 hover:bg-blue-400
} }
>>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0