From a7e6e9db1d1b82a9a59e8398883cda6b2ef5c474 Mon Sep 17 00:00:00 2001 From: Alex Liebowitz Date: Wed, 2 Nov 2016 12:09:33 -0400 Subject: [PATCH 1/3] Convert text links to mixin --- scss/_gui.scss | 56 +++++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/scss/_gui.scss b/scss/_gui.scss index 677622086..6e69c47ee 100644 --- a/scss/_gui.scss +++ b/scss/_gui.scss @@ -1,5 +1,34 @@ @import "global"; +@mixin text-link($color: $color-primary, $hover-opacity: 0.70) { + color: $color; + .icon + { + &:first-child { + padding-right: 5px; + } + &:last-child:not(:only-child) { + padding-left: 5px; + } + } + + &:not(.no-underline) { + text-decoration: underline; + .icon { + text-decoration: none; + } + } + &:hover + { + opacity: $hover-opacity; + transition: opacity .225s ease; + text-decoration: underline; + .icon { + text-decoration: none; + } + } +} + .icon-fixed-width { /* This borrowed is from a component of Font Awesome we're not using, maybe add it? */ width: (18em / 14); @@ -151,32 +180,7 @@ input[type="text"], input[type="search"] } .button-text { - color: $color-primary; - .icon - { - &:first-child { - padding-right: 5px; - } - &:last-child:not(:only-child) { - padding-left: 5px; - } - } - - &:not(.no-underline) { - text-decoration: underline; - .icon { - text-decoration: none; - } - } - &:hover - { - opacity: 0.70; - transition: opacity .225s ease; - text-decoration: underline; - .icon { - text-decoration: none; - } - } + @include text-link(); } .icon:only-child { From e228790b2828c6d0dee098e026f600cc879e97f6 Mon Sep 17 00:00:00 2001 From: Alex Liebowitz Date: Wed, 2 Nov 2016 12:12:24 -0400 Subject: [PATCH 2/3] Add styles for help links --- scss/_gui.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scss/_gui.scss b/scss/_gui.scss index 6e69c47ee..09a1b950a 100644 --- a/scss/_gui.scss +++ b/scss/_gui.scss @@ -182,6 +182,11 @@ input[type="text"], input[type="search"] { @include text-link(); } +.button-text-help +{ + @include text-link(#5b8c80); + font-size: 0.8em; +} .icon:only-child { position: relative; From 5d5ec8633e01557b3dae08517d7316c08f2802c7 Mon Sep 17 00:00:00 2001 From: Alex Liebowitz Date: Wed, 2 Nov 2016 12:13:20 -0400 Subject: [PATCH 3/3] Add "report" link to Show page --- js/page/show.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/page/show.js b/js/page/show.js index ea04f9f06..a7c28030c 100644 --- a/js/page/show.js +++ b/js/page/show.js @@ -60,6 +60,9 @@ var FormatItem = React.createClass({ {mediaType == 'video' ? : null} +
+ +
);