Commit 2c3a2311 authored by Nathan Peraldi's avatar Nathan Peraldi

fix conflict in css file

parent d09b4c39
...@@ -27,17 +27,26 @@ ...@@ -27,17 +27,26 @@
} }
.adullact-sort-button { .adullact-sort-button {
padding: 5px;
border-radius: 3px; border-radius: 3px;
border: 1px solid grey; border: 1px solid grey;
color: grey; color: grey;
} }
.adullact-sort-button a{
color: grey;
padding:5px;
display:block;
}
.adullact-selected { .adullact-selected {
color: black; color: black;
border: 1px solid black; border: 1px solid black;
} }
.adullact-selected a{
color: black;
}
.adullact-required { .adullact-required {
color: red; color: red;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment