From 9127a53f64e88f89a1cb87d47aef33c3ab18cfc5 Mon Sep 17 00:00:00 2001 From: shayywun Date: Mon, 23 Mar 2015 21:18:57 -0400 Subject: [PATCH 1/6] changes to question list page changes to question list page --- css/all-questions.css | 31 +++++++ images/search-icon.png | Bin 0 -> 333 bytes index.html | 2 + npm-debug.log | 178 ----------------------------------------- questions.html | 33 +++++++- 5 files changed, 64 insertions(+), 180 deletions(-) create mode 100644 css/all-questions.css create mode 100644 images/search-icon.png delete mode 100644 npm-debug.log diff --git a/css/all-questions.css b/css/all-questions.css new file mode 100644 index 0000000..e9965d6 --- /dev/null +++ b/css/all-questions.css @@ -0,0 +1,31 @@ +.side-info{ + margin-top:100px; + margin-bottom: 20px; + /*margin-left:20px;*/ +} + +input.form-control.search{ + border:1px, solid; + border-radius:6px !important; + padding:6%; + +} + +.tag-list > span{ + border-style:solid; + border-width:1px; + border-radius:5px; + color:grey; + font-family: 'Source Sans Pro', sans-serif; + padding-left:1.5%; + padding-right: 1.5%; +} +.tag-list >br{ + margin-bottom:3%; +} + +.input-group-btn{ + position:relative; + left: -20px; + border:none; +} \ No newline at end of file diff --git a/images/search-icon.png b/images/search-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..042c574701b517bed7cda5abea84f238dd36b7fc GIT binary patch literal 333 zcmV-T0kZyyP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D069=hR7H)HpOl)V zo1v?ssIjT8x3IOnx4gr@!pX(S&dku%)YjVD-QeQn=IQF}?d|RG@$&ch`276*|NsB1 z{^@`K005myL_t(2&&86v0>U5+MNfDrrNm%smAYX->c z1op%}xu0MJBqafohXq)^hw5N}GWI7#2Z8;m4LHN&Vg}pTR}cp?#BOHR13Vm5K$g~u zfNWl8<(R5Toqa6~lvD*-z42N~DQXrtj5w#F0d`L&k@X1U&$B#xWJsHb{TQ+@ny~aA fJ9Jy>*A4st()BC>1ETc(00000NkvXXu0mjfBNvp& literal 0 HcmV?d00001 diff --git a/index.html b/index.html index a279e61..2ccba8c 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,9 @@ + + diff --git a/npm-debug.log b/npm-debug.log deleted file mode 100644 index 38232a1..0000000 --- a/npm-debug.log +++ /dev/null @@ -1,178 +0,0 @@ -0 info it worked if it ends with ok -1 verbose cli [ 'node', '/usr/local/bin/npm', 'install', '-g', 'http-server' ] -2 info using npm@2.5.1 -3 info using node@v0.12.0 -4 silly cache add args [ 'http-server', null ] -5 verbose cache add spec http-server -6 silly cache add parsed spec { raw: 'http-server', -6 silly cache add scope: null, -6 silly cache add name: 'http-server', -6 silly cache add rawSpec: '', -6 silly cache add spec: '*', -6 silly cache add type: 'range' } -7 verbose addNamed http-server@* -8 silly addNamed semver.valid null -9 silly addNamed semver.validRange * -10 silly addNameRange { name: 'http-server', range: '*', hasData: false } -11 silly mapToRegistry name http-server -12 silly mapToRegistry using default registry -13 silly mapToRegistry registry https://registry.npmjs.org/ -14 silly mapToRegistry uri https://registry.npmjs.org/http-server -15 verbose addNameRange registry:https://registry.npmjs.org/http-server not in flight; fetching -16 verbose request uri https://registry.npmjs.org/http-server -17 verbose request no auth needed -18 info attempt registry request try #1 at 3:36:30 PM -19 verbose request id 5102ebd08628fc8c -20 verbose etag "7JZTAC17V9JUOIW1YE7VG2JD2" -21 http request GET https://registry.npmjs.org/http-server -22 http 304 https://registry.npmjs.org/http-server -23 silly get cb [ 304, -23 silly get { date: 'Sat, 28 Feb 2015 20:36:29 GMT', -23 silly get server: 'Apache', -23 silly get via: '1.1 varnish', -23 silly get 'last-modified': 'Sat, 28 Feb 2015 20:36:29 GMT', -23 silly get 'cache-control': 'max-age=60', -23 silly get etag: '"7JZTAC17V9JUOIW1YE7VG2JD2"', -23 silly get age: '0', -23 silly get 'x-served-by': 'cache-jfk1021-JFK', -23 silly get 'x-cache': 'HIT', -23 silly get 'x-cache-hits': '1', -23 silly get 'x-timer': 'S1425155789.932413,VS0,VE13', -23 silly get vary: 'Accept', -23 silly get 'content-length': '0', -23 silly get 'keep-alive': 'timeout=10, max=50', -23 silly get connection: 'Keep-Alive' } ] -24 verbose etag https://registry.npmjs.org/http-server from cache -25 verbose get saving http-server to /Users/oluwaseunmakinde/.npm/registry.npmjs.org/http-server/.cache.json -26 silly addNameRange number 2 { name: 'http-server', range: '*', hasData: true } -27 silly addNameRange versions [ 'http-server', -27 silly addNameRange [ '0.1.0', -27 silly addNameRange '0.1.1', -27 silly addNameRange '0.1.3', -27 silly addNameRange '0.2.1', -27 silly addNameRange '0.2.2', -27 silly addNameRange '0.2.3', -27 silly addNameRange '0.2.4', -27 silly addNameRange '0.2.5', -27 silly addNameRange '0.2.6', -27 silly addNameRange '0.2.9', -27 silly addNameRange '0.3.0', -27 silly addNameRange '0.4.0', -27 silly addNameRange '0.4.1', -27 silly addNameRange '0.5.0', -27 silly addNameRange '0.5.1', -27 silly addNameRange '0.5.2', -27 silly addNameRange '0.5.3', -27 silly addNameRange '0.5.5', -27 silly addNameRange '0.6.0', -27 silly addNameRange '0.6.1', -27 silly addNameRange '0.7.0', -27 silly addNameRange '0.7.1', -27 silly addNameRange '0.7.2', -27 silly addNameRange '0.7.3', -27 silly addNameRange '0.7.4', -27 silly addNameRange '0.7.5' ] ] -28 verbose addNamed http-server@0.7.5 -29 silly addNamed semver.valid 0.7.5 -30 silly addNamed semver.validRange 0.7.5 -31 silly cache afterAdd http-server@0.7.5 -32 verbose afterAdd /Users/oluwaseunmakinde/.npm/http-server/0.7.5/package/package.json not in flight; writing -33 verbose afterAdd /Users/oluwaseunmakinde/.npm/http-server/0.7.5/package/package.json written -34 silly install resolved [ { name: 'http-server', -34 silly install resolved version: '0.7.5', -34 silly install resolved description: 'a simple zero-configuration command-line http server', -34 silly install resolved main: './lib/http-server', -34 silly install resolved repository: -34 silly install resolved { type: 'git', -34 silly install resolved url: 'git://github.com/nodeapps/http-server.git' }, -34 silly install resolved keywords: [ 'cli', 'command' ], -34 silly install resolved scripts: -34 silly install resolved { start: 'node ./bin/http-server', -34 silly install resolved pretest: 'stylezero bin/ lib/ test', -34 silly install resolved test: 'vows --spec --isolate' }, -34 silly install resolved contributors: -34 silly install resolved [ [Object], -34 silly install resolved [Object], -34 silly install resolved [Object], -34 silly install resolved [Object], -34 silly install resolved [Object], -34 silly install resolved [Object], -34 silly install resolved [Object], -34 silly install resolved [Object], -34 silly install resolved [Object], -34 silly install resolved [Object] ], -34 silly install resolved dependencies: -34 silly install resolved { colors: '1.0.3', -34 silly install resolved optimist: '0.6.x', -34 silly install resolved union: '~0.4.3', -34 silly install resolved ecstatic: '~0.6.0', -34 silly install resolved portfinder: '0.2.x', -34 silly install resolved opener: '~1.4.0' }, -34 silly install resolved devDependencies: { vows: '0.7.x', request: '2.49.x', stylezero: '2.1.1' }, -34 silly install resolved bugs: { url: 'https://github.com/nodeapps/http-server/issues' }, -34 silly install resolved licenses: [ [Object] ], -34 silly install resolved analyze: false, -34 silly install resolved preferGlobal: 'true', -34 silly install resolved bin: { 'http-server': './bin/http-server', hs: './bin/http-server' }, -34 silly install resolved gitHead: '120daa2b1bbca84bf1474bd757e147d95fdab3ed', -34 silly install resolved homepage: 'https://github.com/nodeapps/http-server', -34 silly install resolved _id: 'http-server@0.7.5', -34 silly install resolved _shasum: 'b18bd1d838e78c30be8cf382e9342ebdd17a9fc3', -34 silly install resolved _from: 'http-server@*', -34 silly install resolved _npmVersion: '2.2.0', -34 silly install resolved _nodeVersion: '0.10.33', -34 silly install resolved _npmUser: { name: 'indexzero', email: 'charlie.robbins@gmail.com' }, -34 silly install resolved maintainers: [ [Object] ], -34 silly install resolved dist: -34 silly install resolved { shasum: 'b18bd1d838e78c30be8cf382e9342ebdd17a9fc3', -34 silly install resolved tarball: 'http://registry.npmjs.org/http-server/-/http-server-0.7.5.tgz' }, -34 silly install resolved directories: {}, -34 silly install resolved _resolved: 'https://registry.npmjs.org/http-server/-/http-server-0.7.5.tgz', -34 silly install resolved readme: 'ERROR: No README data found!' } ] -35 info install http-server@0.7.5 into /usr/local/lib -36 info installOne http-server@0.7.5 -37 verbose installOne of http-server to /usr/local/lib not in flight; installing -38 verbose lock using /Users/oluwaseunmakinde/.npm/_locks/http-server-ae30c9ae1f4c5eaa.lock for /usr/local/lib/node_modules/http-server -39 silly install write writing http-server 0.7.5 to /usr/local/lib/node_modules/http-server -40 silly cache addNamed cb http-server@0.7.5 -41 verbose unbuild lib/node_modules/http-server -42 verbose gentlyRm vacuuming /usr/local/lib/node_modules/http-server -43 verbose tar unpack /Users/oluwaseunmakinde/.npm/http-server/0.7.5/package.tgz -44 verbose tar unpacking to /usr/local/lib/node_modules/http-server -45 verbose gentlyRm vacuuming /usr/local/lib/node_modules/http-server -46 silly gunzTarPerm modes [ '755', '644' ] -47 error tar.unpack untar error /Users/oluwaseunmakinde/.npm/http-server/0.7.5/package.tgz -48 verbose unlock done using /Users/oluwaseunmakinde/.npm/_locks/http-server-ae30c9ae1f4c5eaa.lock for /usr/local/lib/node_modules/http-server -49 verbose fstream_path /usr/local/lib/node_modules/http-server -50 verbose fstream_type Directory -51 verbose fstream_class DirWriter -52 verbose stack Error: EACCES, mkdir '/usr/local/lib/node_modules/http-server' -52 verbose stack at Error (native) -53 verbose fstream_stack /usr/local/lib/node_modules/npm/node_modules/fstream/lib/dir-writer.js:36:23 -53 verbose fstream_stack /usr/local/lib/node_modules/npm/node_modules/mkdirp/index.js:46:53 -53 verbose fstream_stack FSReqWrap.oncomplete (fs.js:99:15) -54 verbose cwd /Users/oluwaseunmakinde/WaterlooAnswersAngular -55 error Darwin 13.4.0 -56 error argv "node" "/usr/local/bin/npm" "install" "-g" "http-server" -57 error node v0.12.0 -58 error npm v2.5.1 -59 error path /usr/local/lib/node_modules/http-server -60 error code EACCES -61 error errno -13 -62 error Error: EACCES, mkdir '/usr/local/lib/node_modules/http-server' -62 error at Error (native) -62 error { [Error: EACCES, mkdir '/usr/local/lib/node_modules/http-server'] -62 error errno: -13, -62 error code: 'EACCES', -62 error path: '/usr/local/lib/node_modules/http-server', -62 error fstream_type: 'Directory', -62 error fstream_path: '/usr/local/lib/node_modules/http-server', -62 error fstream_class: 'DirWriter', -62 error fstream_stack: -62 error [ '/usr/local/lib/node_modules/npm/node_modules/fstream/lib/dir-writer.js:36:23', -62 error '/usr/local/lib/node_modules/npm/node_modules/mkdirp/index.js:46:53', -62 error 'FSReqWrap.oncomplete (fs.js:99:15)' ] } -63 error Please try running this command again as root/Administrator. -64 verbose exit [ -13, true ] -65 verbose unbuild lib/node_modules/http-server -66 verbose gentlyRm vacuuming /usr/local/lib/node_modules/http-server diff --git a/questions.html b/questions.html index b13b457..9131e62 100644 --- a/questions.html +++ b/questions.html @@ -1,7 +1,7 @@
-

Questions

-
+
+

Questions

+
+ + Waterloo Answers is a peer-to-peer forum forum dedicated to helping university students by answering any questions they might have about courses, finances, residence and more. +
+ Before posting a question, please view the guidelines, and search for the question. + +
+

Search

+
+
+ +
+ +
+
+

Tags

+
+
+ ECE 124
+ SE 212
+ CS 241
+ ECE 105
+ co-op
+ integrals
+ phase diagrams
+ cooking
+
+
+
\ No newline at end of file From 0d9040577f9a392cf24e1a7c6d0a6cbb4851d718 Mon Sep 17 00:00:00 2001 From: shayywun Date: Wed, 25 Mar 2015 21:43:39 -0400 Subject: [PATCH 2/6] changes to question list page changes to question list page --- css/all-questions.css | 37 ++++++++++++++++++++---- navbar.html | 7 ++--- questions.html | 65 +++++++++++++++++++++++++------------------ 3 files changed, 72 insertions(+), 37 deletions(-) diff --git a/css/all-questions.css b/css/all-questions.css index e9965d6..6a5fd69 100644 --- a/css/all-questions.css +++ b/css/all-questions.css @@ -1,7 +1,11 @@ +.all-content{ + margin:2%; +} + .side-info{ - margin-top:100px; - margin-bottom: 20px; - /*margin-left:20px;*/ + margin-top:7.5%; + /*margin-bottom: 20px; + margin-left:20px;*/ } input.form-control.search{ @@ -11,7 +15,7 @@ input.form-control.search{ } -.tag-list > span{ +.tag-list > span, .tags>span{ border-style:solid; border-width:1px; border-radius:5px; @@ -28,4 +32,27 @@ input.form-control.search{ position:relative; left: -20px; border:none; -} \ No newline at end of file +} + +.asker-details,.tags{ + display:inline; +} + +.question-stats{ + float:right; + vertical-align:top; + margin-left:10px; +} + +.votes,.answers,.views{ + display:inline-block; + min-width: 38px; + text-align: center; + margin-right: 3px; +} + +.summary{ + width:70%; + float:left; +} + diff --git a/navbar.html b/navbar.html index 89ec6f2..a9fa754 100644 --- a/navbar.html +++ b/navbar.html @@ -11,15 +11,12 @@