yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changing <h> tags to span + adding extra description to timeline

Browse Source
This commit is contained in:
Zsolt
2017-08-31 11:29:03 +02:00
parent 7a3591d1bd
commit dd38480ce2
3 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
View File

@@ -23,7 +23,7 @@
{
"date": "03 December 2016 17:58PM",
"action": "publish",
"description": "Content was performed",
"description": "Content was performed today by user",
"user": {
"name": "Zsolt Laszlo",
"avatars": []
@@ -32,7 +32,7 @@
{
"date": "24 December 2016 20:18PM",
"action": "unpublish",
"description": "Content was performed",
"description": "Content was performed by user",
"user": {
"name": "Mads Rasmussen",
"avatars": [
@@ -47,7 +47,7 @@
{
"date": "19 November 2016 21:11AM",
"action": "save",
"description": "Content was performed",
"description": "Content was performed yesteraday by user",
"user": {
"name": "Zsolt Laszlo",
"avatars": []
@@ -56,7 +56,7 @@
{
"date": "10 November 2016 10:41AM",
"action": "save",
"description": "Content was performed",
"description": "Content was performed last week by user",
"user": {
"name": "Mads Rasmussen",
"avatars": [
@@ -71,7 +71,7 @@
{
"date": "02 November 2016 03:44PM",
"action": "save",
"description": "Content was performed",
"description": "Content was performed last week by user",
"user": {
"name": "Zsolt Laszlo",
"avatars": []
@@ -80,7 +80,7 @@
{
"date": "19 September 2016 18:21AM",
"action": "publish",
"description": "Content was performed",
"description": "Content was performed two weeks ago by user",
"user": {
"name": "Mads Rasmussen",
"avatars": [
@@ -95,7 +95,7 @@
{
"date": "19 September 2016 08:51AM",
"action": "save",
"description": "Content was performed",
"description": "Content was performed last month by user",
"user": {
"name": "Mads Rasmussen",
"avatars": [
@@ -110,7 +110,7 @@
{
"date": "11 September 2016 13:28AM",
"action": "save",
"description": "Content was performed",
"description": "Content was performed by user",
"user": {
"name": "Zsolt Laszlo",
"avatars": []
@@ -119,7 +119,7 @@
{
"date": "01 September 2016 23:19AM",
"action": "save",
"description": "Content was performed",
"description": "Content was performed by user",
"user": {
"name": "Zsolt Laszlo",
"avatars": []

31
src/Umbraco.Web.UI.Client/src/less/properties.less
View File

@@ -75,37 +75,38 @@
border: 1px solid #35c685;
margin: 0px;
}
.history-item h1 {
font-size: 14px;
.name-date-container span {
color: #000;
margin: 3px 0 0 0;
margin: 0;
height: 15px;
}
.history-item h2 {
.name-date-container .date {
font-size: 13px;
height: 13px;
color: #817f85;
margin: 0;
margin-top: -3px;
display: block;
}
.history-item h3 {
font-size: 14px;
color: #000;
margin: 0;
}
.history-item h4 {
font-size: 14px;
color: #514f53;
margin: 0 7px;
line-height: 30px;
}
.history-item h1, .history-item h2, .history-item h3 {
line-height: 100%;
}
.history-row > span {
font-size: 14px;
color: #514f53;
margin: 0 7px;
padding-top: 5px;
}
.name-date-container {
margin: 0 30px 0 7px;
height: 30px;
}
.history-indicator__publish {

6
src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
View File

@@ -46,15 +46,15 @@
img-srcset="{{item.user.avatars[4]}} 2x, {{item.user.avatars[4]}} 3x">
</umb-avatar>
<div class="name-date-container">
<h1>{{ item.user.name }}</h1>
<h2>{{ item.date }}</h2>
<span>{{ item.user.name }}</span>
<span class="date">{{ item.date }}</span>
</div>
<umb-badge
size="s"
color="{{item.actionColor}}">
{{ item.action }}
</umb-badge>
<h4>{{ item.description }}</h4>
<span>{{ item.description }}</span>
</div>
<div class="history-line"></div>
</div>