Commit b0294f47 authored by Randall Leeds's avatar Randall Leeds

Merge pull request #1111 from RawKStar77/hideviewsort2

Improve CSS for viewsort controls
parents 5a63517f 67ab7b20
...@@ -1172,8 +1172,12 @@ h3.stream { ...@@ -1172,8 +1172,12 @@ h3.stream {
cursor: pointer; cursor: pointer;
} }
.VS-search .VS-icon-cancel:hover { .VS-search .VS-icon-cancel:hover {
width: 11px; height: 11px;
background-position: center 0;
background-image: url(../images/svg/cancel_black.svg); background-image: url(../images/svg/cancel_black.svg);
background-size: contain;
cursor: pointer;
} }
.VS-search .VS-icon-search { .VS-search .VS-icon-search {
...@@ -1208,11 +1212,18 @@ h3.stream { ...@@ -1208,11 +1212,18 @@ h3.stream {
// View and Sort tabs //////////////////// // View and Sort tabs ////////////////////
.viewsort { .viewsort {
@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;
z-index: 4;
&.ng-hide {
top: 0;
display:block!important;
}
} }
.viewsort > .dropdown { .viewsort > .dropdown {
...@@ -1222,8 +1233,15 @@ h3.stream { ...@@ -1222,8 +1233,15 @@ h3.stream {
font-family: $sansFontFamily; font-family: $sansFontFamily;
background: $white; background: $white;
border: solid 1px $grayLighter; border: solid 1px $grayLighter;
padding: 0 4px; padding: 0 10px;
margin: 0 3px; margin: 0 3px;
display: inline-block; display: inline-block;
z-index: 4;
.dropdown-menu {
margin-top: 0;
&:before, &:after {
display: none;
}
}
} }
...@@ -685,7 +685,7 @@ class Editor ...@@ -685,7 +685,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,
...@@ -698,6 +698,7 @@ class Viewer ...@@ -698,6 +698,7 @@ class Viewer
{view:'Document'} {view:'Document'}
{view:"Comments"} {view:"Comments"}
] ]
$scope.sorts = [ $scope.sorts = [
{sort:'Newest'} {sort:'Newest'}
{sort:'Oldest'} {sort:'Oldest'}
......
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