gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup CSS ordering, fix coloring for navdropdowns

Browse source
This commit is contained in:
Michael Ball 2020-01-07 15:38:00 -08:00
parent 1bcf1b8f06
commit 16d2d8c4f0
3 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/assets/stylesheets/application.css
View file

@ -2,6 +2,13 @@
*= require strap-on *= require strap-on
*= require formtastic-bootstrap *= require formtastic-bootstrap
*= require dataTables/bootstrap/3/jquery.dataTables.bootstrap *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
*= require selectize
*= require selectize.bootstrap3
*= require bootstrap-select
*= require bootstrap-markdown
*= require bootstrap-datetimepicker
*= require leaflet
*= require osem *= require osem
*= require osem-rating *= require osem-rating
*= require osem-schedule *= require osem-schedule
@ -10,15 +17,9 @@
*= require osem-splash *= require osem-splash
*= require font-awesome *= require font-awesome
*= require osem-fonts *= require osem-fonts
*= require bootstrap-markdown
*= require bootstrap-datetimepicker
*= require leaflet
*= require bootstrap3-switch *= require bootstrap3-switch
*= require osem-payments *= require osem-payments
*= require osem-navbar *= require osem-navbar
*= require selectize
*= require selectize.bootstrap3
*= require mastodon *= require mastodon
*= require bootstrap-select
*= require conferences *= require conferences
*/ */

11
app/assets/stylesheets/osem-navbar.scss
View file

@ -1,4 +1,6 @@
@import "breakpoints.scss"; @import "breakpoints.scss";
$navbar-default-link-color: #FFF;
.nav-osem { .nav-osem {
border: none; border: none;
@include breakpoint(xs) { @include breakpoint(xs) {
@ -31,8 +33,13 @@
.dropdown-menu { .dropdown-menu {
min-width: 225px; min-width: 225px;
} }
.navbar-default .navbar-nav>.open>a, .navbar-default .navbar-nav>.open>a:hover, .navbar-default .navbar-nav>.open>a:focus {
color: #FFF; &.navbar-default {
.navbar-nav > .open > a {
&:hover, &:focus {
color: $navbar-default-link-color;
}
}
} }
.navbar-brand img { .navbar-brand img {

4
app/assets/stylesheets/strap-on.scss
View file

@ -1,8 +1,8 @@
$navbar-default-bg: #0C3559; $navbar-default-bg: #0C3559;
$navbar-default-link-active-bg: rgb(8,8,8); $navbar-default-link-active-bg: rgb(8,8,8);
$navbar-default-border: 1px solid #d4d4d4; $navbar-default-border: 1px solid #d4d4d4;
$navbar-default-color: #ffffff; $navbar-default-color: #FFF;
$navbar-default-link-color: #ffffff; $navbar-default-link-color: #FFF;
$navbar-default-link-hover-color: #F2E205; $navbar-default-link-hover-color: #F2E205;
@import 'bootstrap-datetimepicker'; @import 'bootstrap-datetimepicker';