From 517b4de2fe7c40aecc6c5cf8a903823e70e335e7 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 2 May 2013 19:45:22 +0000 Subject: [PATCH] threads look awesome now --- public/css/style.less | 96 +- public/src/app.js | 10 +- public/templates/header.tpl | 9 +- public/templates/topic.tpl | 47 +- public/vendor/fontawesome/.gitignore | 29 + public/vendor/fontawesome/README.md | 22 + .../fontawesome/css/font-awesome-ie7.min.css | 22 + .../vendor/fontawesome/css/font-awesome.css | 540 ++++++ .../fontawesome/css/font-awesome.min.css | 33 + .../docs/assets/css/font-awesome-ie7.min.css | 22 + .../docs/assets/css/font-awesome.css | 540 ++++++ .../docs/assets/css/font-awesome.min.css | 33 + .../fontawesome/docs/assets/css/prettify.css | 30 + .../fontawesome/docs/assets/css/site.css | 9 + .../docs/assets/font/FontAwesome.otf | Bin 0 -> 42288 bytes .../docs/assets/font/fontawesome-webfont.eot | Bin 0 -> 25395 bytes .../docs/assets/font/fontawesome-webfont.svg | 284 ++++ .../docs/assets/font/fontawesome-webfont.ttf | Bin 0 -> 55096 bytes .../docs/assets/font/fontawesome-webfont.woff | Bin 0 -> 29380 bytes .../assets/font/museo_slab_300-webfont.eot | Bin 0 -> 51440 bytes .../assets/font/museo_slab_300-webfont.ttf | Bin 0 -> 51260 bytes .../assets/font/museo_slab_500-webfont.eot | Bin 0 -> 55516 bytes .../assets/font/museo_slab_500-webfont.ttf | Bin 0 -> 55336 bytes .../assets/font/proximanova-sbold-webfont.eot | Bin 0 -> 14174 bytes .../assets/font/proximanova-sbold-webfont.ttf | Bin 0 -> 32412 bytes .../docs/assets/font/proximanova-webfont.eot | Bin 0 -> 31323 bytes .../docs/assets/font/proximanova-webfont.ttf | Bin 0 -> 89732 bytes .../fontawesome/docs/assets/ico/favicon.ico | Bin 0 -> 1150 bytes .../docs/assets/img/contribution-sample.png | Bin 0 -> 2441 bytes .../docs/assets/img/fort_awesome.jpg | Bin 0 -> 114822 bytes .../assets/img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes .../docs/assets/img/glyphicons-halflings.png | Bin 0 -> 12799 bytes .../fontawesome/docs/assets/img/icon-flag.pdf | 1355 +++++++++++++++ .../docs/assets/js/backbone.min.js | 37 + .../docs/assets/js/bootstrap-222.min.js | 6 + .../fontawesome/docs/assets/js/index/index.js | 89 + .../docs/assets/js/jquery-1.7.1.min.js | 4 + .../docs/assets/js/prettify.min.js | 28 + .../docs/assets/js/underscore.min.js | 31 + .../docs/assets/less/font-awesome-ie7.less | 350 ++++ .../docs/assets/less/font-awesome.less | 537 ++++++ .../docs/assets/less/font-site.less | 35 + .../fontawesome/docs/assets/less/mixins.less | 43 + .../fontawesome/docs/assets/less/site.less | 373 +++++ .../docs/assets/less/twbs-222/accordion.less | 34 + .../docs/assets/less/twbs-222/alerts.less | 79 + .../docs/assets/less/twbs-222/bootstrap.less | 63 + .../assets/less/twbs-222/breadcrumbs.less | 24 + .../assets/less/twbs-222/button-groups.less | 227 +++ .../docs/assets/less/twbs-222/buttons.less | 230 +++ .../docs/assets/less/twbs-222/carousel.less | 131 ++ .../docs/assets/less/twbs-222/close.less | 31 + .../docs/assets/less/twbs-222/code.less | 61 + .../less/twbs-222/component-animations.less | 22 + .../docs/assets/less/twbs-222/dropdowns.less | 233 +++ .../docs/assets/less/twbs-222/forms.less | 687 ++++++++ .../docs/assets/less/twbs-222/grid.less | 21 + .../docs/assets/less/twbs-222/hero-unit.less | 25 + .../assets/less/twbs-222/labels-badges.less | 82 + .../docs/assets/less/twbs-222/layouts.less | 16 + .../docs/assets/less/twbs-222/media.less | 55 + .../docs/assets/less/twbs-222/mixins.less | 686 ++++++++ .../docs/assets/less/twbs-222/modals.less | 95 ++ .../docs/assets/less/twbs-222/navbar.less | 490 ++++++ .../docs/assets/less/twbs-222/navs.less | 391 +++++ .../docs/assets/less/twbs-222/pager.less | 41 + .../docs/assets/less/twbs-222/pagination.less | 121 ++ .../docs/assets/less/twbs-222/popovers.less | 129 ++ .../assets/less/twbs-222/progress-bars.less | 122 ++ .../docs/assets/less/twbs-222/reset.less | 216 +++ .../less/twbs-222/responsive-1200px-min.less | 28 + .../less/twbs-222/responsive-767px-max.less | 193 +++ .../less/twbs-222/responsive-768px-979px.less | 19 + .../less/twbs-222/responsive-navbar.less | 185 +++ .../less/twbs-222/responsive-utilities.less | 43 + .../docs/assets/less/twbs-222/responsive.less | 57 + .../assets/less/twbs-222/scaffolding.less | 52 + .../docs/assets/less/twbs-222/sprites.less | 193 +++ .../docs/assets/less/twbs-222/tables.less | 237 +++ .../assets/less/twbs-222/tests/buttons.html | 139 ++ .../assets/less/twbs-222/tests/css-tests.css | 139 ++ .../assets/less/twbs-222/tests/css-tests.html | 1345 +++++++++++++++ .../less/twbs-222/tests/forms-responsive.html | 71 + .../assets/less/twbs-222/tests/forms.html | 179 ++ .../less/twbs-222/tests/navbar-fixed-top.html | 104 ++ .../twbs-222/tests/navbar-static-top.html | 107 ++ .../assets/less/twbs-222/tests/navbar.html | 107 ++ .../docs/assets/less/twbs-222/thumbnails.less | 52 + .../docs/assets/less/twbs-222/tooltip.less | 70 + .../docs/assets/less/twbs-222/type.less | 235 +++ .../docs/assets/less/twbs-222/utilities.less | 30 + .../docs/assets/less/twbs-222/variables.less | 301 ++++ .../docs/assets/less/twbs-222/wells.less | 29 + .../docs/assets/less/variables.less | 303 ++++ public/vendor/fontawesome/docs/design.html | 333 ++++ public/vendor/fontawesome/docs/index.html | 1462 +++++++++++++++++ public/vendor/fontawesome/docs/test.html | 584 +++++++ .../vendor/fontawesome/font/FontAwesome.otf | Bin 0 -> 48748 bytes .../fontawesome/font/fontawesome-webfont.eot | Bin 0 -> 25395 bytes .../fontawesome/font/fontawesome-webfont.svg | 284 ++++ .../fontawesome/font/fontawesome-webfont.ttf | Bin 0 -> 55096 bytes .../fontawesome/font/fontawesome-webfont.woff | Bin 0 -> 29380 bytes .../fontawesome/less/font-awesome-ie7.less | 350 ++++ .../vendor/fontawesome/less/font-awesome.less | 537 ++++++ .../vendor/fontawesome/sass/font-awesome.sass | 758 +++++++++ .../vendor/fontawesome/sass/font-awesome.scss | 534 ++++++ src/webserver.js | 2 +- 107 files changed, 17952 insertions(+), 36 deletions(-) create mode 100644 public/vendor/fontawesome/.gitignore create mode 100644 public/vendor/fontawesome/README.md create mode 100644 public/vendor/fontawesome/css/font-awesome-ie7.min.css create mode 100644 public/vendor/fontawesome/css/font-awesome.css create mode 100644 public/vendor/fontawesome/css/font-awesome.min.css create mode 100644 public/vendor/fontawesome/docs/assets/css/font-awesome-ie7.min.css create mode 100644 public/vendor/fontawesome/docs/assets/css/font-awesome.css create mode 100644 public/vendor/fontawesome/docs/assets/css/font-awesome.min.css create mode 100644 public/vendor/fontawesome/docs/assets/css/prettify.css create mode 100644 public/vendor/fontawesome/docs/assets/css/site.css create mode 100644 public/vendor/fontawesome/docs/assets/font/FontAwesome.otf create mode 100644 public/vendor/fontawesome/docs/assets/font/fontawesome-webfont.eot create mode 100644 public/vendor/fontawesome/docs/assets/font/fontawesome-webfont.svg create mode 100644 public/vendor/fontawesome/docs/assets/font/fontawesome-webfont.ttf create mode 100644 public/vendor/fontawesome/docs/assets/font/fontawesome-webfont.woff create mode 100644 public/vendor/fontawesome/docs/assets/font/museo_slab_300-webfont.eot create mode 100644 public/vendor/fontawesome/docs/assets/font/museo_slab_300-webfont.ttf create mode 100644 public/vendor/fontawesome/docs/assets/font/museo_slab_500-webfont.eot create mode 100644 public/vendor/fontawesome/docs/assets/font/museo_slab_500-webfont.ttf create mode 100644 public/vendor/fontawesome/docs/assets/font/proximanova-sbold-webfont.eot create mode 100644 public/vendor/fontawesome/docs/assets/font/proximanova-sbold-webfont.ttf create mode 100644 public/vendor/fontawesome/docs/assets/font/proximanova-webfont.eot create mode 100644 public/vendor/fontawesome/docs/assets/font/proximanova-webfont.ttf create mode 100644 public/vendor/fontawesome/docs/assets/ico/favicon.ico create mode 100644 public/vendor/fontawesome/docs/assets/img/contribution-sample.png create mode 100644 public/vendor/fontawesome/docs/assets/img/fort_awesome.jpg create mode 100644 public/vendor/fontawesome/docs/assets/img/glyphicons-halflings-white.png create mode 100644 public/vendor/fontawesome/docs/assets/img/glyphicons-halflings.png create mode 100644 public/vendor/fontawesome/docs/assets/img/icon-flag.pdf create mode 100644 public/vendor/fontawesome/docs/assets/js/backbone.min.js create mode 100644 public/vendor/fontawesome/docs/assets/js/bootstrap-222.min.js create mode 100644 public/vendor/fontawesome/docs/assets/js/index/index.js create mode 100644 public/vendor/fontawesome/docs/assets/js/jquery-1.7.1.min.js create mode 100644 public/vendor/fontawesome/docs/assets/js/prettify.min.js create mode 100644 public/vendor/fontawesome/docs/assets/js/underscore.min.js create mode 100644 public/vendor/fontawesome/docs/assets/less/font-awesome-ie7.less create mode 100644 public/vendor/fontawesome/docs/assets/less/font-awesome.less create mode 100644 public/vendor/fontawesome/docs/assets/less/font-site.less create mode 100644 public/vendor/fontawesome/docs/assets/less/mixins.less create mode 100644 public/vendor/fontawesome/docs/assets/less/site.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/accordion.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/alerts.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/bootstrap.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/breadcrumbs.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/button-groups.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/buttons.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/carousel.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/close.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/code.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/component-animations.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/dropdowns.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/forms.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/grid.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/hero-unit.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/labels-badges.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/layouts.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/media.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/mixins.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/modals.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/navbar.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/navs.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/pager.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/pagination.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/popovers.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/progress-bars.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/reset.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/responsive-1200px-min.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/responsive-767px-max.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/responsive-768px-979px.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/responsive-navbar.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/responsive-utilities.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/responsive.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/scaffolding.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/sprites.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/tables.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/tests/buttons.html create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/tests/css-tests.css create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/tests/css-tests.html create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/tests/forms-responsive.html create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/tests/forms.html create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/tests/navbar-fixed-top.html create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/tests/navbar-static-top.html create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/tests/navbar.html create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/thumbnails.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/tooltip.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/type.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/utilities.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/variables.less create mode 100644 public/vendor/fontawesome/docs/assets/less/twbs-222/wells.less create mode 100644 public/vendor/fontawesome/docs/assets/less/variables.less create mode 100644 public/vendor/fontawesome/docs/design.html create mode 100644 public/vendor/fontawesome/docs/index.html create mode 100644 public/vendor/fontawesome/docs/test.html create mode 100644 public/vendor/fontawesome/font/FontAwesome.otf create mode 100644 public/vendor/fontawesome/font/fontawesome-webfont.eot create mode 100644 public/vendor/fontawesome/font/fontawesome-webfont.svg create mode 100644 public/vendor/fontawesome/font/fontawesome-webfont.ttf create mode 100644 public/vendor/fontawesome/font/fontawesome-webfont.woff create mode 100644 public/vendor/fontawesome/less/font-awesome-ie7.less create mode 100644 public/vendor/fontawesome/less/font-awesome.less create mode 100644 public/vendor/fontawesome/sass/font-awesome.sass create mode 100644 public/vendor/fontawesome/sass/font-awesome.scss diff --git a/public/css/style.less b/public/css/style.less index 19fc47425e..d8920f5604 100644 --- a/public/css/style.less +++ b/public/css/style.less @@ -1,3 +1,13 @@ + +.caret-left { + border-left: 0; + border-right: 4px solid black; + border-top: 4px solid transparent; + border-bottom: 4px solid transparent; +} + + + .pointer { cursor: pointer; *cursor: hand; @@ -9,6 +19,9 @@ zoom: 1; } +body { + background: #fdfdfd; +} @media (min-width: 979px) { body { padding-top: 60px; @@ -39,7 +52,7 @@ footer.footer { #post_window { width: 100%; - position: absolute; + position: fixed; height: 350px; left: 0px; bottom: 0px; @@ -116,29 +129,70 @@ footer.footer { list-style-type: none; padding: 0; margin: 0; - border: 1px solid #eee; + clear: both; + + .profile-image-block { + background: white; + + } + li { + padding-bottom: 15px; + } + + .profile-block, .post-block { + border: 1px solid #f0f0f0; + border-radius: 5px; + + padding: 10px; + } + + img { + margin: 5px; + } + + .profile-block { + background: #fafafa; + margin-right: -11px; + margin-left: -11px; + margin-bottom: -11px; + margin-top: 15px; + border-radius: 0 0 5px 5px; + font-size: 10px; + padding: 5px; + padding-left: 10px; + } + + .post-block { + + .caret { + margin-top: -10px; + margin-left: -18px; + display: block; + border-width: 8px 8px 8px 0; + border-color: transparent #ddd transparent; + } + .post-buttons { + font-size: 12px; + float: right; + + div { + display: inline-block; + padding-left: 15px; + padding-right: 15px; + border-left: 1px solid #f0f0f0; + cursor: pointer; + + &:last-child { + padding-right: 5px; + } + } + } + background: #fff; + } li:last-child { border-bottom: 0; } - - li.post-row { - cursor: pointer; - border-bottom: 1px solid #eee; - padding: 10px; - - &:nth-child(odd) { - background-color:#fdfdfd; - } - - &:nth-child(even) { - background-color:#fff; - } - - &:hover { - background-color: #eee; - } - } } #user_label { @@ -175,4 +229,4 @@ footer.footer { } .block { display: block !important; -} \ No newline at end of file +} diff --git a/public/src/app.js b/public/src/app.js index 249bc1b688..29e60a9ddf 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -107,9 +107,14 @@ var socket, app.post_topic(); } } else { + if (post_mode == 'reply') { + reply_title.innerHTML = 'You are replying to "' + title + '"'; + } else if (post_mode == 'quote') { + reply_title.innerHTML = 'You are quoting "' + title + '"'; + } + post_title.style.display = "none"; reply_title.style.display = "block"; - reply_title.innerHTML = 'You are replying to "' + title + '"'; post_content.focus(); submit_post_btn.onclick = function() { app.post_reply(id) @@ -118,6 +123,9 @@ var socket, }; + + + app.post_reply = function(topic_id) { var content = document.getElementById('post_content').value; diff --git a/public/templates/header.tpl b/public/templates/header.tpl index 65635218c9..2068576586 100644 --- a/public/templates/header.tpl +++ b/public/templates/header.tpl @@ -5,6 +5,7 @@ + @@ -47,10 +48,10 @@
- - - - + + + +
Submit diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl index 4c8ebfa9cb..58aa321c5a 100644 --- a/public/templates/topic.tpl +++ b/public/templates/topic.tpl @@ -5,19 +5,48 @@
-