Commit b5da8cb893b38b3c8123508cd7da3522e4776857
1 parent
ff7cbbe0
this is for bug 15302
Showing
2 changed files
with
12 additions
and
6 deletions
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
1 | 1 | <div class="collapse navbar-collapse" id="topFixedNavbar1"> |
2 | 2 | <ul class="nav navbar-nav toperMenu-spaceleft"> |
3 | - <li class="dropdown" ng-class="disableFileMenu"> | |
3 | + <li class="dropdown navbarDropdownItem" ng-class="disableFileMenu"> | |
4 | 4 | <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="fileMenuAnchor" role="button" aria-haspopup="true" aria-expanded="false">File<span class="caret"></span></a> |
5 | 5 | <ul class="dropdown-menu"> |
6 | 6 | <li ng-class="disableSubMenu"><a href="#">Open Resources</a></li> |
... | ... | @@ -23,9 +23,9 @@ |
23 | 23 | </ul> |
24 | 24 | </li> |
25 | 25 | <!--#7904--> |
26 | - <li ng-class="disableMenuannotation"><a href="#" data-toggle="modal" id="annotationButton" data-target=".bs-example-modal-sm" ng-click="ShowAnnotationWindow()">Annotation</a></li> | |
26 | + <li class="navbarItem" ng-class=" disablemenuannotation"><a href="#" data-toggle="modal" id="annotationButton" data-target=".bs-example-modal-sm" ng-click="ShowAnnotationWindow()">Annotation</a></li> | |
27 | 27 | |
28 | - <li class="dropdown" ng-class="disableMenuoption"> | |
28 | + <li class="dropdown navbarDropdownItem" ng-class="disableMenuoption"> | |
29 | 29 | <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Options<span class="caret"></span></a> |
30 | 30 | <ul class="dropdown-menu"> |
31 | 31 | <!--<li><a href="#" ng-click="ShowListManager()">List Manager</a></li>--> |
... | ... | @@ -40,7 +40,7 @@ |
40 | 40 | <li ng-class="disableSubMenu"><a href="#">Lab Exercises PDF</a></li> |
41 | 41 | </ul> |
42 | 42 | </li> |
43 | - <li class="dropdown"> | |
43 | + <li class="dropdown navbarDropdownItem"> | |
44 | 44 | <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Help<span class="caret"></span></a> |
45 | 45 | <ul class="dropdown-menu"> |
46 | 46 | <li><a href="http://interactiveanatomy.com/v107/content/en_US/help/guide/AIA_HELP.htm" target="_blank">Help Topics</a></li> |
... | ... | @@ -49,7 +49,7 @@ |
49 | 49 | <li><a href="http://interactiveanatomy.com/v107/content/en_US/help/about/Adam_Credits_AIA5.html" target="_blank">About A.D.A.M.</a></li> |
50 | 50 | </ul> |
51 | 51 | </li> |
52 | - <li><a ng-click="OpenAdminForm()" role="button" data-toggle="modal" class="btn" data-target="#adminModal" ng-hide="haveRoleAdmin">Admin</a></li> | |
52 | + <li class ="navbarItem"><a ng-click="OpenAdminForm()" role="button" data-toggle="modal" class="btn" data-target="#adminModal" ng-hide="haveRoleAdmin">Admin</a></liclass> | |
53 | 53 | </ul> |
54 | 54 | <ul class="nav navbar-nav navbar-right"> |
55 | 55 | <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li> | ... | ... |
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
... | ... | @@ -542,7 +542,13 @@ pointer-events: auto; |
542 | 542 | color: #FFFFFF; |
543 | 543 | } |
544 | 544 | /*#7904*/ |
545 | -.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus, .navbar-nav > li > a.active { | |
545 | +/*.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus, .navbar-nav > li > a.active { | |
546 | + color: #2db0f5; | |
547 | +}*/ | |
548 | +.navbar-inverse .navbar-nav > .navbarDropdownItem > a:hover, .navbar-nav > .navbarDropdownItem > a.active { | |
549 | + color: #2db0f5; | |
550 | +} | |
551 | +.navbar-inverse .navbar-nav > .navbarItem > a:hover, .navbar-inverse .navbar-nav > .navbarItem > a:focus, .navbar-nav > .navbarItem > a.active { | |
546 | 552 | color: #2db0f5; |
547 | 553 | } |
548 | 554 | ... | ... |