mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-13 07:46:06 +00:00
merge ocelot master resolve conflicts
This commit is contained in:
commit
58079c5b8e
@ -1,5 +0,0 @@
|
||||
/*
|
||||
*
|
||||
* Here, all SCSS variables and classes can be adapted to your custom design.
|
||||
*
|
||||
*/
|
||||
@ -25,4 +25,4 @@ $color-locale-menu: $color-primary-light;
|
||||
|
||||
.main-navigation .base-button {
|
||||
color: $color-primary-light;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user