Permalink
Browse files

Merge branch 'wip-MDL-39836_M25' of git://github.com/gjb2048/moodle i…

…nto MOODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
  • Loading branch information...
2 parents 4f0d611 + 69ecf8c commit e58af1dfcdc2d88c0255c2554e924c674db9d0d6 @stronk7 stronk7 committed May 27, 2013
Showing with 11 additions and 3 deletions.
  1. +10 −2 theme/bootstrapbase/less/moodle/modules.less
  2. +1 −1 theme/bootstrapbase/style/moodle.css
@@ -81,12 +81,20 @@ select {
.dir-rtl .navbar .brand {
float: right;
}
+
.navbar .logininfo a {
color: @navbarLinkColor;
}
.navbar .logininfo a:hover {
- background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover/:focus from .active
- color: @navbarLinkColorHover;
+ background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover/:focus from .active
+ color: @navbarLinkColorHover;
+}
+.navbar-inverse .logininfo a {
+ color: @navbarInverseLinkColor;
+}
+.navbar-inverse .logininfo a:hover {
+ background-color: @navbarInverseLinkBackgroundHover; // "transparent" is default to differentiate :hover/:focus from .active
+ color: @navbarInverseLinkColorHover;
}
.navbar-fixed-top,

Large diffs are not rendered by default.

Oops, something went wrong.

0 comments on commit e58af1d

Please sign in to comment.