Skip to content

C
coopwire-hypothesis
Commit e26fdcba authored by Randall Leeds's avatar Randall Leeds
Browse files
Options

Merge pull request #1398 from hypothesis/CSStweaks3 

CSStweaks3
parents 79d2cdd8 91992c95
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 468 additions and 533 deletions
h/static/fonts/h.svg 100755 → 100644
View file @ e26fdcba
......@@ -77,6 +77,7 @@
<glyph unicode="&#xe60a;" d="M476.698 442.679l-2.014 2.021c-47.074 47.067-124.097 47.067-171.163 0l-109.053-109.068c-47.067-47.066-47.067-124.088 0-171.155l2.013-2.013c3.916-3.924 8.073-7.462 12.368-10.729l39.924 39.925c-4.651 2.747-9.063 6.036-13.058 10.030l-2.021 2.021c-25.557 25.549-25.557 67.136 0 92.695l109.064 109.056c25.558 25.559 67.137 25.559 92.693 0l2.021-2.012c25.55-25.558 25.55-67.146 0-92.695l-49.343-49.343c8.566-21.154 12.624-43.7 12.269-66.193l76.302 76.302c47.067 47.068 47.067 124.089-0.002 171.158zM315.521 285.533c-3.916 3.916-8.073 7.461-12.368 10.72l-39.924-39.916c4.652-2.748 9.063-6.037 13.058-10.031l2.021-2.020c25.558-25.558 25.558-67.136 0-92.694l-109.065-109.067c-25.559-25.551-67.138-25.551-92.694 0l-2.021 2.021c-25.549 25.56-25.549 67.138 0 92.694l49.344 49.343c-8.567 21.153-12.623 43.701-12.269 66.193l-76.301-76.299c-47.068-47.066-47.068-124.089 0-171.162l2.013-2.016c47.076-47.064 124.096-47.064 171.164 0l109.055 109.059c47.067 47.066 47.067 124.097 0 171.163l-2.013 2.012z" />
<glyph unicode="&#xe60b;" d="M421.647 480h-361.412c-33.13 0-60.236-30.118-60.236-66.259v-228.894c0-36.141 27.106-66.259 60.236-66.259h30.118v-150.588l144.565 150.588h186.73c33.13 0 60.236 30.118 60.236 66.259v228.894c0 36.141-27.106 66.259-60.236 66.259zM361.412 269.177h-90.353v-90.353h-60.236v90.353h-90.353v60.236h90.353v90.353h60.236v-90.353h90.353v-60.236z" />
<glyph unicode="&#xe60c;" d="M480 64l-124.563 124.563c17.781 29.031 28.563 62.859 28.563 99.438 0 106.015-86 192-192 192-106.016 0-192-85.985-192-192 0-106 85.984-192 192-192 36.578 0 70.406 10.781 99.438 28.5l124.563-124.5c8.75-8.75 23.25-8.688 32 0l32 32c8.75 8.75 8.75 23.25 0 32zM192 160c-70.688 0-128 57.313-128 128s57.313 128 128 128 128-57.313 128-128-57.313-128-128-128z" horiz-adv-x="487" />
<glyph unicode="&#xe60d;" d="M0 272v-96c0-8.836 7.164-16 16-16h480c8.836 0 16 7.164 16 16v96c0 8.836-7.164 16-16 16h-480c-8.836 0-16-7.164-16-16z" />
<glyph unicode="&#xf000;" d="M0 480l512-512h-512z" />
<glyph unicode="&#xf06e;" d="M475.429 205.714q-43.429 67.429-108.857 100.857 17.429-29.714 17.429-64.286 0-52.857-37.571-90.429t-90.429-37.571-90.429 37.571-37.571 90.429q0 34.571 17.429 64.286-65.429-33.429-108.857-100.857 38-58.571 95.286-93.286t124.143-34.714 124.143 34.714 95.286 93.286zM269.714 315.429q0 5.714-4 9.714t-9.714 4q-35.714 0-61.286-25.571t-25.571-61.286q0-5.714 4-9.714t9.714-4 9.714 4 4 9.714q0 24.571 17.429 42t42 17.429q5.714 0 9.714 4t4 9.714zM512 205.714q0-9.714-5.714-19.714-40-65.714-107.571-105.286t-142.714-39.571-142.714 39.714-107.571 105.143q-5.714 10-5.714 19.714t5.714 19.714q40 65.429 107.571 105.143t142.714 39.714 142.714-39.714 107.571-105.143q5.714-10 5.714-19.714z" />
<glyph unicode="&#xf070;" d="M158.571 98.571l22.286 40.286q-24.857 18-38.857 45.429t-14 58q0 34.571 17.429 64.286-65.429-33.429-108.857-100.857 47.714-73.714 122-107.143zM269.714 315.429q0 5.714-4 9.714t-9.714 4q-35.714 0-61.286-25.571t-25.571-61.286q0-5.714 4-9.714t9.714-4 9.714 4 4 9.714q0 24.571 17.429 42t42 17.429q5.714 0 9.714 4t4 9.714zM373.429 370q0-2-0.286-2.571-30-53.714-90-161.714t-90.286-162l-14-25.429q-2.857-4.571-8-4.571-3.429 0-38.286 20-4.571 2.857-4.571 8 0 3.429 12.571 24.857-40.857 18.571-75.286 49.429t-59.571 70q-5.714 8.857-5.714 19.714t5.714 19.714q43.714 67.143 108.571 106t141.714 38.857q25.429 0 51.429-4.857l15.429 27.714q2.857 4.571 8 4.571 1.429 0 5.143-1.714t8.857-4.429 9.429-5.286 9-5.286 5.571-3.286q4.571-2.857 4.571-7.714zM384 242.286q0-39.714-22.571-72.429t-59.714-47l80 143.429q2.286-12.857 2.286-24zM512 205.714q0-10-5.714-19.714-11.143-18.286-31.143-41.429-42.857-49.143-99.286-76.286t-119.857-27.143l21.143 37.714q60.571 5.143 112.143 39.143t86.143 87.714q-32.857 51.143-80.571 84l18 32q27.143-18.286 52.143-43.714t41.286-52.571q5.714-9.714 5.714-19.714z" />
......
h/static/fonts/selection.json 100755 → 100644
View file @ e26fdcba
This diff is collapsed.
h/static/icomoon.css 100755 → 100644
View file @ e26fdcba
@font-face {
font-family: 'h';
src:url('fonts/h.eot?jsvc9t');
src:url('fonts/h.eot?#iefixjsvc9t') format('embedded-opentype'),
url('fonts/h.woff?jsvc9t') format('woff'),
url('fonts/h.ttf?jsvc9t') format('truetype'),
url('fonts/h.svg?jsvc9t#h') format('svg');
src:url('fonts/h.eot?-f82t8p');
src:url('fonts/h.eot?#iefix-f82t8p') format('embedded-opentype'),
url('fonts/h.woff?-f82t8p') format('woff'),
url('fonts/h.ttf?-f82t8p') format('truetype'),
url('fonts/h.svg?-f82t8p#h') format('svg');
font-weight: normal;
font-style: normal;
}
......@@ -23,6 +23,36 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-minus:before {
content: "\e60d";
}
.icon-users:before {
content: "\e603";
}
.icon-user:before {
content: "\e604";
}
.icon-bullhorn:before {
content: "\e605";
}
.icon-bubbles:before {
content: "\e606";
}
.icon-bubbles2:before {
content: "\e607";
}
.icon-bell:before {
content: "\e608";
}
.icon-earth:before {
content: "\e609";
}
.icon-link:before {
content: "\e60a";
}
.icon-search:before {
content: "\e60c";
}
.icon-window:before {
content: "\2e";
}
......@@ -221,30 +251,3 @@
.icon-icon-comment:before {
content: "\e60b";
}
.icon-users:before {
content: "\e603";
}
.icon-user:before {
content: "\e604";
}
.icon-bullhorn:before {
content: "\e605";
}
.icon-bubbles:before {
content: "\e606";
}
.icon-bubbles2:before {
content: "\e607";
}
.icon-bell:before {
content: "\e608";
}
.icon-earth:before {
content: "\e609";
}
.icon-link:before {
content: "\e60a";
}
.icon-search:before {
content: "\e60c";
}
h/static/scripts/directives.coffee
View file @ e26fdcba
......@@ -77,7 +77,7 @@ markdown = ['$filter', '$timeout', ($filter, $timeout) ->
privacy = ->
levels = ['Public', 'Private']
levels = ['Public', 'Only Me']
link: (scope, elem, attrs, controller) ->
return unless controller?
......@@ -88,7 +88,7 @@ privacy = ->
if 'group:__world__' in (permissions.read or [])
'Public'
else
'Private'
'Only Me'
controller.$parsers.push (privacy) ->
return unless privacy?
......
h/static/styles/base.scss
View file @ e26fdcba
......@@ -65,8 +65,6 @@ $highlight-mode-color: rgba(255, 255, 60, 0.3);
$highlight-mode-color-second: rgba(206, 206, 60, 0.4);
$highlight-mode-color-third: rgba(192, 192, 49, 0.4);
$highlight-mode-active-color: rgba(255, 255, 60, 0.7);
$thread-padding: 1em;
$threadexp-width: .72em;
$score-width: 40px;
$score-height: $score-width;
$heatmap-width: 22px;
......@@ -152,55 +150,6 @@ $input-border-radius: 2px;
}
}
//ICON IMAGES////////////////////////////////
@mixin icon_resets {
background-repeat: no-repeat;
background-position: center;
background-size: 100% 100%;
}
@mixin icon($icon) {
@include icon_resets;
background-image: url("../images/#{$icon}");
}
//FONTICON////////////////////////////////
@mixin fonticon($char, $iconside, $offset: .5em) {
text-decoration: none;
cursor: pointer;
&:hover {
opacity: 1;
}
@if $iconside == left {
&:before {
content: $char !important;
font-family: 'icomoon';
margin-right: $offset;
speak: none;
font-weight: normal;
@content; // Allow additonal styles for the icon.
}
&:after {
content: "" !important;
}
}
@if $iconside == right {
&:before {
content: "" !important;
}
&:after {
content: $char !important;
font-family: 'icomoon';
margin-left: $offset;
speak: none;
font-weight: normal;
}
}
}
//NOISE///////////
//Provides the noise background
.noise {
......
h/static/styles/common.scss
View file @ e26fdcba
......@@ -4,6 +4,7 @@
@import 'forms';
@import 'spinner';
@import 'responsive';
@import 'threads';
@import 'yui_grid';
@import 'simple-search';
......@@ -349,67 +350,6 @@ blockquote {
//ICON CLASSES////////////////////////////////
.flag-icon {
@include fonticon("\28", left);
}
.fave-icon {
@include fonticon("\e006", left);
&.checked:before {
content: "\e005";
}
}
.reply-icon {
@include fonticon("\e004", left);
}
.share-icon {
@include fonticon("\25", left);
}
.down-icon {
@include fonticon("\e007", left);
}
.clipboard-icon {
@include fonticon("\33", left);
}
.check-icon {
@include fonticon("\35", left);
}
.plus-icon {
@include fonticon("\e012", left);
}
.x-icon {
@include fonticon("\36", left);
}
.vis-icon {
@include fonticon("\e001", left);
}
.highlight-icon {
@include fonticon("\e601", left);
}
.comment-icon {
@include fonticon("\e600", left);
}
.launch-icon {
@include fonticon("\2a", left);
}
.loading-icon {
text-align: center
}
//TABS////////////////////////////////
.nav-tabs {
border: 1px none $gray-lighter;
......@@ -572,113 +512,6 @@ blockquote {
}
}
//THREADING////////////////////////////////
//Threaded discussion specific
.thread {
cursor: pointer;
position: relative;
& > * {
@include pie-clearfix;
}
& > ul {
padding-left: $thread-padding + .15em;
margin-left: -$thread-padding;
}
.load-more {
@include pie-clearfix;
font-family: $sans-font-family;
font-weight:bold;
font-size: .8em;
}
.thread {
border-left: 1px dotted $gray-light;
height: 100%;
padding: 0;
padding-left: $thread-padding;
&.collapsed {
& > .annotation {
fuzzytime {
float: none;
font-style: italic;
}
header {
display: inline-block;
}
.body {
display: none;
}
.magicontrol {
display: none;
}
.reply-count {
font-style: italic;
}
}
}
}
.threadexp {
font-size: 1.1em; // to match the username header
height: $threadexp-width;
width: $threadexp-width;
position: absolute;
// .7em is 50% of a line-height of 1.4;
top: .7em - ($threadexp-width / 2);
left: -($threadexp-width / 2);
outline: 1px solid #aaa;
@include icon("minus_1.png");
}
.annotation {
&.squished {
padding-left: 0;
}
}
&.collapsed {
display: block !important;
&:hover {
background-color: $gray-lightest;
}
& > ul {
max-height: 0;
overflow: hidden;
}
& > .annotation {
.body * {
overflow: hidden;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
white-space: nowrap;
margin-top: 0;
margin-bottom: 0;
}
.indicators {
display: run-in;
margin-right: .25em;
}
}
& > .threadexp {
background-image: url("../images/plus_1.png");
}
}
}
//MAGICONTROL////////////////////////////////
.magicontrol {
@include transition(opacity);
......@@ -778,7 +611,6 @@ pre {outline: 1px solid #ccc; padding: 5px; margin: 5px; }
float: left;
padding: .01em 1.3em .01em .3em;
position: relative;
opacity: .8;
margin-right: 0.4em;
&:hover { opacity: 1; }
......
h/static/styles/forms.scss
View file @ e26fdcba
......@@ -3,7 +3,7 @@
@import "compass/utilities/general/clearfix";
.form-field {
@include clearfix;
clear: both;
margin-bottom: 10px;
}
......@@ -74,18 +74,16 @@
font-weight: normal;
font-size: 15px;
color: $gray;
@include placeholder {
-webkit-font-smoothing: antialiased;
}
background-color: #FAFAFA;
&:focus, &.js-focus {
outline: none;
border-color: $focus-yellow-dark;
background-color: $focus-yellow;
background-color: #FFF;
border-color: #51A7E8;
box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.075) inset, 0px 0px 5px rgba(81, 167, 232, 0.5);
@include placeholder {
color: $focus-yellow-darker;
color: $gray;
}
}
}
......@@ -177,7 +175,6 @@
.form-actions {
@include pie-clearfix;
margin-top: 20px;
}
.form-actions-message {
......@@ -222,7 +219,7 @@
border: 1px solid #ACACAC;
padding: 7px 12px 6px;
&:focus, &:hover, &:active, &.js-hover, &.js-focus, &.js-active {
&:hover, &:active, &.js-hover, &.js-active {
@include box-shadow(0 1px 0 rgba(0, 0, 0, 0.05));
outline: none;
color: $button-text-color;
......@@ -230,6 +227,11 @@
border-color: #bababa;
}
&:focus, &.js-focus {
border-color: #51A7E8;
box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.075) inset, 0px 0px 5px rgba(81, 167, 232, 0.5);
}
&:active, &.js-active {
@include box-shadow(inset 0 1px 0 rgba(0, 0, 0, 0.1));
background: $button-background-end;
......
h/static/styles/simple-search.scss
View file @ e26fdcba
......@@ -22,7 +22,7 @@
line-height: 2;
margin-left: -100%;
position: relative;
right: 20 / 14 * 1em;
right: 19 / 14 * 1em;
:not(:focus) ~ & {
color: $gray-lighter;
......
h/static/styles/threads.scss 0 → 100644
View file @ e26fdcba
@import 'base';
$thread-padding: 1em;
$threadexp-width: .6em;
.thread {
cursor: pointer;
position: relative;
& > * {
@include pie-clearfix;
}
& > ul {
padding-left: $thread-padding + .15em;
margin-left: -$thread-padding;
}
.load-more {
@include pie-clearfix;
font-family: $sans-font-family;
font-weight:bold;
font-size: .8em;
}
.thread {
border-left: 1px dotted $gray-light;
height: 100%;
padding: 0;
padding-left: $thread-padding;
&.collapsed {
& > .annotation {
fuzzytime {
float: none;
font-style: italic;
}
header {
display: inline-block;
}
.body {
display: none;
}
.magicontrol {
display: none;
}
.reply-count {
font-style: italic;
}
}
}
}
.threadexp {
background: $white;
color: $gray-light;
position: absolute;
width: 1.4em;
height: 1.4em;
top: 0;
left: -.7em;
span {
position: absolute;
top: (1.4 - $threadexp-width) / 2;
left: (1.4 - $threadexp-width) / 2;
width: $threadexp-width;
height: $threadexp-width;
&:before {
font-size: $threadexp-width;
position: absolute;
top: 0;
left: 0;
}
}
}
.annotation {
&.squished {
padding-left: 0;
}
}
&.collapsed {
display: block !important;
&:hover {
background-color: $gray-lightest;
}
& > ul {
max-height: 0;
overflow: hidden;
}
& > .annotation {
.body * {
overflow: hidden;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
white-space: nowrap;
margin-top: 0;
margin-bottom: 0;
}
.indicators {
display: run-in;
margin-right: .25em;
}
}
& > .threadexp {
background-image: url("../images/plus_1.png");
}
}
}
\ No newline at end of file
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