Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

more css

  • Loading branch information...
commit 4fe697f46871f0b80cddf7dac56721783e087373 1 parent 4811231
Will Sun wsun authored

Showing 2 changed files with 76 additions and 74 deletions. Show diff stats Hide diff stats

  1. +49 39 index.html
  2. +27 35 style.css
88 index.html
@@ -16,7 +16,7 @@
16 16 $.getJSON(url+query+"&callback=?", function(json) {
17 17 $('#domains').empty();
18 18 $.each(json.results, function(i, result) {
19   - $("#domains").delaappend('<div id =url"' + i + '">' + result.domain + '</div>');
  19 + $("#domains").append('<div id =url"' + i + '">' + result.domain + '</div>');
20 20 });
21 21 });
22 22 })
@@ -82,8 +82,12 @@
82 82 type1 = joinify(group0,group1).concat(joinify(group0,group2), joinify(group1, group2));
83 83 permute(type1);
84 84
  85 + var output0 = document.getElementById('names0');
85 86 var output1 = document.getElementById('names1');
86 87 var output2 = document.getElementById('names2');
  88 + while (output0.firstChild) {
  89 + output0.removeChild(output0.firstChild);
  90 + }
87 91 while (output1.firstChild) {
88 92 output1.removeChild(output1.firstChild);
89 93 }
@@ -91,7 +95,7 @@
91 95 output2.removeChild(output2.firstChild);
92 96 }
93 97 i = 0;
94   - while (i < 10) {
  98 + while (i < 12) {
95 99 var div = document.createElement('span');
96 100 div.innerHTML = type1[i][0];
97 101 div.setAttribute('class', 'created');
@@ -105,14 +109,18 @@
105 109 unhighlight(type1[i][1], type1[i][2], type1[i][3], type1[i][4]);
106 110 };
107 111 })(i));
108   - if (i < 5) {
109   - output1.appendChild(div);
  112 + if (i < 4) {
  113 + output0.appendChild(div);
  114 + }
  115 + else if (i < 8) {
  116 + output1.appendChild(div);
110 117 }
111 118 else {
112 119 output2.appendChild(div);
113 120 }
114 121 i++;
115 122 }
  123 + $("#output").css("border-top", "1px dotted");
116 124 }
117 125
118 126 function highlight(x1, x2, y1, y2) {
@@ -288,7 +296,6 @@
288 296 var div = document.createElement('div');
289 297 div.setAttribute('class', 'output');
290 298 var list = document.createElement('ul');
291   -var $list = $(list);
292 299 list.setAttribute('id', 'output0');
293 300 list.addEventListener('click', (function() {
294 301 makerequest(0);
@@ -452,40 +459,43 @@
452 459 </head>
453 460
454 461 <body>
455   -<div id="header">
456   - <div id="header-inner">
457   - <a href="/">Syntext</a>
  462 + <div id="header">
  463 + <div id="header-inner">
  464 + <a href="/">Syntext</a>
  465 + </div>
  466 + </div>
  467 + <div id="content">
  468 + <div id="content-left">
  469 + <div id="div0">
  470 + <div class="word">
  471 + <input type="text" id = "word0" class = "input"/>
  472 + </div>
  473 + </div>
  474 + <div id="div1">
  475 + <div class="word">
  476 + <input type="text" id="word1" class = "input"/>
  477 + </div>
  478 + </div>
  479 + <div id="div2">
  480 + <div class="word">
  481 + <input type="text" id="word2" class = "input"/>
  482 + </div>
  483 + </div>
  484 + <div id="output">
  485 + <div id="names0" class="names">
  486 + </div>
  487 + <div id="names1" class="names">
  488 + </div>
  489 + <div id="names2" class="names">
  490 + </div>
  491 + </div>
  492 + <div id="domains">
  493 + </div>
  494 + </div>
  495 + <div id="buttons">
  496 + <button type="button" onclick="getSynonym()">Get Synonyms</button>
  497 + <button type="button" onclick="makeNames()"> Create! </button>
  498 + </div>
458 499 </div>
459   -</div>
460   -<div id="content">
461   -<div id="div0">
462   - <div class="word">
463   - <input type="text" / id = "word0">
464   - </div>
465   -</div>
466   -<div id="div1">
467   - <div class="word">
468   - <input type="text" id="word1" />
469   - </div>
470   -</div>
471   -<div id="div2">
472   - <div class="word">
473   - <input type="text" id="word2" />
474   - </div>
475   -</div>
476   -<div id="output">
477   -<div id="names1" class="names">
478   -</div>
479   -<div id="names2" class="names">
480   -</div>
481   -</div>
482   -<div id="domains">
483   -</div>
484   -<div id="buttons">
485   - <button type="button" onclick="getSynonym()">Get Synonyms</button>
486   - <button type="button" onclick="makeNames()"> Create! </button>
487   -</div>
488   -</div>
489   -</div>
490 500 </body>
491 501 </html>
62 style.css
@@ -18,19 +18,25 @@ body {
18 18
19 19 a, a:link, a:visited, a:active, a:hover {
20 20 text-decoration: none;
21   - color: black;
  21 + color: #7B7979;
22 22 letter-spacing: -1px;
23 23 }
24 24
25 25 #content {
26 26 width: 800px;
27   - margin-left: auto;
28   - margin-right: auto;
  27 + margin-left: auto;
  28 + margin-right: auto;
  29 + font: 18px Helvetica;
  30 +}
  31 +
  32 +#content-left {
  33 + width: 575px;
  34 + float: left;
29 35 }
30 36
31 37 #div0, #div1 {
32 38 float: left;
33   - margin-right: 50px;
  39 + margin-right: 25px;
34 40 }
35 41
36 42 #div2 {
@@ -71,59 +77,44 @@ li {
71 77 border-radius: 10px; -moz-border-radius: 10px; -webkit-border-radius: 10px;
72 78 }
73 79
74   -#word0 {
75   - width: 200px;
76   - float: left; padding: 5px 20px 5px 20px;
  80 +.input {
  81 + width: 175px;
  82 + float: left; padding: 3px 15px 3px 15px;
77 83 border: 3px solid #c7c7c7;
78   - border-radius: 100px; -moz-border-radius: 100px; -webkit-border-radius: 100px;
79   - font: 20px Helvetica; color: #000000;
  84 + border-radius: 100px;
  85 + -moz-border-radius: 100px; -webkit-border-radius: 100px;
  86 + font: 18px Helvetica; color: #c7c7c7;
80 87 outline: none; /*Remove Chrome and Safari glows on focus*/
81 88 }
82 89 #word0.active {
83 90 background: #ebf3fc url('bar-bg-active-red.png') repeat-x;
84   - border: 3px solid #ff8080;
85   -}
86   -
87   -#word1 {
88   - width: 200px;
89   - float: left; padding: 5px 20px 5px 20px;
90   - border: 3px solid #c7c7c7;
91   - border-radius: 100px; -moz-border-radius: 100px; -webkit-border-radius: 100px;
92   - font: 20px Helvetica; color: #000000;
93   - outline: none; /*Remove Chrome and Safari glows on focus*/
  91 + color: black;
  92 + border: 3px solid #ff8080;
94 93 }
95 94 #word1.active {
96 95 background: #ebf3fc url('bar-bg-active-blue.png') repeat-x;
  96 + color: black;
97 97 border: 3px solid #abd2ff;
98 98 }
99   -
100   -#word2 {
101   - width: 200px;
102   - float: left; padding: 5px 20px 5px 20px;
103   - border: 3px solid #c7c7c7;
104   - border-radius: 100px; -moz-border-radius: 100px; -webkit-border-radius: 100px;
105   - font: 20px Helvetica; color: #000000;
106   - outline: none; /*Remove Chrome and Safari glows on focus*/
107   -}
108 99 #word2.active {
109 100 background: #ebf3fc url('bar-bg-active-green.png') repeat-x;
  101 + color: black;
110 102 border: 3px solid #70f070;
111 103 }
112 104
  105 +
113 106 #output {
114   - padding-top: 100px;
115   - width: 800px;
  107 + margin-top: 200px;
  108 + padding-top: 25px;
116 109 text-align: center;
117   - margin-left: auto;
118   - margin-right: auto;
119 110 }
120 111
121   -#names1 {
  112 +#names0 {
122 113 margin-left: auto;
123 114 margin-right: auto;
124 115 }
125 116
126   -#names2 {
  117 +#names1, #names2 {
127 118 padding-top: 30px;
128 119 margin-left: auto;
129 120 margin-right: auto;
@@ -138,5 +129,6 @@ li {
138 129
139 130 .created:hover {
140 131 border: 1px solid #c7c7c7;
141   - border-radius: 10px; -moz-border-radius: 10px; -webkit-border-radius: 10px;
  132 + border-radius: 10px;
  133 + -moz-border-radius: 10px; -webkit-border-radius: 10px;
142 134 }

0 comments on commit 4fe697f

Please sign in to comment.
Something went wrong with that request. Please try again.