Commit bf5ed891 authored by RawKStar77's avatar RawKStar77

Remove uneccessary hoverfield and container divs, clean up CSS.

parent 259a1047
......@@ -1211,64 +1211,44 @@ h3.stream {
// View and Sort tabs ////////////////////
.container {
left: 0;
top: 0;
position: fixed;
.viewsort {
@include single-transition(top, .25s);
width: 100%;
height: 300px;
z-index: 2;
pointer-events: none;
.viewsort {
@include single-transition(top, .25s);
width: 100%;
text-align: center;
position: absolute;
top: 29px;
right: 0;
pointer-events: all;
text-align: center;
position: fixed;
top: 29px;
right: 0;
z-index: 4;
&.hidden {
top: 0;
}
&.hidden {
top: 0;
}
}
.viewsort > .dropdown {
@include smallshadow(0);
border-bottom-right-radius: 24px 72px;
border-bottom-left-radius: 24px 72px;
font-family: $sansFontFamily;
background: $white;
border: solid 1px $grayLighter;
padding: 0 10px;
margin: 0 3px;
display: inline-block;
z-index: 4;
.viewsort > .dropdown {
@include smallshadow(0);
border-bottom-right-radius: 24px 72px;
border-bottom-left-radius: 24px 72px;
font-family: $sansFontFamily;
background: $white;
border: solid 1px $grayLighter;
padding: 0 10px;
margin: 0 3px;
display: inline-block;
.dropdown-menu {
margin-top: 0;
.dropdown-menu {
margin-top: 0;
li {
z-index: 0;
}
li {
z-index: 0;
}
&:before, &:after {
display: none;
}
&.hidden {
display: none;
}
&:before, &:after {
display: none;
}
&.hidden {
display: none;
}
}
}
.hoverfield {
height: 30px;
width: 80%;
position: fixed;
top: 0;
left: 29px;
z-index: 5;
}
\ No newline at end of file
......@@ -19,6 +19,7 @@ class App
#This must be set so the view sort controller can autohide.
$scope.show_search = false
$scope.show_view_sort = false
$scope.$watch 'auth.personas', (newValue, oldValue) =>
unless newValue?.length
......@@ -687,7 +688,7 @@ class Editor
class Viewer
this.$inject = [
'$location', '$rootScope', '$routeParams', '$scope',
'annotator'
'annotator', 'viewFilter'
]
constructor: (
$location, $rootScope, $routeParams, $scope,
......@@ -708,20 +709,12 @@ class Viewer
$scope.predicate = 'updated'
$scope.reverse = true
$scope.hidden = 'hidden'
# $scope.xhover = false
$scope.$watch 'show_search', (newValue, oldValue) ->
if newValue
$scope.hidden = ''
else
$scope.hidden = 'hidden'
$scope.$watch 'xhover', (newValue, oldValue) ->
$scope.$watch 'show_view_sort', (newValue, oldValue) ->
if newValue == true
$scope.hidden = ''
if newValue == false
if $scope.show_search == false
$scope.hidden = 'hidden'
$scope.hidden = 'hidden'
$scope.focus = (annotation) ->
if angular.isArray annotation
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment