Skip to content

C
coopwire-hypothesis
Commit c6d03ec0 authored by Jehan Tremback's avatar Jehan Tremback Committed by Randall Leeds
Browse files
Options

fixed up writer and buttons

parent b73d39dc
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 21 deletions
h/sass/base.scss
View file @ c6d03ec0
...@@ -109,11 +109,15 @@ $em: 14 / 1em !default; ...@@ -109,11 +109,15 @@ $em: 14 / 1em !default;
position: relative; position: relative;
text-decoration: none; text-decoration: none;
text-shadow: 0 1px 2px rgba(255, 255, 255, .9); text-shadow: 0 1px 2px rgba(255, 255, 255, .9);
color: black;
&:hover { &:hover {
@include background-image( @include background-image(
linear-gradient(top, #fefefe 0%, #f4f4f4 50%, #e2e2e2 51%, #fdfdfd 100%)); linear-gradient(top, #fefefe 0%, #f4f4f4 50%, #e2e2e2 51%, #fdfdfd 100%));
border-color: $grayLight $grayLight $gray; border-color: $grayLight $grayLight $gray;
& > a {
opacity: 1;
}
} }
&:active { &:active {
...@@ -180,6 +184,10 @@ $em: 14 / 1em !default; ...@@ -180,6 +184,10 @@ $em: 14 / 1em !default;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: left center; background-position: left center;
color: black; color: black;
opacity: .6;
&:hover {
opacity: 1;
}
} }
@mixin linkbutton_right { @mixin linkbutton_right {
......
h/sass/common.scss
View file @ c6d03ec0
...@@ -92,6 +92,7 @@ label { ...@@ -92,6 +92,7 @@ label {
span.errorMsg { @extend .visuallyhidden; } span.errorMsg { @extend .visuallyhidden; }
} }
//Candidate for cleanup
.btn-link { .btn-link {
@include box-shadow(none); @include box-shadow(none);
@include reset-box-model; @include reset-box-model;
...@@ -177,29 +178,33 @@ label { ...@@ -177,29 +178,33 @@ label {
& > * { & > * {
margin-right: .5em; margin-right: .5em;
} }
}
a { a {
@include linkbutton;
&.write { &.write {
background-image: url("../images/pen_1.png"); @include linkbutton;
} background-image: url("../images/pen_1.png");
}
&.fave { &.fave {
background-image: url("../images/fave_1.png"); @include linkbutton;
} background-image: url("../images/fave_1.png");
}
&.flag { &.flag {
background-image: url("../images/flag_1.png"); @include linkbutton;
} background-image: url("../images/flag_1.png");
}
&.annotator-save { &.annotator-save {
background-image: url("../images/submit_1.png"); @include linkbutton;
} background-image: url("../images/submit_1.png");
}
&.annotator-cancel { &.annotator-cancel {
background-image: url("../images/delete_1.png"); @include linkbutton;
} background-image: url("../images/delete_1.png");
} }
} }
...@@ -386,6 +391,10 @@ blockquote { ...@@ -386,6 +391,10 @@ blockquote {
margin-bottom: .5em; margin-bottom: .5em;
white-space: pre-wrap; white-space: pre-wrap;
} }
.bottombar {
@include pie-clearfix;
}
} }
...@@ -422,7 +431,7 @@ blockquote { ...@@ -422,7 +431,7 @@ blockquote {
@include icon("minus_1.png"); @include icon("minus_1.png");
} }
& > .detail { & > .detail, .writer {
padding-left: $thread-padding; padding-left: $thread-padding;
padding-top: 0; padding-top: 0;
margin-top: 1em; margin-top: 1em;
...@@ -484,14 +493,18 @@ blockquote { ...@@ -484,14 +493,18 @@ blockquote {
//EDITOR//////////////////////////////// //EDITOR////////////////////////////////
//This is an input element to make annotations. //This is an input element to make annotations.
.writer { .writer {
@include smallshadow(0, 2px, .2);
position: relative; position: relative;
padding-left: 1em;
textarea { textarea {
margin-top: .5em;
width: 100%; width: 100%;
min-height: 8em; min-height: 8em;
} }
.annotator-controls {
float: left; .bottombar {
.btn {
margin-right: .5em;
}
} }
} }
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