Merge pull request #862 from pixelfed/frontend-ui-refactor

Frontend ui refactor
pull/904/head
daniel 2019-02-21 21:10:07 -07:00 zatwierdzone przez GitHub
commit 6481a71fe5
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
10 zmienionych plików z 22 dodań i 20 usunięć

2
public/css/app.css vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
public/js/app.js vendored

File diff suppressed because one or more lines are too long

2
public/js/micro.js vendored

File diff suppressed because one or more lines are too long

2
public/js/status.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Wyświetl plik

@ -1,12 +1,12 @@
{
"/js/activity.js": "/js/activity.js?id=7915246c3bc2b7e9770e",
"/js/app.js": "/js/app.js?id=83172b0464c4537ed42a",
"/css/app.css": "/css/app.css?id=e3085bd9dd0fd613bb3e",
"/css/appdark.css": "/css/appdark.css?id=866d5497a414cac274e6",
"/js/app.js": "/js/app.js?id=fef13c5c940248f19673",
"/css/app.css": "/css/app.css?id=880c9871c8cb4b125953",
"/css/appdark.css": "/css/appdark.css?id=468c3368819b2bc5826a",
"/js/components.js": "/js/components.js?id=7b5983fe04a27eb1273c",
"/js/discover.js": "/js/discover.js?id=95091dda6723ab05dbb5",
"/js/micro.js": "/js/micro.js?id=69703f96f09e6ff04be6",
"/js/micro.js": "/js/micro.js?id=56a1418f04f66287e5cf",
"/js/profile.js": "/js/profile.js?id=dd006b565cac9962d5ad",
"/js/status.js": "/js/status.js?id=281d075819ccc5ea794d",
"/js/timeline.js": "/js/timeline.js?id=7570d505d9ba051522f5"
"/js/status.js": "/js/status.js?id=096927f9312b1d7bb1b0",
"/js/timeline.js": "/js/timeline.js?id=f214632b48e14d7aaa7b"
}

Wyświetl plik

@ -217,7 +217,7 @@
</a>
</p>
</div>
<p class="float-right"><a class="btn btn-primary font-weight-bold py-1" href="#">Follow</a></p>
<p class="float-right"><!-- <a class="btn btn-primary font-weight-bold py-1" href="#">Follow</a> --></p>
</div>
</div>
</div>

Wyświetl plik

@ -294,17 +294,11 @@
</template>
<style type="text/css" scoped>
.text-lighter {
color:#B8C2CC !important;
}
.postPresenterContainer {
display: flex;
align-items: center;
background: #fff;
}
.cursor-pointer {
cursor: pointer;
}
.word-break {
word-break: break-all;
}
@ -348,7 +342,7 @@
this.$nextTick(function () {
$('[data-toggle="tooltip"]').tooltip()
let cachedSettings = window.ls.get('pixelfed-classicui-settings');
if(cachedSettings.hasOwnProperty('notify')) {
if(cachedSettings.length && cachedSettings.hasOwnProperty('notify')) {
this.modes = cachedSettings;
} else {
window.ls.set('pixelfed-classicui-settings', this.modes);

Wyświetl plik

@ -491,3 +491,11 @@ details summary::-webkit-details-marker {
#s-modal .modal-content {
border-radius: 0;
}
.text-lighter {
color:#B8C2CC !important;
}
.cursor-pointer {
cursor: pointer;
}