Merge branch 'master' of https://github.com/b3log/wide
This commit is contained in:
commit
24dfb16d23
|
@ -110,4 +110,9 @@
|
||||||
|
|
||||||
#dialogPreference .preference {
|
#dialogPreference .preference {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#dialogPreference img.gravatar {
|
||||||
|
width: 48px;
|
||||||
|
height: 48px;
|
||||||
}
|
}
|
|
@ -282,6 +282,8 @@
|
||||||
.menu img.gravatar {
|
.menu img.gravatar {
|
||||||
float: left;
|
float: left;
|
||||||
margin: 2px 8px;
|
margin: 2px 8px;
|
||||||
|
height: 17px;
|
||||||
|
width: 17px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#buildRun {
|
#buildRun {
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 1.1 KiB |
|
@ -267,7 +267,7 @@ var editors = {
|
||||||
content: '<div id="startPage"></div>',
|
content: '<div id="startPage"></div>',
|
||||||
after: function () {
|
after: function () {
|
||||||
$("#startPage").load(config.context + '/start?sid=' + config.wideSessionId);
|
$("#startPage").load(config.context + '/start?sid=' + config.wideSessionId);
|
||||||
$.ajax({
|
/* $.ajax({
|
||||||
url: "http://symphony.b3log.org/apis/articles?tags=wide,golang&p=1&size=30",
|
url: "http://symphony.b3log.org/apis/articles?tags=wide,golang&p=1&size=30",
|
||||||
type: "GET",
|
type: "GET",
|
||||||
dataType: "jsonp",
|
dataType: "jsonp",
|
||||||
|
@ -297,7 +297,7 @@ var editors = {
|
||||||
|
|
||||||
$("#startPage .news").html(listHTML + "</ul>");
|
$("#startPage .news").html(listHTML + "</ul>");
|
||||||
}
|
}
|
||||||
});
|
});*/
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
|
@ -37,8 +37,8 @@ var menu = {
|
||||||
$(".share-panel .font-ico").click(function () {
|
$(".share-panel .font-ico").click(function () {
|
||||||
var key = $(this).attr('class').split('-')[2];
|
var key = $(this).attr('class').split('-')[2];
|
||||||
var title = encodeURIComponent($('title').text() + '. \n' + $('meta[name=description]').attr('content')),
|
var title = encodeURIComponent($('title').text() + '. \n' + $('meta[name=description]').attr('content')),
|
||||||
url = "http://wide.b3log.org",
|
url = "https://wide.b3log.org",
|
||||||
pic = 'http://wide.b3log.org/static/images/wide-logo.png';
|
pic = 'https://wide.b3log.org/static/images/wide-logo.png';
|
||||||
var urls = {};
|
var urls = {};
|
||||||
urls.email = "mailto:?subject=" + $('title').text()
|
urls.email = "mailto:?subject=" + $('title').text()
|
||||||
+ "&body=" + $('meta[name=description]').attr('content') + ' ' + url;
|
+ "&body=" + $('meta[name=description]').attr('content') + ' ' + url;
|
||||||
|
|
|
@ -347,7 +347,8 @@
|
||||||
|
|
||||||
<div class="fn-right">
|
<div class="fn-right">
|
||||||
<img class="gravatar"
|
<img class="gravatar"
|
||||||
src="http://secure.gravatar.com/avatar/{{.user.Gravatar}}?s=17&d=http://symphony.b3log.org/images/user-thumbnail.png"
|
onerror="this.src='/images/user-thumbnail.png'"
|
||||||
|
src="https://secure.gravatar.com/avatar/{{.user.Gravatar}}?s=17&d=http://symphony.b3log.org/images/user-thumbnail.png"
|
||||||
title="{{.user.Name}}"/>
|
title="{{.user.Name}}"/>
|
||||||
<span class="font-ico ico-share"></span>
|
<span class="font-ico ico-share"></span>
|
||||||
<span onclick="window.open('https://github.com/b3log/wide')"
|
<span onclick="window.open('https://github.com/b3log/wide')"
|
||||||
|
|
|
@ -91,8 +91,9 @@
|
||||||
<input data-value="{{.user.Password}}" value="{{.user.Password}}" name="password" type="password"/>
|
<input data-value="{{.user.Password}}" value="{{.user.Password}}" name="password" type="password"/>
|
||||||
</label>
|
</label>
|
||||||
<label class="fn-clear">
|
<label class="fn-clear">
|
||||||
<img src="http://secure.gravatar.com/avatar/{{.user.Gravatar}}?s=48&d=http://symphony.b3log.org/images/user-thumbnail.png"
|
<img onerror="this.src='/images/user-thumbnail.png'"
|
||||||
title="{{.user.Name}}"/>
|
src="https://secure.gravatar.com/avatar/{{.user.Gravatar}}?s=48&d=http://symphony.b3log.org/images/user-thumbnail.png"
|
||||||
|
title="{{.user.Name}}" class='gravatar'/>
|
||||||
<a href="http://gravatar.com/" target="_blank">{{.i18n.change_avatar}} Gravatar.com</a>
|
<a href="http://gravatar.com/" target="_blank">{{.i18n.change_avatar}} Gravatar.com</a>
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue