diff --git a/view/global.css b/view/global.css index 3fb31a30c..b8fe5723f 100644 --- a/view/global.css +++ b/view/global.css @@ -273,19 +273,19 @@ img.acpopup-img { /* plain text editor upload/select popup */ -.fbrowser .path a { padding: 5px; } -.fbrowser .path a:before { content: "/"; padding-right: 5px;} +.fbrowser .path a, .fbrowser .path .btn-link { padding: 5px; } +.fbrowser .path a:before, .fbrowser .path .btn-link:before { content: "/"; padding-right: 5px;} .fbrowser .folders ul { list-style-type: none; padding-left: 10px;} .fbrowser .list { height: auto; overflow-y: hidden; margin: 10px 0px; } .fbrowser.image .photo-album-image-wrapper { float: left; } -.fbrowser.image a img { height: 48px; } -.fbrowser.image a p { display: none;} +.fbrowser.image a img, .fbrowser.image .btn-link img { height: 48px; } +.fbrowser.image a p, .fbrowser.image .btn-link p { display: none;} .fbrowser.file .photo-album-image-wrapper { float:none; white-space: nowrap; } .fbrowser.file img { display: inline; } .fbrowser.file p { display: inline; white-space: nowrap; } .fbrowser .upload { clear: both; padding-top: 1em;} .fbrowser .error { background: #ffeeee; border: 1px solid #994444; color: #994444; padding: 0.5em;} -.fbrowser .error a.close { float: right; font-weight: bold; } +.fbrowser .error .close { float: right; font-weight: bold; } .fbrowser .error.hidden { display: none; } a { diff --git a/view/theme/frio/css/mod_events.css b/view/theme/frio/css/mod_events.css index 5ca223001..6512d1bbe 100644 --- a/view/theme/frio/css/mod_events.css +++ b/view/theme/frio/css/mod_events.css @@ -25,7 +25,7 @@ #event-calendar-title { vertical-align: middle; } -a#event-calendar-views { +#event-calendar-views { padding: 6px 9px; font-size: 14px } diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 946f71e21..245cd39ff 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -51,10 +51,14 @@ body a[name]:not([href]) { visibility: hidden; } -body a:hover, body a:focus, body a:active, body a.active, body .btn-link:hover{ +body a:hover, .btn-link:hover, +body a:focus, .btn-link:focus, +body a:active, .btn-link:active, +body a.active, .btn-link.active { /*color: #59d6e4;*/ color: $link_hover_color; text-decoration: none; + outline: none; } .wall-item-container a:hover { @@ -186,6 +190,12 @@ a#item-delete-selected { outline: 0; background: $btn_primary_hover_color !important; } +.btn-default:active, .btn-default.active { + color: $link_color; +} +.btn-default:active:hover, .btn-default.active:hover { + color: $link_hover_color; +} .btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover, .btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover, .open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus, @@ -196,10 +206,13 @@ a#item-delete-selected { } .btn-link { + border: 0; color: $link_color; + padding-left: 0; + padding-right: 0; } -.btn-link:focus, .btn-link:hover { - color: #23527c; +.btn { + color: inherit; } .btn-eventnav, btn-eventnav:hover { font-size: 16px; @@ -395,7 +408,8 @@ header #banner #logo-img, top: 2px; right: 10px } -.topbar .dropdown-header .dropdown-header-link a { +.topbar .dropdown-header .dropdown-header-link a, +.topbar .dropdown-header .dropdown-header-link .btn-link { /*color: #6fdbe8!important;*/ color: $link_color !important; font-size: 12px; @@ -548,9 +562,8 @@ nav.navbar .nav>li>a:focus{ #topbar-first .dropdown-footer { margin: 10px 10px 5px } -#topbar-first a, -nav.navbar a { - /*color: #fff*/ +#topbar-first a, #topbar-first .btn-link, +nav.navbar a, nav.navbar .btn-link { color: $nav_icon_color; } #topbar-first .caret { @@ -644,10 +657,12 @@ nav.navbar a { #myNavmenu li.nav-sitename { font-weight: bold; } -#topbar-first .dropdown.account>a, -#topbar-first .dropdown.account.open>a, -#topbar-first .dropdown.account>a:hover, -#topbar-first .dropdown.account.open>a:hover { +#topbar-first .dropdown.account > a, +#topbar-first .dropdown.account.open > a, +#topbar-first .dropdown.account > button, +#topbar-first .dropdown.account.open > button, +#topbar-first .dropdown.account > :hover, +#topbar-first .dropdown.account.open > :hover { background-color: $nav_bg; } #topbar-first .dropdown.account li#nav-sitename { @@ -696,7 +711,7 @@ nav.navbar a { @media screen and (max-width: 767px) { #topbar-second > .container, #topbar-second #navbar-button { - padding: 0; + padding: 0; } } #topbar-second .dropdown-menu { @@ -815,6 +830,25 @@ nav.navbar a { } /* Dropdown Menus */ +.nav > li > .btn-link { + position: relative; + display: block; + padding: 10px 15px; +} +.nav > li > .btn-link:focus, +.nav > li > .btn-link:hover { + text-decoration: none; + background-color: #eee; +} +.nav .open > .btn-link, +.nav .open > .btn-link:focus, +.nav .open > .btn-link:hover { + background-color: #eee; + border-color: #337ab7; +} +.nav-pills > li > .btn-link { + border-radius: 4px; +} .nav-pills .dropdown-menu, .nav-tabs .dropdown-menu, .account .dropdown-menu, @@ -836,41 +870,43 @@ nav.navbar a { .contact-photo-wrapper .dropdown-menu li { border-left: 3px solid $nav_bg; } -.nav-pills .dropdown-menu li a, -.nav-tabs .dropdown-menu li a, -.account .dropdown-menu li a, -.contact-photo-wrapper .dropdown-menu li a { +.nav-pills .dropdown-menu li a, .nav-pills .dropdown-menu li .btn-link, +.nav-tabs .dropdown-menu li a, .nav-tabs .dropdown-menu li .btn-link, +.account .dropdown-menu li a, .account .dropdown-menu li .btn-link, +.contact-photo-wrapper .dropdown-menu li a, .contact-photo-wrapper .dropdown-menu li .btn-link { color: $nav_icon_color; font-weight: 400; font-size: 13px; padding: 4px 15px; text-transform: capitalize; + width: 100%; + text-align: left; } -.nav-pills .dropdown-menu li a i, -.nav-tabs .dropdown-menu li a i, -.account .dropdown-menu li a i, -.contact-photo-wrapper .dropdown-menu li a i { +.nav-pills .dropdown-menu li a i, .nav-pills .dropdown-menu li .btn-link i, +.nav-tabs .dropdown-menu li a i, .nav-tabs .dropdown-menu li .btn-link i, +.account .dropdown-menu li a i, .account .dropdown-menu li .btn-link i, +.contact-photo-wrapper .dropdown-menu li a i, .contact-photo-wrapper .dropdown-menu li .btn-link i { margin-right: 5px; font-size: 14px; display: inline-block; width: 14px } -.nav-pills .dropdown-menu li a:hover, -.nav-tabs .dropdown-menu li a:hover, -.account .dropdown-menu li a:hover, -.contact-photo-wrapper .dropdown-menu li a:hover, -.nav-pills .dropdown-menu li a:visited, -.nav-tabs .dropdown-menu li a:visited, -.account .dropdown-menu li a:visited, -.contact-photo-wrapper .dropdown-menu li a:visited, -.nav-pills .dropdown-menu li a:hover, -.nav-tabs .dropdown-menu li a:hover, -.account .dropdown-menu li a:hover, -.contact-photo-wrapper .dropdown-menu li a:hover, -.nav-pills .dropdown-menu li a:focus, -.nav-tabs .dropdown-menu li a:focus, -.account .dropdown-menu li a:focus, -.contact-photo-wrapper .dropdown-menu li a:focus { +.nav-pills .dropdown-menu li a:hover, .nav-pills .dropdown-menu li .btn-link:hover, +.nav-tabs .dropdown-menu li a:hover, .nav-tabs .dropdown-menu li .btn-link:hover, +.account .dropdown-menu li a:hover, .account .dropdown-menu li .btn-link:hover, +.contact-photo-wrapper .dropdown-menu li a:hover, .contact-photo-wrapper .dropdown-menu li .btn-link:hover, +.nav-pills .dropdown-menu li a:visited, .nav-pills .dropdown-menu li .btn-link:visited, +.nav-tabs .dropdown-menu li a:visited, .nav-tabs .dropdown-menu li .btn-link:visited, +.account .dropdown-menu li a:visited, .account .dropdown-menu li .btn-link:visited, +.contact-photo-wrapper .dropdown-menu li a:visited, .contact-photo-wrapper .dropdown-menu li .btn-link:visited, +.nav-pills .dropdown-menu li a:hover, .nav-pills .dropdown-menu li .btn-link:hover, +.nav-tabs .dropdown-menu li a:hover, .nav-tabs .dropdown-menu li .btn-link:hover, +.account .dropdown-menu li a:hover, .account .dropdown-menu li .btn-link:hover, +.contact-photo-wrapper .dropdown-menu li a:hover, .contact-photo-wrapper .dropdown-menu li .btn-link:hover, +.nav-pills .dropdown-menu li a:focus, .nav-pills .dropdown-menu li .btn-link:focus, +.nav-tabs .dropdown-menu li a:focus, .nav-tabs .dropdown-menu li .btn-link:focus, +.account .dropdown-menu li a:focus, .account .dropdown-menu li .btn-link:focus, +.contact-photo-wrapper .dropdown-menu li a:focus, .contact-photo-wrapper .dropdown-menu li .btn-link:focus { background: 0 0 } .nav-pills .dropdown-menu li:hover, @@ -1171,8 +1207,8 @@ section #jotOpen { .jothidden { /*display: none;*/ } -#jot-modal .modal-header a, -#profile-jot-submit-wrapper a { +#jot-modal .modal-header a, #jot-modal .modal-header .btn-link, +#profile-jot-submit-wrapper a, #profile-jot-submit-wrapper .btn-link { color: #555; text-transform: capitalize; } @@ -1315,8 +1351,6 @@ section #jotOpen { .wall-item-container a, .wall-item-container .fakelink, .toplevel_item .fakelink, -.toplevel_item .wall-item-container .btn-link, -.wall-item-container .btn-link, .toplevel_item .wall-item-container .wall-item-responses a { color: #555; -webkit-transition: all 0.25s ease-in-out; @@ -1327,7 +1361,6 @@ section #jotOpen { } .toplevel_item:hover .fakelink, .wall-item-container:hover .fakelink, -.toplevel_item:hover .wall-item-container:hover .btn-link, .toplevel_item:hover .wall-item-container:hover .wall-item-responses a, .toplevel_item:hover .wall-item-content a, .toplevel_item:hover .wall-item-name, @@ -1497,8 +1530,8 @@ section #jotOpen { @media screen and (max-width: 767px) { .shared-wrapper, .vevent { - margin-left: 0px; - margin-right: 0px; + margin-left: 0px; + margin-right: 0px; } } .shared-wrapper:hover, @@ -1543,19 +1576,18 @@ code > .hl-main { } /* item social action buttons */ -.wall-item-actions, .wall-item-actions a { +.wall-item-actions { + margin-top: 15px; +} +.wall-item-actions, .wall-item-actions a, .wall-item-actions button { font-size: 13px; color: #555; - margin-top: 15px; margin-bottom: 0; } -.wall-item-actions a.active { +.wall-item-actions .active { font-weight: bold; } -.wall-item-actions a:hover { - color: #555; -} -.wall-item-actions a.active:hover { +.wall-item-actions .active:hover { color: $link_color; } .wall-item-actions-left { @@ -1576,10 +1608,11 @@ code > .hl-main { .wall-item-actions .button-comments, .wall-item-actions .button-votes, .wall-item-actions .button-likes { - padding-left: 0px; - padding-right: 0px; text-transform: capitalize; } +.wall-item-actions .separator { + margin: 0 .3em; +} /* wall item hover effects */ .wall-item-container .wall-item-links, @@ -1662,8 +1695,8 @@ code > .hl-main { padding-top: 5px !important; padding-bottom: 5px !important; } -.comment-icon-list a.icon, -.comment-icon-list a.icon:hover { +.comment-icon-list > li > .icon, +.comment-icon-list > li > .icon:hover { color: #555; background-color: transparent; } @@ -1793,12 +1826,14 @@ ul.dropdown-menu li:hover { /* Dropdown Menu */ -.dropdown-menu li a { +.dropdown-menu li a, +.dropdown-menu li .btn-link { font-size: 13px!important; font-weight: 600!important; } -.dropdown-menu li a:hover, .dropdown-menu li a:visited, -.dropdown-menu li a:hover, .dropdown-menu li a:focus { +.dropdown-menu li > :hover, +.dropdown-menu li > :visited, +.dropdown-menu li > :focus { background: 0 0; } @@ -2010,22 +2045,22 @@ ul.viewcontact_wrapper > li { .contact-wrapper .contact-actions { display: flex; } -.contact-wrapper a.contact-action-link { +.contact-wrapper .contact-action-link, +.contact-wrapper .contact-action-link:hover, +.textcomplete-item .contact-wrapper .contact-action-link { + padding: 0 5px; + color: #555; + border: 0; +} +.contact-wrapper .contact-action-link { opacity: 0.1; transition: all 0.25s ease-in-out; } -.contact-wrapper a.contact-action-link, -.contact-wrapper a.contact-action-link:hover, -.textcomplete-item .contact-wrapper a.contact-action-link { - padding-right: 5px; - padding-left: 5px; - color: #555; -} -ul li:hover .contact-wrapper a.contact-action-link { +ul li:hover .contact-wrapper .contact-action-link { opacity: 0.8; transition: all 0.25s ease-in-out; } -ul li:hover .contact-wrapper a.contact-action-link:hover { +ul li:hover .contact-wrapper .contact-action-link:hover { opacity: 1; } #contacts-search-wrapper, diff --git a/view/theme/frio/js/filebrowser.js b/view/theme/frio/js/filebrowser.js index a66309865..d216c40f3 100644 --- a/view/theme/frio/js/filebrowser.js +++ b/view/theme/frio/js/filebrowser.js @@ -91,13 +91,13 @@ var FileBrowser = { // We need to add the AjaxUpload to the button FileBrowser.uploadButtons(); - $(".error a.close").on("click", function(e) { + $(".error .close").on("click", function(e) { e.preventDefault(); $(".error").addClass("hidden"); }); // Click on album link - $(".fbrowser").on("click", ".folders a, .path a", function(e) { + $(".fbrowser").on("click", ".folders a, .path a, .folders button, .path button", function(e) { e.preventDefault(); var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none"; $(".fbrowser-content").hide(); @@ -112,7 +112,6 @@ var FileBrowser = { FileBrowser.uploadButtons(); } }); - }); //embed on click diff --git a/view/theme/frio/js/hovercard.js b/view/theme/frio/js/hovercard.js index d9f942916..c3396b762 100644 --- a/view/theme/frio/js/hovercard.js +++ b/view/theme/frio/js/hovercard.js @@ -1,11 +1,11 @@ -/* +/* * The javascript for friendicas hovercard. Bootstraps popover is needed. - * - * Much parts of the code are from Hannes Mannerheims + * + * Much parts of the code are from Hannes Mannerheims * qvitter code (https://github.com/hannesmannerheim/qvitter) - * + * * It is licensed under the GNU Affero General Public License - * + * */ $(document).ready(function(){ // Elements with the class "userinfo" will get a hover-card. @@ -164,7 +164,7 @@ function getContactData(purl, url, actionOnSuccess) { // The nurl will be the identifier in the object if(data.nurl.length > 0) { // Test if the contact is allready connected with the user (if url containing - // the expression ("redir/") We will store different cache keys + // the expression ("redir/") We will store different cache keys if((data.url.search("redir/")) >= 0 ) { var key = data.url; } else { @@ -212,7 +212,7 @@ function getHoverCardContent(purl, url, callback) { }); // This is interisting. this pice of code ajax request are done asynchron. -// To make it work getHOverCardTemplate() and getHOverCardData have to return it's +// To make it work getHOverCardTemplate() and getHOverCardData have to return it's // data (no succes handler for each of this). I leave it here, because it could be useful. // https://lostechies.com/joshuaflanagan/2011/10/20/coordinating-multiple-ajax-requests-with-jquery-when/ // $.when( @@ -283,49 +283,3 @@ function getHoverCardVariables(object) { return variables; } - -// This is the html template for the hover-card -// Since we grab the original hovercard.tpl we don't -// need it anymore -function hovercard_template() { - var tempate = '\ -
\ -
\ -
\ -
\ - \ - \ - \ -
\ -
\ -
\ -

{{$profile.name}}

{{if $profile.account_type}}{{$profile.account_type}}{{/if}}\ -
\ -
\ - {{$profile.addr}}\ - {{if $profile.network}} ({{$profile.network}}){{/if}}\ -
\ - {{*{{if $profile.about}}
{{$profile.about}}
{{/if}}*}}\ -\ -
\ -
\ - {{* here are the differnt actions like privat message, poke, delete and so on *}}\ - {{* @todo we have two different photo menus one for contacts and one for items at the network stream. We currently use the contact photo menu, so the items options are missing We need to move them *}}\ -
\ - {{if $profile.actions.pm}}{{/if}}\ - {{if $profile.actions.poke}}{{/if}}\ -
\ -
\ - {{if $profile.actions.edit}}{{/if}}\ - {{if $profile.actions.drop}}{{/if}}\ - {{if $profile.actions.follow}}{{/if}}\ -
\ -
\ -
\ -\ -
\ -\ -
\ -
\ - {{if $profile.tags}}
{{$profile.tags}}
{{/if}}'; -} diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js index 62cd85df9..4e8ede07f 100644 --- a/view/theme/frio/js/theme.js +++ b/view/theme/frio/js/theme.js @@ -617,3 +617,24 @@ function htmlToText(htmlString) { return text; } + +/** + * Sends a /like API call and updates the display of the relevant action button + * before the update reloads the item. + * + * @param {string} ident The id of the relevant item + * @param {string} verb The verb of the action + * @returns {undefined} + */ +function doLikeAction(ident, verb) { + unpause(); + + if (verb.indexOf('attend') === 0) { + $('.item-' + ident + ' .button-event:not(#' + verb + '-' + ident + ')').removeClass('active'); + } + $('#' + verb + '-' + ident).toggleClass('active'); + $('#like-rotator-' + ident.toString()).show(); + $.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate ); + liking = 1; + force_update = true; +} \ No newline at end of file diff --git a/view/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl index a195c4dc0..8ce7805bb 100644 --- a/view/theme/frio/templates/comment_item.tpl +++ b/view/theme/frio/templates/comment_item.tpl @@ -27,52 +27,51 @@
- + diff --git a/view/theme/frio/templates/common_tabs.tpl b/view/theme/frio/templates/common_tabs.tpl index 7cfd63528..b0be33b6c 100644 --- a/view/theme/frio/templates/common_tabs.tpl +++ b/view/theme/frio/templates/common_tabs.tpl @@ -12,13 +12,13 @@ {{* The extended dropdown menu - this would be shown if the tab menu points - dosn't fit in the available space. This is done through flexMenu.js *}} + doesn't fit in the available space. This is done through flexMenu.js *}}
    • @@ -45,9 +45,9 @@
    • - +