Skip to content

Commit

Permalink
Fixes #57 - Selected color prioritises hover color. And fixed border …
Browse files Browse the repository at this point in the history
…bug on tag preview
  • Loading branch information
atruskie committed Dec 15, 2013
1 parent dca5ded commit 0c38dc5
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions src/app/annotationViewer/_annotation_viewer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ $marqueeBorderColorSelectedGlow: #f7ffef;
$marqueeBorderColorHover: #00ffe9;
$marqueeBorderColorInactive: #00FF00;


//noinspection CssInvalidHtmlTagReference
baw-annotation-viewer {

width: 100%;
Expand Down Expand Up @@ -47,6 +47,9 @@ baw-annotation-viewer {
z-index: 0;
background-color: transparent;

// keep border so element does not resize when border added in .active
border-bottom: transparent solid 1px;

@include vendor-prefix(transform-origin, 0 0);
@include vendor-prefix(transform, rotate3d(0,0,1,-20deg));

Expand All @@ -57,7 +60,7 @@ baw-annotation-viewer {
& .active {
z-index: 100;
background-color: #ffffff;
border-bottom: $tagAlignmentLine solid 1px;
border-bottom: $tagAlignmentLine solid 1px !important;
}


Expand Down Expand Up @@ -146,7 +149,7 @@ baw-annotation-viewer {
}

&[data-selected="true"] {
border-color: $marqueeBorderColorSelected;
border-color: $marqueeBorderColorSelected !important;
@include glow($marqueeBorderColorSelectedGlow);
z-index: 100;

Expand Down

0 comments on commit 0c38dc5

Please sign in to comment.