From 6f24f6ee5e0b46aa3adbddb6894e3519ce247ce0 Mon Sep 17 00:00:00 2001 From: dsrev Date: Mon, 13 Jul 2020 06:55:45 +0300 Subject: [PATCH] Fixing issues (?) on some pages --- Web/Presenters/templates/Group/Create.xml | 12 +- Web/Presenters/templates/Photos/AlbumList.xml | 2 +- .../templates/Photos/CreateAlbum.xml | 9 +- Web/Presenters/templates/User/Edit.xml | 22 +-- Web/Presenters/templates/User/Groups.xml | 2 +- Web/Presenters/templates/Videos/Edit.xml | 15 +- Web/Presenters/templates/Videos/Upload.xml | 9 +- Web/static/css/style.css | 175 +++++++----------- 8 files changed, 105 insertions(+), 141 deletions(-) diff --git a/Web/Presenters/templates/Group/Create.xml b/Web/Presenters/templates/Group/Create.xml index 1d2a8612..af5ae7cb 100644 --- a/Web/Presenters/templates/Group/Create.xml +++ b/Web/Presenters/templates/Group/Create.xml @@ -1,14 +1,15 @@ {extends "../@layout.xml"} -{block title}Создать группу{/block} +{block title}{_"create_group"}{/block} {block header} - Создать группу + {_"create_group"} {/block} {block content} -

Основная информация

+
+

{_"create_group"}

- +
@@ -38,4 +39,5 @@
@@ -23,7 +24,7 @@ {_"description"}: - +
+
{/block} diff --git a/Web/Presenters/templates/Photos/AlbumList.xml b/Web/Presenters/templates/Photos/AlbumList.xml index c612a5e7..0c964e47 100644 --- a/Web/Presenters/templates/Photos/AlbumList.xml +++ b/Web/Presenters/templates/Photos/AlbumList.xml @@ -2,7 +2,7 @@ {var iterator = iterator_to_array($albums)} {var page = $paginatorConf->page} -{block title}Альбомы {$owner->getCanonicalName()}{/block} +{block title}{_"albums"} {$owner->getCanonicalName()}{/block} {block header} {$owner->getCanonicalName()} diff --git a/Web/Presenters/templates/Photos/CreateAlbum.xml b/Web/Presenters/templates/Photos/CreateAlbum.xml index 02ec36fe..475cabaa 100644 --- a/Web/Presenters/templates/Photos/CreateAlbum.xml +++ b/Web/Presenters/templates/Photos/CreateAlbum.xml @@ -1,5 +1,5 @@ {extends "../@layout.xml"} -{block title}Создать альбом{/block} +{block title}{_"creating_album"}{/block} {block header} {ifset $club} @@ -16,8 +16,10 @@ {/block} {block content} +
+

{_"creating_album"}

- +
@@ -25,7 +27,7 @@ - + @@ -37,4 +39,5 @@
{_"name"}:
{_"description"}:
+
{/block} diff --git a/Web/Presenters/templates/User/Edit.xml b/Web/Presenters/templates/User/Edit.xml index 46f85ca2..f969576c 100644 --- a/Web/Presenters/templates/User/Edit.xml +++ b/Web/Presenters/templates/User/Edit.xml @@ -36,7 +36,7 @@

{_"main_information"}

- +
@@ -145,7 +145,7 @@

{_"contact_information"}

- +
@@ -196,14 +196,14 @@

{_"personal_information"}

- +
@@ -211,7 +211,7 @@ {_"favorite_music"}: @@ -219,7 +219,7 @@ {_"favorite_films"}: @@ -227,7 +227,7 @@ {_"favorite_shows"}: @@ -235,7 +235,7 @@ {_"favorite_books"}: @@ -243,7 +243,7 @@ {_"favorite_quotes"}: @@ -251,7 +251,7 @@ {_"information_about"}: @@ -271,7 +271,7 @@

{_"profile_picture"}

-
{_"interests"}: - +
- +
- +
- +
- +
- +
- +
+
diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml index 171eddd6..6e6d6348 100644 --- a/Web/Presenters/templates/User/Groups.xml +++ b/Web/Presenters/templates/User/Groups.xml @@ -2,7 +2,7 @@ {var iterator = $user->getClubs($page)} {var count = $user->getClubCount()} -{block title}Группы{/block} +{block title}{_"groups"}{/block} {block header} {$user->getCanonicalName()} » {_"groups"} diff --git a/Web/Presenters/templates/Videos/Edit.xml b/Web/Presenters/templates/Videos/Edit.xml index a0fdc6fa..6333a748 100644 --- a/Web/Presenters/templates/Videos/Edit.xml +++ b/Web/Presenters/templates/Videos/Edit.xml @@ -3,13 +3,19 @@ {block header} {$thisUser->getCanonicalName()} - » - Видеозапись + » + {_"videos"} + » + {_"video"} + » + Изменить видеозапись {/block} {block content} +
+

Изменить видеозапись

- +
@@ -20,7 +26,7 @@ @@ -33,4 +39,5 @@
{_"name"}:
{_"description"}: - +
+
{/block} diff --git a/Web/Presenters/templates/Videos/Upload.xml b/Web/Presenters/templates/Videos/Upload.xml index e4e9f9eb..d5f3a525 100644 --- a/Web/Presenters/templates/Videos/Upload.xml +++ b/Web/Presenters/templates/Videos/Upload.xml @@ -1,5 +1,5 @@ {extends "../@layout.xml"} -{block title}Загрузить видео{/block} +{block title}{_"upload_video"}{/block} {block header} {$thisUser->getCanonicalName()} @@ -10,8 +10,10 @@ {/block} {block content} +
+

{_"upload_video"}

- +
@@ -19,7 +21,7 @@ - + @@ -39,4 +41,5 @@
{_"name"}:
{_"description"}:
{_"video"}:
+
{/block} diff --git a/Web/static/css/style.css b/Web/static/css/style.css index 5fd69aca..3f470164 100644 --- a/Web/static/css/style.css +++ b/Web/static/css/style.css @@ -1,9 +1,10 @@ -/* +/* Website's Style Developers: Veselcraft -*/ +*/ + html { overflow-y: scroll; } @@ -15,7 +16,6 @@ body { text-align: left; font-family: tahoma, verdana, arial, sans-serif; font-size: 11px; - /* cursor: url('/style/pizda1.cur'), pointer; */ } span { @@ -25,10 +25,8 @@ span { } .nobold { - font-weight: normal; color: gray; - } a { @@ -42,23 +40,19 @@ a { margin: 0 auto; } -/* header crap */ - .page_header { position: relative; width: 791px; height: 45px; background-repeat: no-repeat; background-position: 0; - background: url(../img/header.png); + background: url('../img/header.png'); } #page_act { - border-bottom: 1px solid -#d5dde6; -padding: 2px 10px 5px 10px; -color: - #2B587A; + border-bottom: 1px solid #d5dde6; + padding: 2px 10px 5px 10px; + color: #2B587A; width: 608px; margin-left: -10px; } @@ -83,7 +77,7 @@ color: height: 29px; padding: 11px 4px 0 7px; background-size: 1.5px 41px; - background: url(../img/divider.png) no-repeat; + background: url('../img/divider.png') no-repeat; } .header_navigation .link a { @@ -97,14 +91,10 @@ color: color: #fff; } -/* Sidebar crap */ - .sidebar { - width: 118px; margin: 4px 0 0 4px; float: left; - } .navigation { @@ -113,7 +103,6 @@ color: } .navigation .link { - display: block; padding: 3px 3px 3px 6px; text-decoration: none; @@ -127,8 +116,6 @@ color: cursor: pointer; background: none; margin-bottom: 1px; - - } .navigation .link:hover { @@ -160,38 +147,30 @@ color: border-top: 1px solid #CCCCCC; } -/* page crap */ - .page_body { - width: 632px; float: right; margin-right: 15px; margin-top: -2px; font-size: 11px; text-align: left; - } .wrap1 { - border: 1px solid #EBF0F4; border-top: 0px; - width: 626px; + width: auto; } .wrap2 { - border-right: 1px solid #F6F8FA; border-top: 0px; - } - .page_yellowheader { padding: 4px 10px 5px; font-weight: bold; - background: url(../img/header_yellow.png) repeat-x; + background: url('../img/header_yellow.png') repeat-x; background-color: #EEE5B8; border-right: solid 1px #DCD4A4; border-left: solid 1px #E4DDB4; @@ -200,16 +179,13 @@ color: } #wrapHI { - border-right: solid 1px #D5DDE6; border-left: solid 1px #D5DDE6; - } -#wrapH { +#wrapH { border-right: solid 1px #EAEEF3; border-left: solid 1px #EAEEF3; - } .page_yellowheader span { @@ -298,22 +274,16 @@ color: width: 200px; text-align: left; cursor: pointer; - } + #profile_links { - margin: 10px 0; - } #profile_link:hover, .profile_link:hover { - background: #ECECEC; - } -/* на этом месте я заплакал */ - .page_footer { margin-left: 95px; padding-top: 5px; @@ -323,8 +293,7 @@ color: table { font-size: 11px; - text-align: left; - /* ненавижу, блять, костыли */ + text-align: left; } .information { @@ -337,14 +306,6 @@ table { background-color: #ffc3c3; } -/* kun vi tre agrable pensi pri morto - -кстати это из песни дельфина взято -вдруг кто не знал -я просто влюблён, извините за -пиздобляские комментарии в CSS коде -<3 */ - .page_footer .link { padding: 3px 7px; display: inline-block; @@ -360,8 +321,6 @@ table { margin-bottom: 6px; } - - .page_status { font-weight: normal; font-size: 11px; @@ -371,14 +330,6 @@ table { max-height: 39px; height: auto !important; } -/* - -у тебя спид -и значит мы умрём - -*/ - -/* and we begin to make some graphic crap */ .button { border-radius: 2px; @@ -461,7 +412,7 @@ input[type=checkbox]:checked { } .content_title_unexpanded { - background-image: url(../img/flex_arrow_shut.gif); + background-image: url('../img/flex_arrow_shut.gif'); background-repeat: no-repeat; background-color: #eee; border-top: solid 1px #ccc; @@ -511,8 +462,6 @@ h4 { font-family: verdana, arial, sans-serif; } -/* post */ - .post { width: 100%; overflow: hidden; @@ -649,40 +598,35 @@ table.User { margin-bottom: -10px; } -/* МОНТИРУЮ МОНТИРУЮ БЛЯТЬ */ - .container_gray .content { background: #fff; padding: 5px; border: #DEDEDE solid 1px; clear: both; } + .tabs { border-bottom: 1px solid #707070; margin-left: -12px; margin-right: -6px; - } -#activetabs { +#activetabs { background: #707070; border-radius: 3px 3px 0px 0px; - } -.tab { +.tab { display: inline-block; padding: 4px 6px; margin-left: 15px; - } + #act_tab_a { - color: white; - } -.container_gray .content { +.container_gray .content { background: #fff; padding: 4px; border: #DEDEDE solid 1px; @@ -695,7 +639,6 @@ table.User { border: #DEDEDE solid 1px; padding: 6px; margin-top:6px; - } .ovk-album { @@ -812,19 +755,24 @@ table.User { height: 40px; object-fit: cover; } + .dialogi td { vertical-align: top; padding: 5px; } + .dialogi { border-collapse: collapse; } + .dialogi tr:first-child { border: none; } + .dialogi tr { border-top: 1px solid #ddd; } + .messenger-app--input---messagebox textarea { width: 100%; height: 40px !important; @@ -837,6 +785,7 @@ table.User { height: 72px !important; border-top: 1px solid #d6d6d6; } + .messenger-app--input---messagebox .button { float: right; } @@ -849,24 +798,16 @@ table.User { display: grid; grid-template-columns: 32px 32px 32px 1fr; padding: 8px; - border-bottom: 1px solid -#c1c1c1; + border-bottom: 1px solid #c1c1c1; border-bottom-style: solid; -border-bottom-style: dashed; + border-bottom-style: dashed; } - .music-app--player .play, .music-app--player .perv, .music-app--player .next { - -webkit-appearance: none; -moz-appearance: none; - background-color: - -#507597; - -color: - - #fff; + background-color: #507597; + color: #fff; height: 20px; margin: 5px; border: none; @@ -874,7 +815,6 @@ color: cursor: pointer; padding: 0; font-size: 10px; - } .music-app--player .info { @@ -891,30 +831,19 @@ color: } .music-app--player .info .track { - margin-top: 8px; height: 5px; width: 70%; - background-color: - -#fff; - -border-top: 1px solid - - #507597; + background-color: #fff; + border-top: 1px solid #507597; float: left; - } .music-app--player .info .track .inner-track { - - background-color: - - #507597; + background-color: #507597; height: inherit; width: 15px; opacity: .7; - } .settings_delete { @@ -930,6 +859,8 @@ textarea { border: 1px solid #C0CAD5; font-size: 9pt; min-height: 42px; + width: 100%; + resize: none; } #faqhead { @@ -1028,13 +959,6 @@ body.scrolled .toTop:hover { cursor: pointer; } -/* бля чуваки я извиняюсь -за пиздострадательские комментарии -в коде мне одиноко просто было -(да и в принципе и сейчас) */ - -/* Vriska-chan was here */ - .ugc-table.slim { width: 100%; } @@ -1101,53 +1025,64 @@ body.scrolled .toTop:hover { width: 100%; display: block; } + .like_wrap { color: #2F5879; font-size: 10px; cursor: pointer; float: right; } + .heart { - background: url(/assets/packages/static/openvk/img/like.gif) no-repeat 1px 0px; + background: url('/assets/packages/static/openvk/img/like.gif') no-repeat 1px 0px; height: 10px; margin: 2px 3px 0px; width: 11px; float: left; } + .likeCnt { font-size: 10px; margin-right: 3px; float: left; } + .heart:hover { opacity: 1 !important; } + .content_title_expanded { margin-top: 5px; } + .page-wrap { border-bottom: solid 1px #C3CAD2; border-left: solid 1px #DAE1E8; border-right: solid 1px #DAE1E8; padding: 10px; } + .wrap1 { width: auto; border: 1px solid #EBF0F4; border-top: 0px; } + .wrap2 { border-right: 1px solid #F6F8FA; border-top: 0px; } + #wrapH { border-right: solid 1px #EAEEF3; border-left: solid 1px #EAEEF3; } + #wrapHI { border-right: solid 1px #D5DDE6; border-left: solid 1px #D5DDE6; } + .ugc-table td { vertical-align: top !important; font-size: 11px; @@ -1155,28 +1090,34 @@ body.scrolled .toTop:hover { margin: 0px; padding: 1px 0px 1px 0px; } + .label { width: 120px !important; color: gray; } + .ugc-table tr > td:nth-of-type(2) { display: block; width: unset; overflow: hidden; } + .right_big_block { width: 396px; float: right; } + #basicInfo { padding: 5px 0px 15px 8px; } + .accountInfo { padding: 0px; margin: 0px 0px 0px 8px; border-bottom: solid 1px #DAE1E8; - display: block; + display: block; } + .profileName { width: 225px; color: #45688E; @@ -1185,6 +1126,7 @@ body.scrolled .toTop:hover { margin: 0px; padding: 2px 5px 0px 0px; } + .profileName h2 { color: #45688E; font-size: 13px; @@ -1192,32 +1134,39 @@ body.scrolled .toTop:hover { margin: 0px; padding: 0px; } + .notes_titles { margin: 0px; padding: 0px; list-style: none; } + .written { - background: url(/assets/packages/static/openvk/img/note.gif) no-repeat 0px 1px; + background: url('/assets/packages/static/openvk/img/note.gif') no-repeat 0px 1px; padding: 0px 0px 6px 22px; } + .written a { display: block; padding: 0px 0px 1px 0px; } + .notes_titles small { color: #333; font-weight: normal; display: block; font-size: 9px; } + .notes_titles small a { display: inline; font-weight: normal; } + .data { width: 260px !important; } + .right_big_block h4 { margin: 1px 0px 0px; padding: 4px 0px 2px !important;