Permalink
Browse files

Circuit graphs restyle.

  • Loading branch information...
1 parent aee54ab commit bffa12d3e149992dd3ab22027c784d3a626058e2 @FelixAkk committed Jun 20, 2012
@@ -0,0 +1 @@
+{"name":"","description":"","gates":[{"kind":"and","position":{"x":475,"y":81}},{"kind":"and","position":{"x":478,"y":240}},{"kind":"not","position":{"x":731,"y":18}},{"kind":"not","position":{"x":749,"y":324}},{"kind":"and","position":{"x":965,"y":153}},{"kind":"not","position":{"x":1187,"y":77}}],"signals":[{"protein":"A","from":0,"to":2,"fromEndpoint":0,"toEndpoint":0},{"protein":"M","from":1,"to":3,"fromEndpoint":0,"toEndpoint":0},{"protein":"H","from":3,"to":0,"fromEndpoint":0,"toEndpoint":1},{"protein":"F","from":2,"to":1,"fromEndpoint":0,"toEndpoint":0},{"protein":"E","from":4,"to":5,"fromEndpoint":0,"toEndpoint":0},{"protein":"D","from":5,"to":"output","fromEndpoint":0,"toEndpoint":0},{"protein":"F","from":2,"to":4,"fromEndpoint":0,"toEndpoint":0},{"protein":"H","from":3,"to":4,"fromEndpoint":0,"toEndpoint":1},{"protein":"G","from":"input","to":0,"fromEndpoint":0,"toEndpoint":0},{"protein":"C","from":"input","to":1,"fromEndpoint":1,"toEndpoint":1}],"groups":[],"inputs":{"length":"40","tickWidth":"10","lowLevel":"0","highLevel":"200","values":{"G":"LLLLLLHHHHHHHLLLLLLLLLLHHHHLLLLLLLLLLLLL","C":"HHHHHHHHHHHHHHHHHHLLLLLLLHHHHHHHLLLLLLLL"}},"gateOutputPos":{"x":1308,"y":230},"gateInputPos":{"x":153,"y":114}}
View
@@ -38,7 +38,7 @@
@grStop: darken(@baseColor, @contrast * 20%);
-@titleWidth: 180px;
+@titleWidth: 200px;
@tabWidth: @titleWidth + (@iconSize * 0.5)*2 + @iconSize;
@@ -428,24 +428,20 @@ body {
width: auto;
height: auto;
- .mask {
- width: @gatesWidth;
- height: @gatesHeight;
- position: absolute;
- /**
- * This is so that the mask position corresponds with the internal padding of gates and fully covers the SVG.
- */
- left: @gatesPadding;
- top: @gatesPadding;
- }
-
img {
float: left;
}
p {
margin: 0px;
}
+
+ &.compound {
+ text-align: center;
+ img {
+ float: none;
+ }
+ }
}
#grid-container {
View
@@ -1,134 +1,52 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="100"
- height="50"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.46"
- version="1.0"
- sodipodi:docname="AND ANSI.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs4">
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 15 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="50 : 15 : 1"
- inkscape:persp3d-origin="25 : 10 : 1"
- id="perspective2714" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 0.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="1 : 0.5 : 1"
- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
- id="perspective2806" />
- <inkscape:perspective
- id="perspective2819"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective2777"
- inkscape:persp3d-origin="75 : 40 : 1"
- inkscape:vp_z="150 : 60 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 60 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective3275"
- inkscape:persp3d-origin="50 : 33.333333 : 1"
- inkscape:vp_z="100 : 50 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 50 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective5533"
- inkscape:persp3d-origin="32 : 21.333333 : 1"
- inkscape:vp_z="64 : 32 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 32 : 1"
- sodipodi:type="inkscape:persp3d" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="8"
- inkscape:cx="56.698348"
- inkscape:cy="25.326899"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:grid-bbox="true"
- inkscape:grid-points="true"
- gridtolerance="10000"
- inkscape:window-width="1399"
- inkscape:window-height="874"
- inkscape:window-x="33"
- inkscape:window-y="0"
- inkscape:snap-bbox="true">
- <inkscape:grid
- id="GridFromPre046Settings"
- type="xygrid"
- originx="0px"
- originy="0px"
- spacingx="1px"
- spacingy="1px"
- color="#0000ff"
- empcolor="#0000ff"
- opacity="0.2"
- empopacity="0.4"
- empspacing="5"
- visible="true"
- enabled="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <path
- style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 70,25 c 20,0 25,0 25,0"
- id="path3059"
- sodipodi:nodetypes="cc" />
- <path
- style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 31,15 5,15"
- id="path3061" />
- <path
- style="fill:none;stroke:#000000;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 32,35 5,35"
- id="path3944" />
- <path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
- d="M 30,5 L 30,6.4285714 L 30,43.571429 L 30,45 L 31.428571,45 L 50.47619,45 C 61.744098,45 70.47619,35.999955 70.47619,25 C 70.47619,14.000045 61.744099,5.0000002 50.47619,5 C 50.47619,5 50.47619,5 31.428571,5 L 30,5 z M 32.857143,7.8571429 C 40.834264,7.8571429 45.918368,7.8571429 48.095238,7.8571429 C 49.285714,7.8571429 49.880952,7.8571429 50.178571,7.8571429 C 50.327381,7.8571429 50.409227,7.8571429 50.446429,7.8571429 C 50.465029,7.8571429 50.471543,7.8571429 50.47619,7.8571429 C 60.236853,7.857143 67.142857,15.497098 67.142857,25 C 67.142857,34.502902 59.760662,42.142857 50,42.142857 L 32.857143,42.142857 L 32.857143,7.8571429 z"
- id="path2884"
- sodipodi:nodetypes="ccccccsccccsssssccc" />
- </g>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1"
+ id="svg2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:version="0.32" inkscape:version="0.46" sodipodi:docname="AND ANSI.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="100px" height="50px"
+ viewBox="0 0 100 50" enable-background="new 0 0 100 50" xml:space="preserve">
+<defs>
+
+
+ <inkscape:perspective id="perspective2714" inkscape:vp_z="50 : 15 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 15 : 1" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="25 : 10 : 1">
+ </inkscape:perspective>
+
+ <inkscape:perspective id="perspective2806" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1">
+ </inkscape:perspective>
+
+ <inkscape:perspective id="perspective2819" inkscape:vp_z="744.09448 : 526.18109 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 526.18109 : 1" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="372.04724 : 350.78739 : 1">
+ </inkscape:perspective>
+
+ <inkscape:perspective id="perspective2777" inkscape:vp_z="150 : 60 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 60 : 1" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="75 : 40 : 1">
+ </inkscape:perspective>
+
+ <inkscape:perspective id="perspective3275" inkscape:vp_z="100 : 50 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 50 : 1" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="50 : 33.333333 : 1">
+ </inkscape:perspective>
+
+ <inkscape:perspective id="perspective5533" inkscape:vp_z="64 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 32 : 1" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="32 : 21.333333 : 1">
+ </inkscape:perspective>
+</defs>
+<sodipodi:namedview id="base" gridtolerance="10000" showgrid="true" inkscape:cy="25.326899" inkscape:cx="56.698348" inkscape:zoom="8" borderopacity="1.0" bordercolor="#666666" pagecolor="#ffffff" inkscape:snap-bbox="true" inkscape:window-y="0" inkscape:window-x="33" inkscape:window-height="874" inkscape:window-width="1399" inkscape:grid-points="true" inkscape:grid-bbox="true" inkscape:current-layer="layer1" inkscape:document-units="px" inkscape:pageshadow="2" inkscape:pageopacity="0.0">
+
+ <inkscape:grid color="#0000ff" type="xygrid" visible="true" originx="0px" enabled="true" opacity="0.2" originy="0px" id="GridFromPre046Settings" empspacing="5" empopacity="0.4" empcolor="#0000ff" spacingy="1px" spacingx="1px">
+ </inkscape:grid>
+</sodipodi:namedview>
+<g>
+ <path id="path3061_8_" fill="none" stroke="#000000" stroke-width="2" d="M100,22.5H69"/>
+ <path id="path3061_7_" fill="none" stroke="#000000" stroke-width="2" d="M100,27.5H69"/>
+ <path id="path3061_6_" fill="none" stroke="#FFFFFF" stroke-width="3" d="M100,25H69"/>
+</g>
+<path d="M30,5v1.429v37.143V45h1.429h19.047c11.268,0,20-9,20-20s-8.732-20-20-20c0,0,0,0-19.047,0H30z"/>
+<path fill="#FFFFFF" d="M32.857,7.857c7.978,0,13.062,0,15.238,0c1.19,0,1.786,0,2.083,0c0.148,0,0.23,0,0.268,0
+ c0.019,0,0.025,0,0.03,0c9.76,0,16.667,7.64,16.667,17.143S59.761,42.143,50,42.143H32.857V7.857z"/>
+<g>
+ <path id="path3061_3_" fill="none" stroke="#000000" stroke-width="2" d="M30,12.5H0"/>
+ <path id="path3061_2_" fill="none" stroke="#000000" stroke-width="2" d="M30,17.5H0"/>
+ <path id="path3061_1_" fill="none" stroke="#FFFFFF" stroke-width="3" d="M30,15H0"/>
+</g>
+<g>
+ <path id="path3061_9_" fill="none" stroke="#000000" stroke-width="2" d="M30,32.5H0"/>
+ <path id="path3061_5_" fill="none" stroke="#000000" stroke-width="2" d="M30,37.5H0"/>
+ <path id="path3061_4_" fill="none" stroke="#FFFFFF" stroke-width="3" d="M30,35H0"/>
+</g>
</svg>
@@ -1,14 +1,51 @@
-<?xml version="1.0"?>
-<svg width="100" height="50" xmlns="http://www.w3.org/2000/svg">
- <metadata id="metadata7">image/svg+xml</metadata>
- <g>
- <title>Layer 1</title>
- <g id="layer1">
- <path d="m70,25c20,0 25,0 25,0" id="path3059" stroke-width="2" stroke="#000000" fill="none"/>
- <path d="m31,15l-26,0" id="path3061" stroke-width="2" stroke="#000000" fill="none"/>
- <path d="m32,35l-27,0" id="path3944" stroke-width="2" stroke="#000000" fill="none"/>
- </g>
- <rect fill="none" stroke="#000000" stroke-width="2" x="31.5" y="8" width="38" height="34.000001" id="svg_1"/>
- <text xml:space="preserve" text-anchor="middle" font-family="serif" font-size="18" id="svg_2" y="31" x="51" stroke-width="0" stroke="#000000" fill="#000000">C</text>
- </g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="100px" height="50px" viewBox="0 0 100 50" enable-background="new 0 0 100 50" xml:space="preserve">
+<g>
+ <path id="path3061_18_" fill="none" stroke="#000000" stroke-width="2" d="M89.5,22.5h-15"/>
+ <path id="path3061_17_" fill="none" stroke="#000000" stroke-width="2" d="M89.5,27.5h-15"/>
+ <path id="path3061_16_" fill="none" stroke="#FFFFFF" stroke-width="3" d="M89.5,25h-15"/>
+ <path id="path3061_15_" fill="none" stroke="#000000" stroke-width="2" d="M89.5,11.5h-15"/>
+ <path id="path3061_14_" fill="none" stroke="#000000" stroke-width="2" d="M89.5,16.5h-15"/>
+ <path id="path3061_13_" fill="none" stroke="#FFFFFF" stroke-width="3" d="M89.5,14h-15"/>
+ <path id="path3061_12_" fill="none" stroke="#000000" stroke-width="2" d="M89.5,33.5h-15"/>
+ <path id="path3061_2_" fill="none" stroke="#000000" stroke-width="2" d="M89.5,38.5h-15"/>
+ <path id="path3061_1_" fill="none" stroke="#FFFFFF" stroke-width="3" d="M89.5,36h-15"/>
+</g>
+<rect x="29.5" y="6.5" fill="#FFFFFF" width="42" height="37"/>
+<title>Layer 1</title>
+<rect id="svg_1" x="28" y="5" fill="none" stroke="#000000" stroke-width="3" width="45" height="40"/>
+<g>
+ <g>
+ <path d="M52.743,24.663c0,1.492-1.21,2.702-2.702,2.702s-2.702-1.21-2.702-2.702s1.21-2.702,2.702-2.702
+ S52.743,23.171,52.743,24.663z M50.041,23.579c-0.598,0-1.083,0.486-1.083,1.084c0,0.599,0.485,1.083,1.083,1.083
+ c0.6,0,1.083-0.484,1.083-1.083C51.125,24.065,50.641,23.579,50.041,23.579z"/>
+ <path d="M38.5,21.961c0-5.196,4.173-7.05,8.061-7.05c5.065,0,11.873,3.173,11.873,9.651c0,4.678-3.791,8.468-8.468,8.468
+ C44.849,33.03,38.5,28.036,38.5,21.961z M49.967,30.046c3.057,0,5.536-2.426,5.536-5.481c0-3.66-3.894-6.676-9.315-6.676
+ c-2.068,0-4.708,1.158-4.708,4.072C41.479,26.04,46.383,30.046,49.967,30.046z"/>
+ <path d="M59.911,16.637c0.116,0.121,0.11,0.313-0.011,0.43l-2.668,2.551c-0.121,0.115-0.313,0.111-0.428-0.01l-1.603-1.677
+ c-0.115-0.121-0.111-0.313,0.01-0.43l2.668-2.55c0.121-0.116,0.313-0.111,0.429,0.01L59.911,16.637z"/>
+ <path d="M62.531,22.439c0.042,0.162-0.055,0.327-0.217,0.369l-3.573,0.927c-0.162,0.042-0.328-0.056-0.37-0.218l-0.582-2.243
+ c-0.042-0.162,0.055-0.328,0.217-0.369l3.573-0.928c0.162-0.043,0.328,0.057,0.371,0.219L62.531,22.439z"/>
+ <path d="M61.756,29.414c-0.047,0.161-0.215,0.254-0.376,0.206l-3.543-1.034c-0.161-0.047-0.253-0.216-0.207-0.376l0.649-2.226
+ c0.048-0.16,0.216-0.253,0.377-0.206l3.543,1.034c0.16,0.047,0.253,0.216,0.207,0.376L61.756,29.414z"/>
+ <path d="M57.969,34.479c-0.119,0.116-0.312,0.113-0.429-0.006l-2.573-2.646c-0.117-0.12-0.113-0.313,0.006-0.429l1.662-1.616
+ c0.12-0.117,0.313-0.114,0.43,0.006l2.572,2.646c0.117,0.12,0.114,0.313-0.006,0.43L57.969,34.479z"/>
+ <path d="M52.038,37.122c-0.162,0.043-0.328-0.052-0.371-0.214l-0.96-3.565c-0.043-0.162,0.052-0.327,0.214-0.371l2.238-0.604
+ c0.161-0.043,0.329,0.054,0.372,0.214l0.959,3.565c0.043,0.161-0.053,0.327-0.215,0.371L52.038,37.122z"/>
+ </g>
+</g>
+<g>
+ <path id="path3061_11_" fill="none" stroke="#000000" stroke-width="2" d="M26.5,22.163h-15"/>
+ <path id="path3061_10_" fill="none" stroke="#000000" stroke-width="2" d="M26.5,27.163h-15"/>
+ <path id="path3061_9_" fill="none" stroke="#FFFFFF" stroke-width="3" d="M26.5,24.663h-15"/>
+ <path id="path3061_8_" fill="none" stroke="#000000" stroke-width="2" d="M26.5,11.163h-15"/>
+ <path id="path3061_7_" fill="none" stroke="#000000" stroke-width="2" d="M26.5,16.163h-15"/>
+ <path id="path3061_6_" fill="none" stroke="#FFFFFF" stroke-width="3" d="M26.5,13.663h-15"/>
+ <path id="path3061_5_" fill="none" stroke="#000000" stroke-width="2" d="M26.5,33.163h-15"/>
+ <path id="path3061_4_" fill="none" stroke="#000000" stroke-width="2" d="M26.5,38.163h-15"/>
+ <path id="path3061_3_" fill="none" stroke="#FFFFFF" stroke-width="3" d="M26.5,35.663h-15"/>
+</g>
+</svg>
Oops, something went wrong.

0 comments on commit bffa12d

Please sign in to comment.