Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Working on new layout, still need to tweak padding/margins and correc…

…t some wierdness in the tags.
  • Loading branch information...
commit 8a0197d076164dfd2cf2e150934a54cc548437f8 1 parent d64a241
@jtremback authored
View
4 snapshotter
@@ -0,0 +1,4 @@
+#!/bin/bash
+# My first script
+
+echo "Hello World!"
View
2  source/_annotation-detail.haml
@@ -31,8 +31,6 @@
From my reading, it explicitly includes intellectual property as a cybersecurity issue unto itself. (I have no idea why this would be justified.)
.annotator-component.annotator-tags
%span.annotator-tag Government Overreach
- .annotator-score
- .annotator-label 3
%form.annotator-component.annotator-writer
.fake_fieldset
View
3  source/_cispa.haml
@@ -0,0 +1,3 @@
+#source
+ = partial "cispa.erb"
+ = partial "heatmap.haml"
View
3  source/_heatmap.haml
@@ -0,0 +1,3 @@
+.annotator-heatmap
+ .annotator-heatmap_tab
+ 13
View
29 source/_reply-1.haml
@@ -1,21 +1,20 @@
-%li.annotator-widget.annotator-reply
+%li.annotator-widget.annotator-reply.var3
- .annotator-component.annotator-meta
- .annotator-updown
- .annotator-up
- .annotator-container
- .annotator-user IWantSpaceships
- .annotator-time posted 5 days ago
- .annotator-controls
- %button.annotator-write Reply
- %button.annotator-fave Favorite
- %button.annotator-flag Flag
-
- %article.annotator-component.annotator-content
+ .annotator-score
+ .annotator-up
+ .annotator-label 0.5b
+ %article.annotator-content
%p
That's not what I see when I read it. It doesn't state that intellectual property as a cybersecurity issue unto itself, only "protection of a system or network" from theft or misappropriation of that property. The bill does not expand an entity's power to control the distribution of that property after its theft/misappropriation from its network.
- .annotator-component.annotator-tags
- %span.annotator-tag Factually Incorrect
+ %ul.annotator-listing.annotator-replies
+ .annotator-meta.var1
+ .annotator-tags.var1
+ %span.annotator-tag Factually Incorrect
+ %span.annotator-tag Factually Incorrect
+ %span.annotator-tag Factually Incorrect
+ .annotator-container
+ .annotator-user - IWantSpaceships
+ .annotator-time posted 5 days ago
%ul.annotator-listing.annotator-replies
= partial "reply-2.haml"
= partial "reply-5.haml"
View
27 source/_reply-5.haml
@@ -0,0 +1,27 @@
+%li.annotator-widget.annotator-reply
+
+ .annotator-component.annotator-meta
+ .annotator-updown
+ .annotator-up
+ .annotator-container
+ .annotator-user mary367
+ .annotator-time posted 5 days ago
+ .annotator-controls
+ %button.annotator-write Reply
+ %button.annotator-fave Favorite
+ %button.annotator-flag Flag
+
+ %article.annotator-component.annotator-content
+ %p
+ Hello there, simply turned into aware of your blog thru Google, and found that it is really informative. I?m gonna watch out for brussels. I will appreciate if you continue this in future. A lot of other folks will be benefited from your writing. Cheers!
+ %p
+ Welcome you come here,come our uggs outlet stores .ugg outlet stores is the best stores of ugg boots outlet,offer all kinds of cheap ugg sale,
+ %p
+ Ugg outlet store sales various of discount uggs products,including boots, sandals, slipper, welcome to ugg outlet store to buy high quality products.
+ .annotator-component.annotator-tags
+ %span.annotator-tag uggsunlimit.br
+
+ %form.annotator-component.annotator-flagger
+ .fake_fieldset
+ Please flag only annotations which are clearly spam, or against hypothes.is terms of service.
+ %button Flag Annotation
View
4 source/_summaries.haml
@@ -3,7 +3,7 @@
.annotator-score
.annotator-label 47
.annotator-container
- .annotator-user trevorEFF
+ .annotator-user bo1024
.annotator-time posted 4 days ago
%span.annotator-tag Factually Incorrect
%article.annotator-component.annotator-content
@@ -14,7 +14,7 @@
.annotator-score
.annotator-label 45
.annotator-container
- .annotator-user trevorEFF
+ .annotator-user retrvor
.annotator-time posted 5 days ago
%span.annotator-tag Facebook
%span.annotator-tag Privacy
View
124 source/stylesheets/site.css.sass
@@ -4,7 +4,7 @@
//SOURCE VIEWPORT
#source
- margin-right: 500px
+ margin-right: 400px
overflow: auto
position: relative
@@ -72,7 +72,7 @@ $med-red: #c12c3b
text-align: left
@mixin primarytext
- color: $o-gray_w
+ color: #666
@mixin secondarytext
color: $q-gray_w
font-size: .8em
@@ -122,7 +122,7 @@ $med-red: #c12c3b
+smallshadow
background: $base-gray
&:hover
- background: $desat_major
+ background: #eee
&:active
box-shadow: none
@@ -206,7 +206,7 @@ $iconset: iconset_wireframe
padding:
bottom: 1em
overflow: auto
- width: 510px
+ width: 410px
+bigshadow
border-left: 1px dotted hsla($warm-hue, 5%, 60%, 1)
@@ -220,11 +220,14 @@ $iconset: iconset_wireframe
+tagtext
padding: .1em .5em
padding-bottom: .25em
+ &.var1
+ padding: 0
-.annotator-content
- &p:last-child
- margin-bottom: 0
-
+//.annotator-content
+// &p:first-child
+// margin-top: 0
+// &p:last-child
+// margin-bottom: 0
.annotator-user
+redtitletext
@@ -251,41 +254,52 @@ $iconset: iconset_wireframe
font-family: sans-serif
font-size: 1em
border: 1px dotted #999
- border-right: 1px solid white
-
+ border-right: none
//SCORE
//This is for the score indicator part
.annotator-score
- &div:first-child
- margin:
- bottom: .25em
+ font-size: 1.3em
text-align: center
+ +box-shadow(2px 2px 8px #666 inset)
+ border-radius: .5em
+ float: left
+ display: inline-block
+ padding: 0 .5em
+ margin:
+ right: .5em
+ bottom: .25em
.annotator-up
- +icon(up_3)
+ +icon(up_1)
opacity: .5
padding: 0
width: 2em
height: 1.5em
margin:
- bottom: .25em
+ top: .5em
left: auto
right: auto
.annotator-down
- +icon(down_3)
+ +icon(down_1)
opacity: .5
padding: 0
width: 2em
height: 1.5em
margin:
- bottom: .25em
+ bottom: .5em
left: auto
right: auto
.annotator-label
- font-size: 16px
font-weight: bold
margin: 0
+ padding: .25em 0
+primarytext
+ &.annotator-selected
+ border:
+ top: .5em solid #666
+ bottom: .5em solid #666
+
+
//ANNOTATOR UPDOWN
//This holds up and down arrows above each other (refactor)
@@ -334,6 +348,7 @@ $iconset: iconset_wireframe
margin-left: 1em
margin-top: 1.5em
+
.annotator-annotation_summary
+threadbox
+basebox
@@ -353,19 +368,11 @@ $iconset: iconset_wireframe
margin-right: .5em
margin-top: .2em
-.annotator-tags
- .annotator-score
- float: right
- font-size: 1.8em
- margin-top: -.7em
-//ANNOTATOR COMPONENTS
-.annotator-component
- &:first-child
- padding-top: .5em
-//This applies to the editor.
+//This applies to the editors (writer, faver, and flagger)
+
@mixin editorpresets
button
margin: 1em
@@ -485,30 +492,45 @@ $iconset: iconset_wireframe
.annotator-meta
+clearfix
background: $desat-minor
- div
- vertical-align: middle
- .annotator-updown
- float: left
- display: inline-block
- clear: none
- margin-right: 1em
- margin-top: .5em
- div
- opacity: .8
- .annotator-container
- float: left
- clear: none
- .annotator-controls
- float: right
- vertical-align: top
- button
- margin-right: 1em
- &button:last-child
- margin-right: 0
-//This applies to the spot for tags.
-.annotator-tags
- margin-bottom: .25em
+ &.var1
+ padding: .25em
+ .annotator-tags
+ float: left
+ width: 60%
+ white-space: nowrap
+ text-overflow: ellipsis
+ overflow: hidden
+ margin:
+ top: .5em
+ bottom: .5em
+ .annotator-tag
+ padding: .25em
+ .annotator-container
+ text-align: right
+ float: right
+
+// div
+// vertical-align: middle
+// .annotator-updown
+// float: left
+// display: inline-block
+// clear: none
+// margin-right: 1em
+// margin-top: .5em
+// div
+// opacity: .8
+// .annotator-container
+// float: left
+// clear: none
+// .annotator-controls
+// float: right
+// vertical-align: top
+// button
+// margin-right: 1em
+// &button:last-child
+// margin-right: 0
+
//This applies to the excerpt of the source material, and possibly other excerpts.
.annotator-excerpt
View
1,696 workspace/annobox_mocks.svg
1,696 additions, 0 deletions not shown
Please sign in to comment.
Something went wrong with that request. Please try again.