Skip to content

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

Merge pull request #1038 from RawKStar77/MoreIconWork 

Changed icons to give them a consistent style.
parents 591ff08a 1085387b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 408 additions and 32 deletions
h/css/common.scss
View file @ 6ab0fcb3
...@@ -435,6 +435,10 @@ blockquote { ...@@ -435,6 +435,10 @@ blockquote {
@include fonticon("\35", left); @include fonticon("\35", left);
} }
.plus-icon {
@include fonticon("\e012", left);
}
.x-icon { .x-icon {
@include fonticon("\36", left); @include fonticon("\36", left);
} }
......
h/css/inject.scss
View file @ 6ab0fcb3
...@@ -314,7 +314,7 @@ $baseFontSize: 14px; ...@@ -314,7 +314,7 @@ $baseFontSize: 14px;
border: solid 1px $grayLighter; border: solid 1px $grayLighter;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
left: 2px; // left: 2px;
height: 2em; height: 2em;
width: 2em; width: 2em;
...@@ -334,7 +334,7 @@ $baseFontSize: 14px; ...@@ -334,7 +334,7 @@ $baseFontSize: 14px;
position: absolute; position: absolute;
left: .2em; left: .2em;
color: $grayLighter; color: rgba(200, 200, 200, .3);
text-decoration: none; text-decoration: none;
...@@ -352,13 +352,21 @@ $baseFontSize: 14px; ...@@ -352,13 +352,21 @@ $baseFontSize: 14px;
color: rgba(235, 235, 230, .1); color: rgba(235, 235, 230, .1);
} }
} }
&.alwaysonhighlights-icon, &.highlighter-icon, &.commenter-icon {
text-shadow:
1px .8px 1.5px $white,
0 0 0 #000;
&:hover {
color: $linkColorHover;
text-shadow: -1px .8px 1px #000;
}
}
} }
&.pushed, &:hover.pushed { &.pushed {
max-height: 35px; max-height: 35px;
a {
color: $hypothered;
}
} }
} }
...@@ -372,7 +380,7 @@ $baseFontSize: 14px; ...@@ -372,7 +380,7 @@ $baseFontSize: 14px;
} }
.commenter-icon { .commenter-icon {
@include fonticon("\e600", left); @include fonticon("\e012", left);
} }
.tri-icon { .tri-icon {
......
h/images/icomoon/demo-files/demo.css
View file @ 6ab0fcb3
...@@ -149,3 +149,6 @@ p { ...@@ -149,3 +149,6 @@ p {
.fs1 { .fs1 {
font-size: 32px; font-size: 32px;
} }
.fs2 {
font-size: 32px;
}
h/images/icomoon/demo.html
View file @ 6ab0fcb3
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<link rel="stylesheet" href="style.css"></head> <link rel="stylesheet" href="style.css"></head>
<body> <body>
<div class="bgc1 clearfix"> <div class="bgc1 clearfix">
<h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> h <small class="fgc1">(Glyphs:&nbsp;65)</small></h1> <h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> h <small class="fgc1">(Glyphs:&nbsp;74)</small></h1>
</div> </div>
<div class="clearfix mhl ptl"> <div class="clearfix mhl ptl">
<h1 class="mvm mtn bshadow fgc1">Grid Size: Unknown</h1> <h1 class="mvm mtn bshadow fgc1">Grid Size: Unknown</h1>
...@@ -821,7 +821,7 @@ ...@@ -821,7 +821,7 @@
</div> </div>
<div class="glyph fs1"> <div class="glyph fs1">
<div class="clearfix bshadow0 pbs"> <div class="clearfix bshadow0 pbs">
<span class="icon-comment"></span><span class="mls"> icon-comment</span> <span class="icon-comment3"></span><span class="mls"> icon-comment3</span>
</div> </div>
<fieldset class="fs0 size1of1 clearfix"> <fieldset class="fs0 size1of1 clearfix">
<input type="text" readonly value="e600" class="unit size1of2" /> <input type="text" readonly value="e600" class="unit size1of2" />
...@@ -834,7 +834,7 @@ ...@@ -834,7 +834,7 @@
</div> </div>
<div class="glyph fs1"> <div class="glyph fs1">
<div class="clearfix bshadow0 pbs"> <div class="clearfix bshadow0 pbs">
<span class="icon-highlighter"></span><span class="mls"> icon-highlighter</span> <span class="icon-highlighter2"></span><span class="mls"> icon-highlighter2</span>
</div> </div>
<fieldset class="fs0 size1of1 clearfix"> <fieldset class="fs0 size1of1 clearfix">
<input type="text" readonly value="e601" class="unit size1of2" /> <input type="text" readonly value="e601" class="unit size1of2" />
...@@ -858,6 +858,126 @@ ...@@ -858,6 +858,126 @@
<input type="text" readonly value="" class="liga unitRight" /> <input type="text" readonly value="" class="liga unitRight" />
</div> </div>
</div> </div>
<div class="glyph fs1">
<div class="clearfix bshadow0 pbs">
<span class="icon-icon-comment"></span><span class="mls"> icon-icon-comment</span>
</div>
<fieldset class="fs0 size1of1 clearfix">
<input type="text" readonly value="e60b" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe60b;" class="unitRight size1of2 talign-right" />
</fieldset>
<div class="fs0 bshadow0 clearfix noLiga-true">
<span class="unit pvs fgc1">liga: </span>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
</div>
<div class="clearfix mhl ptl">
<h1 class="mvm mtn bshadow fgc1">Grid Size: 16</h1>
<div class="glyph fs2">
<div class="clearfix bshadow0 pbs">
<span class="icon-users"></span><span class="mls"> icon-users</span>
</div>
<fieldset class="fs0 size1of1 clearfix">
<input type="text" readonly value="e603" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe603;" class="unitRight size1of2 talign-right" />
</fieldset>
<div class="fs0 bshadow0 clearfix noLiga-true">
<span class="unit pvs fgc1">liga: </span>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
<div class="glyph fs2">
<div class="clearfix bshadow0 pbs">
<span class="icon-user"></span><span class="mls"> icon-user</span>
</div>
<fieldset class="fs0 size1of1 clearfix">
<input type="text" readonly value="e604" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe604;" class="unitRight size1of2 talign-right" />
</fieldset>
<div class="fs0 bshadow0 clearfix noLiga-true">
<span class="unit pvs fgc1">liga: </span>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
<div class="glyph fs2">
<div class="clearfix bshadow0 pbs">
<span class="icon-bullhorn"></span><span class="mls"> icon-bullhorn</span>
</div>
<fieldset class="fs0 size1of1 clearfix">
<input type="text" readonly value="e605" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe605;" class="unitRight size1of2 talign-right" />
</fieldset>
<div class="fs0 bshadow0 clearfix noLiga-true">
<span class="unit pvs fgc1">liga: </span>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
<div class="glyph fs2">
<div class="clearfix bshadow0 pbs">
<span class="icon-bubbles"></span><span class="mls"> icon-bubbles</span>
</div>
<fieldset class="fs0 size1of1 clearfix">
<input type="text" readonly value="e606" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe606;" class="unitRight size1of2 talign-right" />
</fieldset>
<div class="fs0 bshadow0 clearfix noLiga-true">
<span class="unit pvs fgc1">liga: </span>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
<div class="glyph fs2">
<div class="clearfix bshadow0 pbs">
<span class="icon-bubbles2"></span><span class="mls"> icon-bubbles2</span>
</div>
<fieldset class="fs0 size1of1 clearfix">
<input type="text" readonly value="e607" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe607;" class="unitRight size1of2 talign-right" />
</fieldset>
<div class="fs0 bshadow0 clearfix noLiga-true">
<span class="unit pvs fgc1">liga: </span>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
<div class="glyph fs2">
<div class="clearfix bshadow0 pbs">
<span class="icon-bell"></span><span class="mls"> icon-bell</span>
</div>
<fieldset class="fs0 size1of1 clearfix">
<input type="text" readonly value="e608" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe608;" class="unitRight size1of2 talign-right" />
</fieldset>
<div class="fs0 bshadow0 clearfix noLiga-true">
<span class="unit pvs fgc1">liga: </span>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
<div class="glyph fs2">
<div class="clearfix bshadow0 pbs">
<span class="icon-earth"></span><span class="mls"> icon-earth</span>
</div>
<fieldset class="fs0 size1of1 clearfix">
<input type="text" readonly value="e609" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe609;" class="unitRight size1of2 talign-right" />
</fieldset>
<div class="fs0 bshadow0 clearfix noLiga-true">
<span class="unit pvs fgc1">liga: </span>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
<div class="glyph fs2">
<div class="clearfix bshadow0 pbs">
<span class="icon-link"></span><span class="mls"> icon-link</span>
</div>
<fieldset class="fs0 size1of1 clearfix">
<input type="text" readonly value="e60a" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe60a;" class="unitRight size1of2 talign-right" />
</fieldset>
<div class="fs0 bshadow0 clearfix noLiga-true">
<span class="unit pvs fgc1">liga: </span>
<input type="text" readonly value="" class="liga unitRight" />
</div>
</div>
</div> </div>
<!--[if gt IE 8]><!--> <!--[if gt IE 8]><!-->
...@@ -869,7 +989,7 @@ ...@@ -869,7 +989,7 @@
px px
</label> </label>
<input id="testText" type="text" class="phl size1of1 mvl" <input id="testText" type="text" class="phl size1of1 mvl"
placeholder="Type some text to test..."/> placeholder="Type some text to test..." value=""/>
</label> </label>
<div id="testDrive" class="icon-">&nbsp; <div id="testDrive" class="icon-">&nbsp;
</div> </div>
......
h/images/icomoon/fonts/h.svg
View file @ 6ab0fcb3
This diff is collapsed.
h/images/icomoon/selection.json
View file @ 6ab0fcb3
This diff is collapsed.
h/images/icomoon/style.css
View file @ 6ab0fcb3
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
font-family: 'h'; font-family: 'h';
src:url('fonts/h.eot'); src:url('fonts/h.eot');
src:url('fonts/h.eot?#iefix') format('embedded-opentype'), src:url('fonts/h.eot?#iefix') format('embedded-opentype'),
url('fonts/h.ttf') format('truetype'),
url('fonts/h.woff') format('woff'), url('fonts/h.woff') format('woff'),
url('fonts/h.ttf') format('truetype'),
url('fonts/h.svg#h') format('svg'); url('fonts/h.svg#h') format('svg');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
...@@ -209,12 +209,39 @@ ...@@ -209,12 +209,39 @@
.icon-uniF000:before { .icon-uniF000:before {
content: "\f000"; content: "\f000";
} }
.icon-comment:before { .icon-comment3:before {
content: "\e600"; content: "\e600";
} }
.icon-highlighter:before { .icon-highlighter2:before {
content: "\e601"; content: "\e601";
} }
.icon-visible:before { .icon-visible:before {
content: "\e602"; content: "\e602";
} }
.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";
}
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