Commit bf5ed891 authored by RawKStar77's avatar RawKStar77

Remove uneccessary hoverfield and container divs, clean up CSS.

parent 259a1047
...@@ -1211,30 +1211,21 @@ h3.stream { ...@@ -1211,30 +1211,21 @@ h3.stream {
// View and Sort tabs //////////////////// // View and Sort tabs ////////////////////
.container { .viewsort {
left: 0;
top: 0;
position: fixed;
width: 100%;
height: 300px;
z-index: 2;
pointer-events: none;
.viewsort {
@include single-transition(top, .25s); @include single-transition(top, .25s);
width: 100%; width: 100%;
text-align: center; text-align: center;
position: absolute; position: fixed;
top: 29px; top: 29px;
right: 0; right: 0;
pointer-events: all; z-index: 4;
&.hidden { &.hidden {
top: 0; top: 0;
} }
} }
.viewsort > .dropdown { .viewsort > .dropdown {
@include smallshadow(0); @include smallshadow(0);
border-bottom-right-radius: 24px 72px; border-bottom-right-radius: 24px 72px;
border-bottom-left-radius: 24px 72px; border-bottom-left-radius: 24px 72px;
...@@ -1244,7 +1235,6 @@ h3.stream { ...@@ -1244,7 +1235,6 @@ h3.stream {
padding: 0 10px; padding: 0 10px;
margin: 0 3px; margin: 0 3px;
display: inline-block; display: inline-block;
z-index: 4;
.dropdown-menu { .dropdown-menu {
margin-top: 0; margin-top: 0;
...@@ -1261,14 +1251,4 @@ h3.stream { ...@@ -1261,14 +1251,4 @@ h3.stream {
display: none; display: none;
} }
} }
}
}
.hoverfield {
height: 30px;
width: 80%;
position: fixed;
top: 0;
left: 29px;
z-index: 5;
} }
...@@ -19,6 +19,7 @@ class App ...@@ -19,6 +19,7 @@ class App
#This must be set so the view sort controller can autohide. #This must be set so the view sort controller can autohide.
$scope.show_search = false $scope.show_search = false
$scope.show_view_sort = false
$scope.$watch 'auth.personas', (newValue, oldValue) => $scope.$watch 'auth.personas', (newValue, oldValue) =>
unless newValue?.length unless newValue?.length
...@@ -687,7 +688,7 @@ class Editor ...@@ -687,7 +688,7 @@ class Editor
class Viewer class Viewer
this.$inject = [ this.$inject = [
'$location', '$rootScope', '$routeParams', '$scope', '$location', '$rootScope', '$routeParams', '$scope',
'annotator' 'annotator', 'viewFilter'
] ]
constructor: ( constructor: (
$location, $rootScope, $routeParams, $scope, $location, $rootScope, $routeParams, $scope,
...@@ -708,19 +709,11 @@ class Viewer ...@@ -708,19 +709,11 @@ class Viewer
$scope.predicate = 'updated' $scope.predicate = 'updated'
$scope.reverse = true $scope.reverse = true
$scope.hidden = 'hidden' $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 if newValue == true
$scope.hidden = '' $scope.hidden = ''
if newValue == false if newValue == false
if $scope.show_search == false
$scope.hidden = 'hidden' $scope.hidden = 'hidden'
$scope.focus = (annotation) -> $scope.focus = (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