Commit 3df3c248a32dd0eafafa408126b7709cbd6cc2c2
Merge branch 'CACI_Bug' into Develop
Showing
3 changed files
with
14 additions
and
10 deletions
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -55,14 +55,6 @@ | @@ -55,14 +55,6 @@ | ||
55 | display: none; | 55 | display: none; |
56 | } | 56 | } |
57 | 57 | ||
58 | - .customTooltip { | ||
59 | - background: #333 !important; | ||
60 | - color: #fff !important; | ||
61 | - /*opacity: 0.9 !important;*/ | ||
62 | - } | ||
63 | - | ||
64 | - | ||
65 | - | ||
66 | 58 | ||
67 | .custom-tooltip { | 59 | .custom-tooltip { |
68 | background-color: #333; | 60 | background-color: #333; |
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
@@ -14,8 +14,8 @@ | @@ -14,8 +14,8 @@ | ||
14 | <!--<li role="presentation" class="active" title="Image View"><i class=" fa fa-image txt-white cur-pot" href="#grid-view" aria-controls="grid-view" role="tab" data-toggle="tab"></i></li> | 14 | <!--<li role="presentation" class="active" title="Image View"><i class=" fa fa-image txt-white cur-pot" href="#grid-view" aria-controls="grid-view" role="tab" data-toggle="tab"></i></li> |
15 | <li role="presentation" title="List View"><i class="fa fa-list-alt txt-white cur-pot" href="#list-view" aria-controls="list-view" role="tab" data-toggle="tab"></i></li>--> | 15 | <li role="presentation" title="List View"><i class="fa fa-list-alt txt-white cur-pot" href="#list-view" aria-controls="list-view" role="tab" data-toggle="tab"></i></li>--> |
16 | 16 | ||
17 | - <li role="presentation" ng-class="{'active':activeTab==1}" title="Image View"><i class=" fa fa-image txt-white cur-pot" ng-click="setActiveTab(1)" href="#grid-view" aria-controls="grid-view" role="tab" data-toggle="tab"></i></li> | ||
18 | - <li role="presentation" ng-class="{'active':activeTab==2}" title="List View"><i class="fa fa-list-alt txt-white cur-pot" ng-click="setActiveTab(2)" href="#list-view" aria-controls="list-view" role="tab" data-toggle="tab"></i></li> | 17 | + <li role="presentation" class="tooltip-custom" ng-class="{'active':activeTab==1}" title="Image View"><i class=" fa fa-image txt-white cur-pot" ng-click="setActiveTab(1)" href="#grid-view" aria-controls="grid-view" role="tab" data-toggle="tab"></i></li> |
18 | + <li role="presentation" class="tooltip-custom" ng-class="{'active':activeTab==2}" title="List View"><i class="fa fa-list-alt txt-white cur-pot" ng-click="setActiveTab(2)" href="#list-view" aria-controls="list-view" role="tab" data-toggle="tab"></i></li> | ||
19 | 19 | ||
20 | </ul> | 20 | </ul> |
21 | </div> | 21 | </div> |
@@ -206,3 +206,8 @@ | @@ -206,3 +206,8 @@ | ||
206 | }); | 206 | }); |
207 | }); | 207 | }); |
208 | </script> | 208 | </script> |
209 | +<script> | ||
210 | + $(".tooltip-custom").tooltip({ | ||
211 | + tooltipClass: 'customTooltip' | ||
212 | + }); | ||
213 | +</script> |
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -160,6 +160,13 @@ footer.dark { | @@ -160,6 +160,13 @@ footer.dark { | ||
160 | .space-top50 { | 160 | .space-top50 { |
161 | margin-top: 50px; | 161 | margin-top: 50px; |
162 | } | 162 | } |
163 | +/*Custom ToolTip In AIA*/ | ||
164 | +.customTooltip { | ||
165 | + background: #333 !important; | ||
166 | + color: #fff !important; | ||
167 | + /*opacity: 0.9 !important;*/ | ||
168 | + } | ||
169 | + | ||
163 | /*.tools { | 170 | /*.tools { |
164 | background: #eeeeee none repeat scroll 0 0; | 171 | background: #eeeeee none repeat scroll 0 0; |
165 | border: 1px solid #c1c1c1; | 172 | border: 1px solid #c1c1c1; |