Commit 961f6b53 authored by Jonne Haß's avatar Jonne Haß

Merge pull request #6158 from svbergerem/update-entypo

Update entypo
parents e0782437 9c4f8034
......@@ -35,6 +35,7 @@ bind to an UNIX socket at `unix:tmp/diaspora.sock`. Please change your local
* Improve mobile conversation design [#6087](https://github.com/diaspora/diaspora/pull/6087)
* Replace remaining faceboxes with Bootstrap modals [#6106](https://github.com/diaspora/diaspora/pull/6106)
* Rewrite header using Bootstrap 3 [#6109](https://github.com/diaspora/diaspora/pull/6109) [#6130](https://github.com/diaspora/diaspora/pull/6130) [#6132](https://github.com/diaspora/diaspora/pull/6132)
* Use upstream CSS mappings for Entypo [#6158](https://github.com/diaspora/diaspora/pull/6158)
## Bug fixes
* Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)
......
......@@ -81,7 +81,7 @@ gem "uuid", "2.3.8"
# Icons
gem "entypo-rails", "2.2.3"
gem "entypo-rails", "3.0.0.pre.rc2"
# JavaScript
......
......@@ -171,8 +171,8 @@ GEM
em-hiredis (0.3.0)
eventmachine (~> 1.0)
hiredis (~> 0.5.0)
entypo-rails (2.2.3)
railties (>= 3.1, <= 5)
entypo-rails (3.0.0.pre.rc2)
railties (>= 4.1, <= 5)
equalizer (0.0.11)
erubis (2.7.0)
ethon (0.7.4)
......@@ -761,7 +761,7 @@ DEPENDENCIES
devise-token_authenticatable (~> 0.4.0)
devise_lastseenable (= 0.0.4)
diaspora-vines (~> 0.1.27)
entypo-rails (= 2.2.3)
entypo-rails (= 3.0.0.pre.rc2)
eye (= 0.7.pre)
factory_girl_rails (= 4.5.0)
faraday (= 0.9.1)
......
......@@ -47,7 +47,7 @@ Handlebars.registerHelper('sharingMessage', function(person) {
var icon = "circle";
if( person.is_sharing ) {
i18n_scope = 'people.helper.is_sharing';
icon = "entypo check";
icon = "entypo-check";
}
var title = Diaspora.I18n.t(i18n_scope, {name: person.name});
......@@ -118,7 +118,7 @@ Handlebars.registerHelper("isCurrentProfilePage", function(id, diasporaHandle, o
Handlebars.registerHelper('aspectMembershipIndicator', function(contact,in_aspect) {
if(!app.aspect || !app.aspect.get('id')) return '<div class="aspect_membership_dropdown placeholder"></div>';
var html = '<i class="entypo ';
var html = "<i class=\"entypo-";
if( in_aspect === 'in_aspect' ) {
html += 'circled-cross contact_remove-from-aspect" ';
html += 'title="' + Diaspora.I18n.t('contacts.remove_contact') + '" ';
......
......@@ -12,11 +12,11 @@ app.pages.Contacts = Backbone.View.extend({
},
initialize: function(opts) {
this.visibility_toggle = $("#contacts_visibility_toggle .entypo");
this.chat_toggle = $("#chat_privilege_toggle .entypo");
this.visibilityToggle = $("#contacts_visibility_toggle i");
this.chatToggle = $("#chat_privilege_toggle i");
this.stream = opts.stream;
this.stream.render();
$("#people_stream.contacts .header .entypo").tooltip({"placement": "bottom"});
$("#people_stream.contacts .header i").tooltip({"placement": "bottom"});
$(document).on("ajax:success", "form.edit_aspect", this.updateAspectName);
app.events.on("aspect:create", function(){ window.location.reload() });
......@@ -27,14 +27,14 @@ app.pages.Contacts = Backbone.View.extend({
},
toggleChatPrivilege: function() {
if (this.chat_toggle.hasClass("enabled")) {
this.chat_toggle.tooltip("destroy")
if (this.chatToggle.hasClass("enabled")) {
this.chatToggle.tooltip("destroy")
.removeClass("enabled")
.removeAttr("data-original-title")
.attr("title", Diaspora.I18n.t("contacts.aspect_chat_is_not_enabled"))
.tooltip({"placement": "bottom"});
} else {
this.chat_toggle.tooltip("destroy")
this.chatToggle.tooltip("destroy")
.addClass("enabled")
.removeAttr("data-original-title")
.attr("title", Diaspora.I18n.t("contacts.aspect_chat_is_enabled"))
......@@ -43,17 +43,17 @@ app.pages.Contacts = Backbone.View.extend({
},
toggleContactVisibility: function() {
if (this.visibility_toggle.hasClass("lock-open")) {
this.visibility_toggle.removeClass("lock-open")
.addClass("lock")
if (this.visibilityToggle.hasClass("entypo-lock-open")) {
this.visibilityToggle.removeClass("entypo-lock-open")
.addClass("entypo-lock")
.tooltip("destroy")
.removeAttr("data-original-title")
.attr("title", Diaspora.I18n.t("contacts.aspect_list_is_not_visible"))
.tooltip({"placement": "bottom"});
}
else {
this.visibility_toggle.removeClass("lock")
.addClass("lock-open")
this.visibilityToggle.removeClass("entypo-lock")
.addClass("entypo-lock-open")
.tooltip("destroy")
.removeAttr("data-original-title")
.attr("title", Diaspora.I18n.t("contacts.aspect_list_is_visible"))
......
......@@ -8,7 +8,7 @@ app.views.Aspect = app.views.Base.extend({
className: 'hoverable',
events: {
'click .entypo.check+a': 'toggleAspect'
"click .entypo-check+a": "toggleAspect"
},
toggleAspect: function(evt) {
......
......@@ -64,11 +64,11 @@ app.views.AspectsList = app.views.Base.extend({
updateAspectList: function() {
this.collection.each(function(aspect) {
var element = this.$("li[data-aspect_id="+aspect.get('id')+"]");
if (aspect.get('selected')) {
element.find('.entypo.check').addClass('selected');
var element = this.$("li[data-aspect_id="+aspect.get("id")+"]");
if (aspect.get("selected")) {
element.find(".entypo-check").addClass("selected");
} else {
element.find('.entypo.check').removeClass('selected');
element.find(".entypo-check").removeClass("selected");
}
});
},
......
......@@ -214,11 +214,11 @@ app.views.Help = app.views.StaticContentView.extend({
},
getChatIcons: function(){
return '<div class="help-chat-icons">' +
' <i class="entypo lock-open"></i>' +
' <i class="entypo chat"></i>' +
' <i class="entypo trash"></i>' +
'</div>';
return "<div class=\"help-chat-icons\">" +
" <i class=\"entypo-lock-open\"></i>" +
" <i class=\"entypo-chat\"></i>" +
" <i class=\"entypo-trash\"></i>" +
"</div>";
}
});
// @license-end
......@@ -20,7 +20,7 @@ app.views.NotificationDropdown = app.views.Base.extend({
toggleDropdown: function(evt){
evt.stopPropagation();
if (!$("#notifications-link .entypo.bell:visible").length) { return true; }
if (!$("#notifications-link .entypo-bell:visible").length) { return true; }
evt.preventDefault();
if(this.dropdownShowing()){ this.hideDropdown(evt); }
else{ this.showDropdown(); }
......@@ -100,7 +100,7 @@ app.views.NotificationDropdown = app.views.Base.extend({
$.each(notifications, function(index, notification){
if($.inArray(notification, notifications) === -1){
var node = self.dropdownNotifications.append(notification.note_html);
$(node).find(".unread-toggle .entypo").tooltip("destroy").tooltip();
$(node).find(".unread-toggle .entypo-eye").tooltip("destroy").tooltip();
}
});
});
......
......@@ -8,7 +8,7 @@ app.views.Notifications = Backbone.View.extend({
},
initialize: function() {
$(".unread-toggle .entypo").tooltip();
$(".unread-toggle .entypo-eye").tooltip();
app.helpers.timeago($(document));
},
......@@ -62,7 +62,7 @@ app.views.Notifications = Backbone.View.extend({
if(unread){ note.removeClass("read").addClass("unread"); }
else { note.removeClass("unread").addClass("read"); }
$(".unread-toggle .entypo", note)
$(".unread-toggle .entypo-eye", note)
.tooltip("destroy")
.removeAttr("data-original-title")
.attr("title",Diaspora.I18n.t(translationKey))
......
......@@ -32,15 +32,15 @@ app.views.PublisherAspectSelector = app.views.AspectsDropdown.extend({
this._updateSelectedAspectIds();
this._updateButton('btn-default');
// update the globe or lock icon
var icon = this.$('#visibility-icon');
if (target.find('.text').text().trim() === Diaspora.I18n.t('stream.public')) {
icon.removeClass('lock');
icon.addClass('globe');
var icon = this.$("#visibility-icon");
if (target.find(".text").text().trim() === Diaspora.I18n.t("stream.public")) {
icon.removeClass("entypo-lock");
icon.addClass("entypo-globe");
} else {
icon.removeClass('globe');
icon.addClass('lock');
icon.removeClass("entypo-globe");
icon.addClass("entypo-lock");
}
},
......
......@@ -39,13 +39,13 @@ var AspectsDropdown = {
// if we are in the publisher, we add the visibility icon
if (isInPublisher) {
var icon = $('#visibility-icon');
if (replacement.trim() === Diaspora.I18n.t('stream.public')) {
icon.removeClass('lock');
icon.addClass('globe');
var icon = $("#visibility-icon");
if (replacement.trim() === Diaspora.I18n.t("stream.public")) {
icon.removeClass("entypo-lock");
icon.addClass("entypo-globe");
} else {
icon.removeClass('globe');
icon.addClass('lock');
icon.removeClass("entypo-globe");
icon.addClass("entypo-lock");
}
button.find('.text').text(replacement);
} else {
......
......@@ -8,8 +8,8 @@
/* core */
@import 'media-box';
@import 'autocomplete';
@import 'entypo-fonts';
@import 'entypo';
@import 'icons';
@import 'mentions';
@import 'flash_messages';
@import 'sprites';
......
......@@ -27,7 +27,7 @@
#chat_privilege_toggle > .enabled {
color: #000;
}
.entypo.contacts-header-icon {
.contacts-header-icon {
font-size: 24.5px;
line-height: 40px;
color: lighten($black,75%);
......@@ -42,7 +42,7 @@
cursor: pointer;
font-size: 20px;
line-height: 50px;
margin: 10px;
margin: 0 10px;
color: lighten($black,75%);
&:hover { color: $black; }
}
......
This diff is collapsed.
......@@ -76,7 +76,7 @@ header > .dark-header > nav {
}
}
}
.entypo {
[class^="entypo-"], [class*="entypo-"] {
color: inherit;
font-size: $font-size-h3;
vertical-align: middle;
......@@ -86,7 +86,7 @@ header > .dark-header > nav {
.badge {
background-color: $brand-danger;
position: absolute;
right: 5px;
right: 10px;
top: 10px;
}
}
......
......@@ -97,10 +97,10 @@ ul#help_nav {
font-size: 50px;
line-height: 70px;
i.entypo{
[class^="entypo-"], [class*="entypo-"] {
color: #bfbfbf;
&.chat{ color: #000000; }
&.entypo-chat{ color: #000000; }
}
}
}
......
[class^="entypo-"], [class*="entypo-"] {
font-style: normal;
color: black;
&.red { color: #A40802; }
&.white { color: white; }
&.gray { color: #aaa; }
&.blue { color: #3f8fba; }
&.small { font-size: 1em; }
&.middle { font-size: 1.5em; }
&.large { font-size: 2.5em; }
}
......@@ -68,7 +68,7 @@
}
#aspects_list {
.entypo.check {
.entypo-check {
float: left;
visibility: hidden;
&.selected { visibility: visible; }
......
......@@ -10,7 +10,7 @@
.delete_conversation {
font-size: 2rem;
.entypo {
[class^="entypo-"], [class*="entypo-"] {
color: $link-grey;
}
}
......
......@@ -3,8 +3,8 @@
@import "_mixins";
@import "vendor/autoSuggest";
@import "_flash_messages";
@import 'entypo-fonts';
@import 'entypo';
@import 'icons';
@import "header";
@import "mobile/tags";
......
......@@ -78,7 +78,7 @@ form.block-form {
}
}
.entypo {
[class^="entypo-"], [class*="entypo-"] {
position: absolute;
line-height: 20px;
top: 10px;
......@@ -87,18 +87,9 @@ form.block-form {
text-align: center;
color: $text-grey;
font-size: 20px;
}
.entypo:nth-of-type(2) {
top: 50px;
}
.entypo:nth-of-type(3) {
top: 90px;
}
.entypo:nth-of-type(4) {
top: 130px;
&:nth-of-type(2) { top: 50px; }
&:nth-of-type(3) { top: 90px; }
&:nth-of-type(4) { top: 130px; }
}
::placeholder { text-transform: uppercase; }
......
.control-icons {
a {
margin-right: 5px;
&:hover { text-decoration: none; }
i.entypo {
[class^="entypo-"], [class*="entypo-"] {
color: $text-grey;
font-size: $font-size-base;
line-height: $line-height-base;
......
......@@ -52,7 +52,7 @@
}
.list-group .list-group-item {
.entypo, .mentionIcon { margin-right: 5px; }
[class^="entypo-"], [class*="entypo-"], .mentionIcon { margin-right: 5px; }
.mentionIcon { font-weight: bold; }
}
}
......@@ -69,7 +69,7 @@
background-color: $background-grey;
.unread-toggle {
opacity: 1 !important;
.entypo { color: $black; }
.entypo-eye { color: $black; }
}
}
......@@ -84,7 +84,7 @@
.unread-toggle {
padding: 9px 5px;
.entypo {
.entypo-eye {
cursor: pointer;
color: lighten($black,75%);
font-size: 17px;
......
......@@ -32,7 +32,7 @@
color: $text-grey;
&:before { content: '\26aa'; }
}
&.entypo.check { color: darken($brand-success,20%); }
&.entypo-check { color: darken($brand-success,20%); }
}
.description {
margin-bottom: 20px;
......@@ -40,10 +40,10 @@
background-color: transparent;
font-size: $font-size-base;
}
.tag:not(.entypo) {
.tag {
font-weight: 700;
}
.entypo.tag {
.entypo-tag {
margin: 0 5px;
font-weight: normal;
&:hover {text-decoration: none;}
......@@ -62,7 +62,7 @@
text-decoration: none;
cursor: pointer;
margin-right: 25px;
.entypo.profile-header-icon, .profile-header-icon {
.profile-header-icon {
font-size: 24.5px;
line-height: 30px;
color: lighten($black,75%);
......@@ -82,7 +82,7 @@
border-bottom: 3px solid $brand-primary;
a {
color: $black;
.entypo { color: $black; }
[class^="entypo-"], [class*="entypo-"] { color: $black; }
}
}
a {
......@@ -90,13 +90,13 @@
font-size: 16px;
line-height: 46px;
color: lighten($black,50%);
.entypo {
[class^="entypo-"], [class*="entypo-"] {
color: lighten($black,50%);
margin-right: 2px;
}
&:hover {
color: $black;
.entypo { color: $black; }
[class^="entypo-"], [class*="entypo-"] { color: $black; }
text-decoration: none;
}
}
......
......@@ -31,12 +31,12 @@
padding: 10px 0 ;
#publisher_service_icons {
.btn-link{ text-decoration: none; }
.btn-link.question_mark .entypo {
.btn-link.question_mark .entypo-cog {
color: $text-grey;
font-size: 16px;
line-height: $line-height-computed;
}
.btn-link.question_mark:hover.entypo { color: $black; }
.btn-link.question_mark:hover.entypo-cog { color: $black; }
.btn-link.service_icon {
padding-left: 5px;
padding-right: 5px;
......@@ -94,7 +94,7 @@
border-top: 1px dashed $border-grey;
padding:4px 6px 4px 6px;
box-sizing: border-box;
.remove-answer.entypo.cross {
.remove-answer.entypo-cross {
display: none;
color: lighten($black,75%);
&.active { display: block; }
......@@ -189,7 +189,7 @@
text-decoration: none !important;
font-size: 16px;
line-height: $line-height-computed;
padding: 4px 5px;
padding: 4px 2px;
i {
color: $text-grey;
}
......
......@@ -30,12 +30,12 @@
}
#reshare-info {
line-height: 15px;
i.retweet {
i.entypo-reshare {
color: $text-dark-grey;
font-size: 28px;
line-height: 30px;
margin-left: 8px;
margin-right: 8px;
margin-left: 7px;
margin-right: 7px;
}
.post-context {
font-size: 12px;
......@@ -63,19 +63,19 @@
font-size: 28px;
line-height: 30px;
}
i.comment:hover {
i.entypo-comment:hover {
color: #424242;
}
.post_report i.gray:hover {
color: $red;
}
i.heart.gray:hover {
i.entypo-heart.gray:hover {
color: $red;
}
i.heart.red:hover {
i.entypo-heart.red:hover {
color: #f55f5a;
}
i.retweet:hover {
i.entypo-reshare:hover {
color: #3f8fba;
}
time {
......
......@@ -68,7 +68,7 @@
line-height: 16px;
.author-name, .bd { display: inline-block; }
.author-name { margin-right: 3px; }
.entypo.heart {
.entypo-heart {
display: inline-block;
font-size: 16px;
vertical-align: top;
......
<a href="/contacts?a_id={{id}}" class="action modify_aspect pull-right">
<i class="entypo pencil"></i>
<i class="entypo-pencil"></i>
</a>
{{#if selected}}
<i class="entypo check selected"></i>
<i class="entypo-check selected"></i>
{{else}}
<div class="entypo check"></div>
<div class="entypo-check"></div>
{{/if}}
<a href="/aspects/query" class="selectable" data-guid="{{id}}"> {{name}} </a>
......@@ -10,11 +10,11 @@
{{#if loggedIn}}
{{#if canRemove}}
<a href="#" class="delete comment_delete" title="{{t "delete"}}">
<i class="entypo trash"></i>
<i class="entypo-trash"></i>
<a/>
{{else}}
<a href="#" data-type="comment" class="comment_report" title="{{t "report.name"}}">
<i class="entypo warning"></i>
<i class="entypo-warning"></i>
</a>
{{/if}}
{{/if}}
......
......@@ -24,7 +24,7 @@
<li class="dropdown" id="notification-dropdown">
<a id="notifications-link" href="/notifications" title="{{t "header.notifications"}}" class="nav-badge" role="button" data-toggle="dropdown" aria-expanded="false" data-target="#">
<span class="hidden-xs hidden-sm">
<i class="entypo bell"></i>
<i class="entypo-bell"></i>
</span>
<span class="visible-xs-inline visible-sm-inline">
{{t "header.notifications"}}
......@@ -63,7 +63,7 @@
<li>
<a id="conversations-link" href="/conversations" title="{{t "header.conversations"}}" class="nav-badge">
<span class="hidden-xs hidden-sm">
<i class="entypo mail"></i>
<i class="entypo-mail"></i>
</span>
<span class="visible-xs-inline visible-sm-inline">
{{t "header.conversations"}}
......
{{#if likesCount}}
<div class="comment">
<div class="media">
<i class="entypo heart"></i>
<i class="entypo-heart"></i>
<div class="bd">
{{#unless likes_fetched}}
......
......@@ -4,17 +4,17 @@
<div class="control-icons">
{{#if authorIsCurrentUser}}
<a href="#" rel="nofollow" class="delete remove_post" title="{{t "delete"}}">
<i class="entypo trash"></i>
<i class="entypo-trash"></i>
</a>
{{else}}
<a href="#" rel="nofollow" data-type="post" class="post_report" title="{{t "report.name"}}">
<i class="entypo warning"></i>
<i class="entypo-warning"></i>
</a>
<a href="#" rel="nofollow" class="block_user" title="{{t "ignore"}}">
<i class="entypo block"></i>
<i class="entypo-block"></i>
</a>
<a href="#" rel="nofollow" class="delete hide_post" title="{{t "stream.hide"}}">
<i class="entypo cross"></i>
<i class="entypo-cross"></i>
</a>
{{/if}}
</div>
......
......@@ -7,7 +7,7 @@
<input type="text" class="input-block-level form-control" name="poll_answers[]" placeholder="{{t 'publisher.option' }}">
</div>
<div class="col-md-1">
<i class="remove-answer entypo cross"></i>
<i class="remove-answer entypo-cross"></i>
</div>
</div>
<div class="poll-answer form-group clearfix">
......@@ -15,7 +15,7 @@
<input type="text" class="input-block-level form-control" name="poll_answers[]" placeholder="{{t 'publisher.option' }}">
</div>
<div class="col-md-1">
<i class="remove-answer entypo cross"></i>
<i class="remove-answer entypo-cross"></i>
</div>
</div>
</div>
......@@ -23,7 +23,7 @@
{{#if loggedIn}}
{{#if has_tags}}
<div class="description">
<i class="entypo tag"></i>
<i class="entypo-tag"></i>
{{fmtTags profile.tags}}
</div>
{{else}}
......@@ -53,14 +53,14 @@
{{#if is_mutual}}
{{!-- create private conversation with person --}}
<span class="profile_button">
<i id="message_button" class="entypo profile-header-icon mail" title="{{t 'people.message'}}" data-placement="bottom" data-toggle="modal"></i>
<i id="message_button" class="entypo-mail profile-header-icon" title="{{t 'people.message'}}" data-placement="bottom" data-toggle="modal"></i>
</span>
{{/if}}
{{#unless is_blocked}}
{{!-- ignore the person --}}
<a href="#" class="profile_button" rel="nofollow">
<i id="block_user_button" class="entypo profile-header-icon block block_user" title="{{t 'ignore'}}" data-placement="bottom"></i>
<i id="block_user_button" class="entypo-block profile-header-icon block_user" title="{{t 'ignore'}}" data-placement="bottom"></i>
</a>
{{/unless}}
</div>
......@@ -69,14 +69,14 @@
<ul id="profile_nav">
<li {{#isCurrentProfilePage guid diaspora_id}} class="active" {{/isCurrentProfilePage}}>
<a href="{{urlTo 'person' guid}}" id="posts_link">
<i class="entypo docs"></i>
<i class="entypo-docs"></i>
{{t 'profile.posts'}}
</a>