From 72efe8b52d47d8853f2cf4aea3402c264bcd4ecc Mon Sep 17 00:00:00 2001 From: zlaxy Date: Fri, 30 Aug 2019 00:02:52 +0300 Subject: [PATCH] testing greengray scheme --- ussrbasic/pdl/mod_pubstream.pdl | 7 + ussrbasicleft/css/style.css | 2 + ussrbasicleft/pdl/mod_channel.pdl | 2 +- ussrbasicleft/pdl/mod_pubstream.pdl | 2 +- ussrbasicleft/schema/zlax.css | 277 +++++++++++++++++++++++++++ ussrbasicpub/pdl/mod_pubstream.pdl | 2 +- ussrbasicright/css/style.css | 5 +- ussrbasicright/js/ussrbasicright.js | 1 + ussrbasicright/pdl/mod_channel.pdl | 9 +- ussrbasicright/pdl/mod_pubstream.pdl | 2 +- ussrbasicright/pdl/mod_settings.pdl | 3 + ussrbasicright/schema/zlax.css | 277 +++++++++++++++++++++++++++ 12 files changed, 583 insertions(+), 6 deletions(-) create mode 100644 ussrbasic/pdl/mod_pubstream.pdl diff --git a/ussrbasic/pdl/mod_pubstream.pdl b/ussrbasic/pdl/mod_pubstream.pdl new file mode 100644 index 0000000..5ece162 --- /dev/null +++ b/ussrbasic/pdl/mod_pubstream.pdl @@ -0,0 +1,7 @@ +[region=aside] +[widget=pubtagcloud][var=trending]8[/var][var=limit]100[/var][/widget] +[/region] +[region=right_aside] +[widget=notifications][/widget] +[widget=newmember][/widget] +[/region] diff --git a/ussrbasicleft/css/style.css b/ussrbasicleft/css/style.css index a43cf82..df86091 100644 --- a/ussrbasicleft/css/style.css +++ b/ussrbasicleft/css/style.css @@ -1524,8 +1524,10 @@ blockquote { } main { + left: -$aside_widthpx; width: calc( 100% + $aside_widthpx ); + } main.region_1-on { diff --git a/ussrbasicleft/pdl/mod_channel.pdl b/ussrbasicleft/pdl/mod_channel.pdl index e7eee82..3632ec6 100644 --- a/ussrbasicleft/pdl/mod_channel.pdl +++ b/ussrbasicleft/pdl/mod_channel.pdl @@ -3,12 +3,12 @@ [/region] [region=aside] [widget=fullprofile][/widget] -[widget=notifications][/widget] [widget=tagcloud_wall][var=limit]50[/var][/widget] [widget=categories][/widget] [widget=archive][var=wall]1[/var][/widget] [widget=common_friends][/widget] [widget=newmember][/widget] +[widget=notifications][/widget] [/region] [region=right_aside] [/region] diff --git a/ussrbasicleft/pdl/mod_pubstream.pdl b/ussrbasicleft/pdl/mod_pubstream.pdl index 3c32bf3..e9eae92 100644 --- a/ussrbasicleft/pdl/mod_pubstream.pdl +++ b/ussrbasicleft/pdl/mod_pubstream.pdl @@ -1,5 +1,5 @@ [region=aside] -[widget=pubtagcloud][var=trending]8[/var][var=limit]20[/var][/widget] +[widget=pubtagcloud][var=trending]8[/var][var=limit]100[/var][/widget] [widget=notifications][/widget] [widget=newmember][/widget] [/region] diff --git a/ussrbasicleft/schema/zlax.css b/ussrbasicleft/schema/zlax.css index 0a7f7d7..133592a 100644 --- a/ussrbasicleft/schema/zlax.css +++ b/ussrbasicleft/schema/zlax.css @@ -1,3 +1,8 @@ +/* reashred content fix */ +.reshared-content img { + width: auto; +} + .wall-item-like { visibility: hidden; } @@ -6,6 +11,10 @@ visibility: hidden; } +.allcontact-link { + display: none; +} + .fa-minus-circle { visibility: hidden; } @@ -15,3 +24,271 @@ div.tagblock > h3 { left: 33%; content: url(https://ussr.win/photo/73e2201da875ccae6fecadfcf8ccba55c6c8ac093634d2e4af8e0f3cec1f2de3.gif); } + +body { + background-color: #383c4a; + color: #dddddd; +} + +.generic-content-wrapper { + background-color: #383c4a; +} + +.section-subtitle-wrapper, +.collapse, +.show, +.section-title-wrapper { + background-color: #404552; + border-bottom-color: #2b2b2b; +} + +.vcard, .h-card, +.widget, .settings-widget, .section-subtitle-wrapper { + background-color: #4B5162; + border-bottom: #383c4a; + border-left: #383c4a; + border-right: #383c4a; + border-top: #383c4a; +} + +.fn { + color: #ffffff; +} + +.contextual-help-content, +.section-content-tools-wrapper, .section-content-wrapper { + background-color: #353945; + border-bottom: #383c4a; + border-left: #383c4a; + border-right: #383c4a; + border-top: #383c4a; +} + +a:link { + color: #63bd65; +} + +a:visited { + color: #87ab63; +} + +a:hover, a:active { + color: #3fec43; +} + +div.profile-match-wrapper > div > a { + color: #ffffff; +} + +.btn, .btn-primary { + background-color: #5c6b5b; + border-bottom-color: #47741c; + border-left-color: #47741c; + border-right-color: #47741c; + border-top-color: #47741c; + color: #ffffff !important; +} + +.btn:hover, .btn-primary:active { + background-color: #4aae40; + border-bottom-color: #29b136; + border-left-color: #29b136; + border-right-color: #29b136; + border-top-color: #29b136; +} + +.bg-dark, .navbar-collapse { + background-color: #2e323e !important; +} + +.form-group:active, .checkbox:hover { + color: #41d24f; +} + +.nav-link.active { + background-color: #315a2b !important; +} + +.list-group-item { + background-color: #4B5162; + border-bottom: #383c4a; + border-left: #383c4a; + border-right: #383c4a; + border-top: #383c4a; + color: #9e9e9e; + border: 1px solid #383c4a; +} + +.list-group-item:hover, .list-group-item:active { + color: #f4f4f4 !important; +} + +.text-dark { + color: #bdbdbd !important; +} + +a.text-dark:hover, a.text-dark:active { + color: #f4f4f4 !important; +} + +.contactname { + color: #bdbdbd; +} + +.wall-item-ago, .dropdown-sub-text { + color: #b3b3b3; +} + +.list-group-item.active { + background-color: #315a2b; + border-color: #0c4704; +} + +.form-control, +.form-control:focus, +input[type="text"]:hover, +input[type="text"]:active, +input[type="text"], textarea { + background-color: #2b2b2b; + border-color: #46583f; + color: #cdcdcd; + box-shadow: 0 0 0 .2rem #415240; +} + +.form-group.checkbox:checked, +.form-group.checkbox > div > input:checked + label .onoffswitch-switch { + background-color: #315a2b; +} + +.form-group.checkbox:hover label { + color: #315a2b; +} + +.dropdown-item.active { + background-color: #315a2b; +} + +.dropdown-divider { + border-top: 1px solid #3e3e3e; +} + +.dropdown-item:active, .dropdown-item:focus, .dropdown-item:hover, .textcomplete-item:focus .dropdown-item, .textcomplete-item:hover .dropdown-item, .textcomplete-item.active .dropdown-item, .textcomplete-item:active .dropdown-item { + background-color: #4b5162; + color: #b3b3b3; +} + +a.dropdown-item { + color: #b3b3b3; +} + +.profile-match-wrapper { + border-top: 0px solid #eee; + border-left: 0px solid #eee; +} + +.fakelink { + color: #87ab63; +} + +a:hover, a:focus, .fakelink:hover, .fakelink:focus { + color: #3fec43; +} + +.drop-icons { + color: #ff0000; +} + +.drop-icons, a .drop-icons { + color: #bd0000; +} + +.section-content-wrapper-np { + background-color: #404552; +} + +.atoken-index-row:hover td, .chatroom-index-row:hover td, .group-index-row:hover td, .wikis-index-row:hover td, .locs-index-row:hover td, [id^="cloud-index-"]:hover td, .cloud-index-active { + background-color: #4b5162; +} + +.generic-content-wrapper-styled { + background-color: #404552; +} + +#profile-jot-wrapper, +.bootstrap-tagsinput { + background-color: #2b2b2b; +} + +.wall-item-content-wrapper { + background-color: #404552; +} + +.item-highlight { + border-left: 0.2rem solid #00ff00; +} + +.wall-item-comment-wrapper-wc, +.hide-comments-outer, +.wall-item-comment-wrapper, +.wall-item-content-wrapper.comment { + background-color: #4b5162; +} + +.wall-item-head-new { + border-top: 0.2rem solid #31570b; +} + +.wall-item-comment-wrapper { + border-top: 3px solid #454853; +} + +blockquote { + border-left: 3px solid #344136; +} + +.hide-comments-outer { + border-top-color: #87ab63; +} + +.badge-warning { + background-color: #036811; + color: #888888; +} + +.divgrow-showmore { + border-top: 1px dashed #87ab63; +} + +.comment-edit-text { + border: 1px solid #004400; +} + +#doco-content h3 { + border-bottom: #87ab63 3px solid; +} + +.section-content-info-wrapper { + color: #2aa650; + background-color: #17221b; + border-bottom: 3px solid #060d08; +} + +.spinner.s, .spinner.m, .spinner.l { + color: #13c613; + border-top: .2rem solid #02c102; + border-left: .2rem solid #123312; + border-right: .2rem solid #123312; + border-bottom: .2rem solid #123312; +} + +.wall-event-item { + background-color: #123312; +} + +.fs { + background-color: #123312; +} + +.bg-primary { + background-color: #315a2b !important; +} \ No newline at end of file diff --git a/ussrbasicpub/pdl/mod_pubstream.pdl b/ussrbasicpub/pdl/mod_pubstream.pdl index 700103c..5ece162 100644 --- a/ussrbasicpub/pdl/mod_pubstream.pdl +++ b/ussrbasicpub/pdl/mod_pubstream.pdl @@ -1,5 +1,5 @@ [region=aside] -[widget=pubtagcloud][var=trending]8[/var][var=limit]55[/var][/widget] +[widget=pubtagcloud][var=trending]8[/var][var=limit]100[/var][/widget] [/region] [region=right_aside] [widget=notifications][/widget] diff --git a/ussrbasicright/css/style.css b/ussrbasicright/css/style.css index 3bed665..70c6fe0 100644 --- a/ussrbasicright/css/style.css +++ b/ussrbasicright/css/style.css @@ -1524,8 +1524,11 @@ blockquote { } main { +/* left: -$aside_widthpx; width: calc( 100% + $aside_widthpx ); +*/ +/* !!!!! */ } main.region_1-on { @@ -1821,5 +1824,5 @@ dl.bb-dl > dd > li { } #region_1 { - display: none !important; + display: none; } diff --git a/ussrbasicright/js/ussrbasicright.js b/ussrbasicright/js/ussrbasicright.js index 911714c..c0fdcfd 100644 --- a/ussrbasicright/js/ussrbasicright.js +++ b/ussrbasicright/js/ussrbasicright.js @@ -118,6 +118,7 @@ function toggleAside() { } else { $('html, body').css('overflow-x', 'hidden'); + $('#region_1').toggleClass('zxcvb'); $('main').addClass('region_1-on') $('
').appendTo('section'); $('#left_aside_wrapper').stick_in_parent({ diff --git a/ussrbasicright/pdl/mod_channel.pdl b/ussrbasicright/pdl/mod_channel.pdl index 46f51ec..76f924c 100644 --- a/ussrbasicright/pdl/mod_channel.pdl +++ b/ussrbasicright/pdl/mod_channel.pdl @@ -2,13 +2,20 @@ [widget=cover_photo][/widget] [/region] [region=aside] +[widget=fullprofile][/widget] +[widget=tagcloud_wall][var=limit]50[/var][/widget] +[widget=categories][/widget] +[widget=archive][var=wall]1[/var][/widget] +[widget=common_friends][/widget] +[widget=newmember][/widget] +[widget=notifications][/widget] [/region] [region=right_aside] [widget=fullprofile][/widget] -[widget=notifications][/widget] [widget=tagcloud_wall][var=limit]50[/var][/widget] [widget=categories][/widget] [widget=archive][var=wall]1[/var][/widget] [widget=common_friends][/widget] [widget=newmember][/widget] +[widget=notifications][/widget] [/region] diff --git a/ussrbasicright/pdl/mod_pubstream.pdl b/ussrbasicright/pdl/mod_pubstream.pdl index 935f716..80b7a1a 100644 --- a/ussrbasicright/pdl/mod_pubstream.pdl +++ b/ussrbasicright/pdl/mod_pubstream.pdl @@ -1,7 +1,7 @@ [region=aside] [/region] [region=right_aside] -[widget=pubtagcloud][var=trending]8[/var][var=limit]20[/var][/widget] +[widget=pubtagcloud][var=trending]8[/var][var=limit]100[/var][/widget] [widget=notifications][/widget] [widget=newmember][/widget] [/region] diff --git a/ussrbasicright/pdl/mod_settings.pdl b/ussrbasicright/pdl/mod_settings.pdl index 38155bc..83818dd 100644 --- a/ussrbasicright/pdl/mod_settings.pdl +++ b/ussrbasicright/pdl/mod_settings.pdl @@ -1,4 +1,7 @@ [region=aside] +[widget=settings_menu][/widget] +[widget=notifications][/widget] +[widget=newmember][/widget] [/region] [region=right_aside] [widget=settings_menu][/widget] diff --git a/ussrbasicright/schema/zlax.css b/ussrbasicright/schema/zlax.css index 0a7f7d7..133592a 100644 --- a/ussrbasicright/schema/zlax.css +++ b/ussrbasicright/schema/zlax.css @@ -1,3 +1,8 @@ +/* reashred content fix */ +.reshared-content img { + width: auto; +} + .wall-item-like { visibility: hidden; } @@ -6,6 +11,10 @@ visibility: hidden; } +.allcontact-link { + display: none; +} + .fa-minus-circle { visibility: hidden; } @@ -15,3 +24,271 @@ div.tagblock > h3 { left: 33%; content: url(https://ussr.win/photo/73e2201da875ccae6fecadfcf8ccba55c6c8ac093634d2e4af8e0f3cec1f2de3.gif); } + +body { + background-color: #383c4a; + color: #dddddd; +} + +.generic-content-wrapper { + background-color: #383c4a; +} + +.section-subtitle-wrapper, +.collapse, +.show, +.section-title-wrapper { + background-color: #404552; + border-bottom-color: #2b2b2b; +} + +.vcard, .h-card, +.widget, .settings-widget, .section-subtitle-wrapper { + background-color: #4B5162; + border-bottom: #383c4a; + border-left: #383c4a; + border-right: #383c4a; + border-top: #383c4a; +} + +.fn { + color: #ffffff; +} + +.contextual-help-content, +.section-content-tools-wrapper, .section-content-wrapper { + background-color: #353945; + border-bottom: #383c4a; + border-left: #383c4a; + border-right: #383c4a; + border-top: #383c4a; +} + +a:link { + color: #63bd65; +} + +a:visited { + color: #87ab63; +} + +a:hover, a:active { + color: #3fec43; +} + +div.profile-match-wrapper > div > a { + color: #ffffff; +} + +.btn, .btn-primary { + background-color: #5c6b5b; + border-bottom-color: #47741c; + border-left-color: #47741c; + border-right-color: #47741c; + border-top-color: #47741c; + color: #ffffff !important; +} + +.btn:hover, .btn-primary:active { + background-color: #4aae40; + border-bottom-color: #29b136; + border-left-color: #29b136; + border-right-color: #29b136; + border-top-color: #29b136; +} + +.bg-dark, .navbar-collapse { + background-color: #2e323e !important; +} + +.form-group:active, .checkbox:hover { + color: #41d24f; +} + +.nav-link.active { + background-color: #315a2b !important; +} + +.list-group-item { + background-color: #4B5162; + border-bottom: #383c4a; + border-left: #383c4a; + border-right: #383c4a; + border-top: #383c4a; + color: #9e9e9e; + border: 1px solid #383c4a; +} + +.list-group-item:hover, .list-group-item:active { + color: #f4f4f4 !important; +} + +.text-dark { + color: #bdbdbd !important; +} + +a.text-dark:hover, a.text-dark:active { + color: #f4f4f4 !important; +} + +.contactname { + color: #bdbdbd; +} + +.wall-item-ago, .dropdown-sub-text { + color: #b3b3b3; +} + +.list-group-item.active { + background-color: #315a2b; + border-color: #0c4704; +} + +.form-control, +.form-control:focus, +input[type="text"]:hover, +input[type="text"]:active, +input[type="text"], textarea { + background-color: #2b2b2b; + border-color: #46583f; + color: #cdcdcd; + box-shadow: 0 0 0 .2rem #415240; +} + +.form-group.checkbox:checked, +.form-group.checkbox > div > input:checked + label .onoffswitch-switch { + background-color: #315a2b; +} + +.form-group.checkbox:hover label { + color: #315a2b; +} + +.dropdown-item.active { + background-color: #315a2b; +} + +.dropdown-divider { + border-top: 1px solid #3e3e3e; +} + +.dropdown-item:active, .dropdown-item:focus, .dropdown-item:hover, .textcomplete-item:focus .dropdown-item, .textcomplete-item:hover .dropdown-item, .textcomplete-item.active .dropdown-item, .textcomplete-item:active .dropdown-item { + background-color: #4b5162; + color: #b3b3b3; +} + +a.dropdown-item { + color: #b3b3b3; +} + +.profile-match-wrapper { + border-top: 0px solid #eee; + border-left: 0px solid #eee; +} + +.fakelink { + color: #87ab63; +} + +a:hover, a:focus, .fakelink:hover, .fakelink:focus { + color: #3fec43; +} + +.drop-icons { + color: #ff0000; +} + +.drop-icons, a .drop-icons { + color: #bd0000; +} + +.section-content-wrapper-np { + background-color: #404552; +} + +.atoken-index-row:hover td, .chatroom-index-row:hover td, .group-index-row:hover td, .wikis-index-row:hover td, .locs-index-row:hover td, [id^="cloud-index-"]:hover td, .cloud-index-active { + background-color: #4b5162; +} + +.generic-content-wrapper-styled { + background-color: #404552; +} + +#profile-jot-wrapper, +.bootstrap-tagsinput { + background-color: #2b2b2b; +} + +.wall-item-content-wrapper { + background-color: #404552; +} + +.item-highlight { + border-left: 0.2rem solid #00ff00; +} + +.wall-item-comment-wrapper-wc, +.hide-comments-outer, +.wall-item-comment-wrapper, +.wall-item-content-wrapper.comment { + background-color: #4b5162; +} + +.wall-item-head-new { + border-top: 0.2rem solid #31570b; +} + +.wall-item-comment-wrapper { + border-top: 3px solid #454853; +} + +blockquote { + border-left: 3px solid #344136; +} + +.hide-comments-outer { + border-top-color: #87ab63; +} + +.badge-warning { + background-color: #036811; + color: #888888; +} + +.divgrow-showmore { + border-top: 1px dashed #87ab63; +} + +.comment-edit-text { + border: 1px solid #004400; +} + +#doco-content h3 { + border-bottom: #87ab63 3px solid; +} + +.section-content-info-wrapper { + color: #2aa650; + background-color: #17221b; + border-bottom: 3px solid #060d08; +} + +.spinner.s, .spinner.m, .spinner.l { + color: #13c613; + border-top: .2rem solid #02c102; + border-left: .2rem solid #123312; + border-right: .2rem solid #123312; + border-bottom: .2rem solid #123312; +} + +.wall-event-item { + background-color: #123312; +} + +.fs { + background-color: #123312; +} + +.bg-primary { + background-color: #315a2b !important; +} \ No newline at end of file