Skip to content

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

Merge pull request #1071 from RawKStar77/CSStweaks 

Fixed responsiveness on streams, converted search related icons to SVG, eliminated space above topbar
parents 16ca3d6b 11f35c6e
Show whitespace changes
Inline Side-by-side
Showing with 73 additions and 90 deletions
h/css/common.scss
View file @ 9a9690ff
......@@ -459,19 +459,6 @@ blockquote {
@include fonticon("\2a", left);
}
.cancel-icon {
position: relative;
top: 2px;
width: 11px; height: 11px;
background-position: center 0;
background-repeat: no-repeat;
background-image: url(../images/embed/icons/cancel_search.png?1311104738);
cursor: pointer;
&:hover {
background-position: center -11px;
}
}
.loading-icon {
text-align: center
}
......@@ -589,7 +576,6 @@ blockquote {
position: fixed;
left: 0;
right: 0;
top: 8px;
z-index: 5;
.barbutton {
......@@ -627,7 +613,7 @@ blockquote {
.content {
margin: 0 auto;
padding: 16px;
padding-top: 44px;
padding-top: 36px;
.domain {
margin: 3px 0 4px;
......@@ -1247,6 +1233,32 @@ h3.stream {
}
}
.VS-search .VS-icon {
background-repeat: no-repeat;
background-position: center center;
vertical-align: middle;
width: 16px; height: 16px;
}
.VS-search .VS-icon-cancel {
width: 11px; height: 11px;
background-position: center 0;
background-image: url(../images/svg/cancel.svg);
background-size: contain;
cursor: pointer;
}
.VS-search .VS-icon-cancel:hover {
background-image: url(../images/svg/cancel_black.svg);
}
.VS-search .VS-icon-search {
width: 12px;
height: 12px;
background-image: url(../images/svg/search.svg);
background-size: contain;
}
.thread {
.load-more {
@include pie-clearfix;
......@@ -1264,7 +1276,7 @@ h3.stream {
.magnify-glass .VS-icon-search:hover {
width:12px;
height:12px;
background-image:url(../images/embed/icons/search_glyph_dark.png);
background-image: url(../images/svg/search_dark.svg);
cursor: pointer;
}
......
h/css/inject.scss
View file @ 9a9690ff
......@@ -102,7 +102,7 @@ $baseFontSize: 14px;
.svg {
width: 100%;
height: 100%;
background-image: url("../images/side_tab.svg");
background-image: url("../images/svg/side_tab.svg");
background-position: center center;
background-repeat: no-repeat;
background-size: 100% 100%;
......@@ -146,10 +146,10 @@ $baseFontSize: 14px;
}
&.upper {
margin-top: -18px;
margin-top: -26px;
.svg {
background-image: url("../images/up_tab.svg");
background-image: url("../images/svg/up_tab.svg");
}
.label {
......@@ -165,7 +165,7 @@ $baseFontSize: 14px;
margin-top: -20px;
.svg {
background-image: url("../images/down_tab.svg");
background-image: url("../images/svg/down_tab.svg");
}
.label {
......@@ -190,7 +190,7 @@ $baseFontSize: 14px;
margin-top: -18px;
.svg {
background-image: url("../images/comment_tab.svg");
background-image: url("../images/svg/comment_tab.svg");
}
&:hover {
......@@ -275,7 +275,6 @@ $baseFontSize: 14px;
overflow: hidden;
height: 200px;
left: -($heatmap-width + 18px - 7px);
top: 8px;
right: 0;
z-index: 2;
......
h/css/site.scss
View file @ 9a9690ff
......@@ -63,12 +63,10 @@ ol {
}
.content {
@include respond-to(handhelds) {
padding: 3em 1em;
}
padding: 2.5em 1em;
@include respond-to(tablets) {
padding: 4em;
padding: 2.5em 4em 4em 4em;
margin: auto;
max-width: $break-large;
}
......@@ -79,12 +77,17 @@ ol {
.inner {
margin: 0 auto;
max-width: $break-large;
padding-left: 3.6em;
padding-right: 3.6em;
@include respond-to(tablets) {
padding-left: 3.6em;
padding-right: 3.6em;
margin: 0 auto;
max-width: $break-large;
}
@include respond-to(wide-handhelds handhelds) {
padding: 0 8px;
padding-left: 0.9em;
padding-right: 0.9em;
margin: 0 auto;
max-width: $break-large;
}
......
h/images/down_1.svg deleted 100644 → 0
View file @ 16ca3d6b
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1" baseProfile="basic"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="78px" height="115px" viewBox="-0.125 -14.75 78 115" style="enable-background:new -0.125 -14.75 78 115;"
xml:space="preserve">
<style type="text/css">
<![CDATA[
.st0{fill:#d11c2b;}
.st3{fill:#0070ba;}
.st4{fill:#3aab39;}
]]>
</style>
<defs>
</defs>
<polygon class="st0" points="78,70 39,100.083 0,70 "/>
<rect x="15.875" class="st0" width="46" height="15"/>
</svg>
h/images/neutral_1.svg deleted 100644 → 0
View file @ 16ca3d6b
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1" baseProfile="basic"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="78px" height="115px" viewBox="-16 -15 78 115" style="enable-background:new -16 -15 78 115;"
xml:space="preserve">
<style type="text/css">
<![CDATA[
.st0{fill:#d11c2b;}
.st3{fill:#0070ba;}
.st4{fill:#3aab39;}
]]>
</style>
<defs>
</defs>
<rect y="70" class="st3" width="46" height="15"/>
<rect class="st3" width="46" height="15"/>
</svg>
h/images/svg/cancel.svg 0 → 100755
View file @ 9a9690ff
<?xml version="1.0" encoding="utf-8"?>
<!-- Generated by IcoMoon.io -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32">
<g>
</g>
<path d="M19.587 16.001l6.096 6.096c0.396 0.396 0.396 1.039 0 1.435l-2.151 2.151c-0.396 0.396-1.038 0.396-1.435 0l-6.097-6.096-6.097 6.096c-0.396 0.396-1.038 0.396-1.434 0l-2.152-2.151c-0.396-0.396-0.396-1.038 0-1.435l6.097-6.096-6.097-6.097c-0.396-0.396-0.396-1.039 0-1.435l2.153-2.151c0.396-0.396 1.038-0.396 1.434 0l6.096 6.097 6.097-6.097c0.396-0.396 1.038-0.396 1.435 0l2.151 2.152c0.396 0.396 0.396 1.038 0 1.435l-6.096 6.096z" fill="#858585" />
</svg>
h/images/svg/cancel_black.svg 0 → 100755
View file @ 9a9690ff
<?xml version="1.0" encoding="utf-8"?>
<!-- Generated by IcoMoon.io -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32">
<g>
</g>
<path d="M19.587 16.001l6.096 6.096c0.396 0.396 0.396 1.039 0 1.435l-2.151 2.151c-0.396 0.396-1.038 0.396-1.435 0l-6.097-6.096-6.097 6.096c-0.396 0.396-1.038 0.396-1.434 0l-2.152-2.151c-0.396-0.396-0.396-1.038 0-1.435l6.097-6.096-6.097-6.097c-0.396-0.396-0.396-1.039 0-1.435l2.153-2.151c0.396-0.396 1.038-0.396 1.434 0l6.096 6.097 6.097-6.097c0.396-0.396 1.038-0.396 1.435 0l2.151 2.152c0.396 0.396 0.396 1.038 0 1.435l-6.096 6.096z" fill="#000000" />
</svg>
h/images/svg/search.svg 0 → 100755
View file @ 9a9690ff
<?xml version="1.0" encoding="utf-8"?>
<!-- Generated by IcoMoon.io -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32">
<g>
</g>
<path d="M31.008 27.231l-7.58-6.447c-0.784-0.705-1.622-1.029-2.299-0.998 1.789-2.096 2.87-4.815 2.87-7.787 0-6.627-5.373-12-12-12-6.627 0-12 5.373-12 12 0 6.627 5.373 12 12 12 2.972 0 5.691-1.081 7.787-2.87-0.031 0.677 0.293 1.515 0.998 2.299l6.447 7.58c1.104 1.226 2.907 1.33 4.007 0.23s0.997-2.903-0.23-4.007zM12 20c-4.418 0-8-3.582-8-8s3.582-8 8-8 8 3.582 8 8-3.582 8-8 8z" fill="#858585" />
</svg>
h/images/svg/search_dark.svg 0 → 100755
View file @ 9a9690ff
<?xml version="1.0" encoding="utf-8"?>
<!-- Generated by IcoMoon.io -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32">
<g>
</g>
<path d="M31.008 27.231l-7.58-6.447c-0.784-0.705-1.622-1.029-2.299-0.998 1.789-2.096 2.87-4.815 2.87-7.787 0-6.627-5.373-12-12-12-6.627 0-12 5.373-12 12 0 6.627 5.373 12 12 12 2.972 0 5.691-1.081 7.787-2.87-0.031 0.677 0.293 1.515 0.998 2.299l6.447 7.58c1.104 1.226 2.907 1.33 4.007 0.23s0.997-2.903-0.23-4.007zM12 20c-4.418 0-8-3.582-8-8s3.582-8 8-8 8 3.582 8 8-3.582 8-8 8z" fill="#4f4f4f" />
</svg>
h/images/up_1.svg deleted 100644 → 0
View file @ 16ca3d6b
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1" baseProfile="basic"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="78px" height="115px" viewBox="0.209 0 78 115" style="enable-background:new 0.209 0 78 115;"
xml:space="preserve">
<style type="text/css">
<![CDATA[
.st0{fill:#d11c2b;}
.st3{fill:#0070ba;}
.st4{fill:#3aab39;}
]]>
</style>
<defs>
</defs>
<polygon class="st4" points="78,29.75 39,0 0,29.75 "/>
<rect x="16.209" y="84.75" class="st4" width="46" height="15"/>
</svg>
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