From b54e611797b25b9b15ce6ef3b3286666462a97ae Mon Sep 17 00:00:00 2001 From: Hedgehog Date: Sun, 2 Mar 2014 20:52:28 +0400 Subject: [PATCH] big update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit change files order, new DHT indicator in top menu, ‘back’ button in DM conversations, sound notifications (alpha) and new page ‘Options’, few fixes --- calm.js | 10 -- css/profile.css | 2 - css/style.css | 108 +++++++++++++--- following.html | 88 ++++--------- home.html | 68 +++++----- {css/images => img}/ajax-loader.gif | Bin {css/images => img}/dm.png | Bin {css/images => img}/ext-link.png | Bin {css/images => img}/form-arrow-down-black.png | Bin {css/images => img}/icons-18-black.png | Bin {css/images => img}/icons-18-white.png | Bin {css/images => img}/icons-36-black.png | Bin {css/images => img}/icons-36-white.png | Bin {css/images => img}/pen.png | Bin js/calm.js | 122 ++++++++++++++++++ interface_common.js => js/interface_common.js | 0 interface_home.js => js/interface_home.js | 0 .../interface_localization.js | 4 +- interface_login.js => js/interface_login.js | 0 .../interface_profile-edit.js | 0 jQueryPlugins.js => js/jQueryPlugins.js | 0 .../jpeg_encoder_basic.js | 0 jquery-1.9.1.min.js => js/jquery-1.9.1.min.js | 0 .../jquery.animate-colors-min.js | 0 jquery.json-2.4.js => js/jquery.json-2.4.js | 0 .../jquery.jsonrpcclient.js | 0 jquery.min.js => js/jquery.min.js | 0 .../jquery.mobile-1.3.2.min.js | 0 .../jquery.mobile.router.min.js | 0 .../jquery.storageapi.js | 0 mobile_abstract.js => js/mobile_abstract.js | 1 + js/options.js | 3 + polyglot.min.js => js/polyglot.min.js | 0 qrcode.js => js/qrcode.js | 0 tmobile.js => js/tmobile.js | 0 twister_actions.js => js/twister_actions.js | 0 .../twister_directmsg.js | 1 + .../twister_following.js | 0 .../twister_formatpost.js | 0 twister_io.js => js/twister_io.js | 0 twister_network.js => js/twister_network.js | 1 + twister_newmsgs.js => js/twister_newmsgs.js | 5 +- twister_timeline.js => js/twister_timeline.js | 3 +- twister_user.js => js/twister_user.js | 0 login.html | 38 +++--- network.html | 54 +++----- options.html | 84 ++++++++++++ profile-edit.html | 69 +++------- sound/1.mp3 | Bin 0 -> 39360 bytes sound/1.ogg | Bin 0 -> 14575 bytes sound/1.wav | Bin 0 -> 174134 bytes sound/2.mp3 | Bin 0 -> 10560 bytes sound/2.ogg | Bin 0 -> 6737 bytes sound/2.wav | Bin 0 -> 36820 bytes sound/3.mp3 | Bin 0 -> 81600 bytes sound/3.ogg | Bin 0 -> 28487 bytes sound/3.wav | Bin 0 -> 376904 bytes sound/4.mp3 | Bin 0 -> 27840 bytes sound/4.ogg | Bin 0 -> 12345 bytes sound/4.wav | Bin 0 -> 121768 bytes sound/5.mp3 | Bin 0 -> 43200 bytes sound/5.ogg | Bin 0 -> 14371 bytes sound/5.wav | Bin 0 -> 192584 bytes tmobile.html | 10 +- 64 files changed, 423 insertions(+), 248 deletions(-) delete mode 100644 calm.js rename {css/images => img}/ajax-loader.gif (100%) rename {css/images => img}/dm.png (100%) rename {css/images => img}/ext-link.png (100%) rename {css/images => img}/form-arrow-down-black.png (100%) rename {css/images => img}/icons-18-black.png (100%) rename {css/images => img}/icons-18-white.png (100%) rename {css/images => img}/icons-36-black.png (100%) rename {css/images => img}/icons-36-white.png (100%) rename {css/images => img}/pen.png (100%) create mode 100644 js/calm.js rename interface_common.js => js/interface_common.js (100%) rename interface_home.js => js/interface_home.js (100%) rename interface_localization.js => js/interface_localization.js (99%) rename interface_login.js => js/interface_login.js (100%) rename interface_profile-edit.js => js/interface_profile-edit.js (100%) rename jQueryPlugins.js => js/jQueryPlugins.js (100%) rename jpeg_encoder_basic.js => js/jpeg_encoder_basic.js (100%) rename jquery-1.9.1.min.js => js/jquery-1.9.1.min.js (100%) rename jquery.animate-colors-min.js => js/jquery.animate-colors-min.js (100%) rename jquery.json-2.4.js => js/jquery.json-2.4.js (100%) rename jquery.jsonrpcclient.js => js/jquery.jsonrpcclient.js (100%) rename jquery.min.js => js/jquery.min.js (100%) rename jquery.mobile-1.3.2.min.js => js/jquery.mobile-1.3.2.min.js (100%) rename jquery.mobile.router.min.js => js/jquery.mobile.router.min.js (100%) rename jquery.storageapi.js => js/jquery.storageapi.js (100%) rename mobile_abstract.js => js/mobile_abstract.js (99%) create mode 100644 js/options.js rename polyglot.min.js => js/polyglot.min.js (100%) rename qrcode.js => js/qrcode.js (100%) rename tmobile.js => js/tmobile.js (100%) rename twister_actions.js => js/twister_actions.js (100%) rename twister_directmsg.js => js/twister_directmsg.js (99%) rename twister_following.js => js/twister_following.js (100%) rename twister_formatpost.js => js/twister_formatpost.js (100%) rename twister_io.js => js/twister_io.js (100%) rename twister_network.js => js/twister_network.js (99%) rename twister_newmsgs.js => js/twister_newmsgs.js (96%) rename twister_timeline.js => js/twister_timeline.js (99%) rename twister_user.js => js/twister_user.js (100%) create mode 100644 options.html create mode 100644 sound/1.mp3 create mode 100644 sound/1.ogg create mode 100644 sound/1.wav create mode 100644 sound/2.mp3 create mode 100644 sound/2.ogg create mode 100644 sound/2.wav create mode 100644 sound/3.mp3 create mode 100644 sound/3.ogg create mode 100644 sound/3.wav create mode 100644 sound/4.mp3 create mode 100644 sound/4.ogg create mode 100644 sound/4.wav create mode 100644 sound/5.mp3 create mode 100644 sound/5.ogg create mode 100644 sound/5.wav diff --git a/calm.js b/calm.js deleted file mode 100644 index b1fd416..0000000 --- a/calm.js +++ /dev/null @@ -1,10 +0,0 @@ -$(function(){ - $('.post-text').on('click', 'a', function(e){ - e.stopPropagation(); - }); - - $(".cancel").on('click', function(e){ - if($(".modal-content").attr("style") != undefined){$(".modal-content").removeAttr("style")}; - -}) -}) \ No newline at end of file diff --git a/css/profile.css b/css/profile.css index d842c99..ecfd84b 100644 --- a/css/profile.css +++ b/css/profile.css @@ -41,8 +41,6 @@ height: 74px; border: solid 3px #45474d; border-radius: 10%; -/* border-top-right-radius: 0; - border-bottom-left-radius: 0;*/ box-sizing: content-box; float:left; top: 50%; diff --git a/css/style.css b/css/style.css index 2c50259..e889e66 100644 --- a/css/style.css +++ b/css/style.css @@ -145,15 +145,6 @@ button.disabled:hover background: #43464d; z-index: -999; } -/*.userMenu:after -{ - content: ""; - position: absolute; - right: 0; - width: 34px; - height: 54px; - background: url(../img/twister_mini.png) no-repeat right 5px; -}*/ .userMenu > ul { } @@ -238,7 +229,19 @@ button.disabled:hover { background: url(../img/following.png) no-repeat 5px center #768fce; } - +.userMenu li.userMenu-options > a +{ + background: url(../img/following.png) no-repeat 5px center; + padding-left: 50px; +} +.userMenu li.userMenu-options:hover > a +{ + background: url(../img/following.png) no-repeat 5px center rgba( 0, 0, 0 , .4 ); +} +.userMenu li.userMenu-options.current > a +{ + background: url(../img/following.png) no-repeat 5px center #768fce; +} .userMenu li.userMenu-messages > a { background: url(../img/messages.png) no-repeat center center; @@ -270,7 +273,6 @@ button.disabled:hover { float: right; position: relative; -/* margin-right: 40px;*/ } .userMenu li.userMenu-search { @@ -323,6 +325,44 @@ input.userMenu-search-field:focus::-ms-input-placeholder { { background: url(../img/config.png) no-repeat 5px center rgba( 0, 0, 0 , .4 ); } +.userMenu li.userMenu-dhtindicator { + background: #000; + width: 70px; + height: 25px; + float: right; + margin: 7px 10px 0 0; + -webkit-box-shadow: inset 0 0 20px #000; + -moz-box-shadow: inset 0 0 20px #000; + box-shadow: inset 0 0 20px #000; + -webkit-transition: all 200ms; + -moz-transition: all 200ms; + -ms-transition: all 200ms; + -o-transition: all 200ms; + transition: all 200ms; + border-radius: 10px; +} +.userMenu li.userMenu-dhtindicator a { + display: inline-block; + font: 12px/25px "Open Sans", sans-serif; + padding: 0 0 0 45px; + width: 60px; + height: 25px; + opacity: .9; +} +.userMenu li.userMenu-dhtindicator a:before { + content: 'DHT:'; + display: inline-block; + position: absolute; + left: 10px; + width: 70px; + height: 25px; +} +.userMenu li.userMenu-dhtindicator:hover { + opacity: 1; + -webkit-box-shadow: inset 0 0 15px #000; + -moz-box-shadow: inset 0 0 15px #000; + box-shadow: inset 0 0 15px #000; +} .userMenu li.userMenu-messages > a:empty { padding: 0 20px 0 30px; @@ -659,14 +699,14 @@ input.userMenu-search-field:focus::-ms-input-placeholder { } .directMessages .dm-submit { margin-right: 55px; - background: #6d83bd url(images/dm.png) no-repeat 10px 3px; + background: #6d83bd url(../img/dm.png) no-repeat 10px 3px; } .post .post-submit { margin-right: 16px; - background: #6d83bd url(images/pen.png) no-repeat 10px 3px; + background: #6d83bd url(../img/pen.png) no-repeat 10px 3px; } .mini-profile .post-submit { - background: #6d83bd url(images/pen.png) no-repeat 10px 3px; + background: #6d83bd url(../img/pen.png) no-repeat 10px 3px; margin-right: 0; } .post-submit.disabled { @@ -1033,7 +1073,7 @@ input.userMenu-search-field:focus::-ms-input-placeholder { top: 3px; width: 16px; height: 16px; - background: url(images/ext-link.png) no-repeat center center; + background: url(../img/ext-link.png) no-repeat center center; opacity: 1; zoom: .8; -moz-transform: scale(.8); @@ -1351,13 +1391,13 @@ input.userMenu-search-field:focus::-ms-input-placeholder { /************************************* **************************** LOGIN PAGE **************************************/ -.login .module { +.login .module, .sounds .module { padding: 20px; width: 500px; margin: 10px auto; border: 5px solid #c7cdda; } -.login .module p { +.login .module p, .sounds .module p { font: 14px "Open Sans", sans-serif; margin-bottom: 5px; @@ -1374,13 +1414,13 @@ input.userMenu-search-field:focus::-ms-input-placeholder { background: #fff; transition: background-color 100ms linear; } -.login .module select.local-usernames { +.login .module select.local-usernames, .sndOpt { height: 30px; font: 13px/24px "Open sans"; text-align: center; padding: 3px 30px 3px 10px; margin: 0; - background: #fff url(images/form-arrow-down-black.png) no-repeat right center; + background: #fff url(../img/form-arrow-down-black.png) no-repeat right center; border: 1px solid #ccc; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -1471,6 +1511,23 @@ input.userMenu-search-field:focus::-ms-input-placeholder { color: #fff; background: rgba( 0, 0, 0, .1 ); } +.modal-back { + position: absolute; + right: 30px; + top: 0; + padding: 3px 10px; + cursor: pointer; + color: rgba( 255, 255, 255, .7 ); + font-weight: bold; + border-left: solid 1px rgba( 255, 255, 255, .3 ); + transition: all .1s linear; + display: none; +} +.modal-back:hover +{ + color: #fff; + background: rgba( 0, 0, 0, .1 ); +} .modal-buttons { padding: 10px; @@ -1819,3 +1876,16 @@ input.userMenu-search-field:focus::-ms-input-placeholder { left: 2px; } } +/* Options */ +#playerVol { + float: right; + margin-right: 20px; +} +.volValue { + float: right; + margin-right: -163px; + font: 12px "Open Sans", sans-serif; +} +#notifyForm p { + margin-top: 15px; +} diff --git a/following.html b/following.html index 0322bd3..2178cc6 100644 --- a/following.html +++ b/following.html @@ -5,23 +5,24 @@ Following - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -36,35 +38,28 @@