beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

html: simplify

Browse source
This commit is contained in:
Hylke Bons 2012-10-04 01:03:06 +02:00
parent b77bbf6267
commit 565e9f2fcc
4 changed files with 60 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
SparkleShare/Common/HTML/day-entry.html
View file

@ -1,8 +1,4 @@
<div class='day-entry'> <div class='day-entry'>
<div class='day-entry-header'> <div class='day-entry-header'><!-- $day-entry-header --></div>
<!-- $day-entry-header --> <div class='day-entry-content'><!-- $day-entry-content --></div>
</div>
<div class='day-entry-content'>
<!-- $day-entry-content -->
</div>
</div> </div>

6
SparkleShare/Common/HTML/event-entry.html
View file

@ -1,12 +1,6 @@
<div class='event-entry'> <div class='event-entry'>
<div class='event-avatar' style='background-image: url("<!-- $event-avatar-url -->");'></div> <div class='event-avatar' style='background-image: url("<!-- $event-avatar-url -->");'></div>
<div class='event-user-name'><!-- $event-user-name --><span class='event-folder'><!-- $event-folder --></span></div> <div class='event-user-name'><!-- $event-user-name --><span class='event-folder'><!-- $event-folder --></span></div>
<!-- $event-entry-content --> <!-- $event-entry-content -->
<div class="clearer"></div>
<div class="event-timestamp"><!-- $event-time --></div>
<a class="show">Show all</a> <a class="show">Show all</a>
<div class="clearer"></div>
</div> </div>

126
SparkleShare/Common/HTML/event-log.html
View file

@ -3,10 +3,8 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>SparkleShare Event Log</title> <title>SparkleShare Event Log</title>
<script type="text/javascript">
<!-- $jquery --> <script type="text/javascript"><!-- $jquery --></script>
</script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
$('dl dd:nth-child(-n+10)').css('display', 'block'); $('dl dd:nth-child(-n+10)').css('display', 'block');
@ -63,63 +61,28 @@
-webkit-user-select: none; -webkit-user-select: none;
} }
small {
font-size: <!-- $small-font-size -->;
color: <!-- $secondary-font-color -->;
}
.day-entry-header {
color: #aaa;
margin-left: 32px;
padding-top: 22px;
font-weight: bold;
}
a { a {
color: <!-- $a-color -->; color: <!-- $a-color -->;
text-decoration: none; text-decoration: none;
outline: 0; outline: 0;
} }
a.show {
font-size: 80%;
margin-bottom: 9px;
}
a:hover { a:hover {
color: <!-- $a-hover-color -->; color: <!-- $a-hover-color -->;
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
} }
.event-timestamp { small {
font-size: 80%; font-size: <!-- $small-font-size -->;
color: <!-- $secondary-font-color -->; color: <!-- $secondary-font-color -->;
} }
.event-user-name {
font-weight: bold;
}
.event-folder {
color: <!-- $secondary-font-color -->;
font-size: 80%;
}
.event-entry {
padding: 24px 14px 14px 64px;
margin: 0 32px 0 32px;
border-bottom: 1px #ddd solid;
background-repeat: no-repeat;
background-position: 36px 24px;
min-height: 100px;
}
a.show {
font-size: 80%;
margin-bottom: 9px;
}
.separator {
border-bottom: 1px #ccc solid;
margin: 24px 0 24px 0;
}
dl { dl {
padding : 6px 0 0 0; padding : 6px 0 0 0;
margin: 0 0 12px 0; margin: 0 0 12px 0;
@ -139,6 +102,51 @@
white-space: nowrap; white-space: nowrap;
} }
.day-entry-header {
color: #aaa;
margin-left: 32px;
padding-top: 22px;
font-weight: bold;
}
.event-entry {
padding: 24px 14px 14px 64px;
margin: 0 32px 0 32px;
border-bottom: 1px #ddd solid;
background-repeat: no-repeat;
background-position: 36px 24px;
min-height: 100px;
}
.no-buddy-icon {
width: 48px;
background-image: url('<!-- $no-buddy-icon-background-image -->');
background-repeat: no-repeat;
background-position: top center;
}
.event-user-name {
font-weight: bold;
}
.event-avatar {
width: 48px;
height: 48px;
border-radius: 4px;
position: absolute;
left: 32px;
}
.event-folder {
color: <!-- $secondary-font-color -->;
font-size: 80%;
}
.separator {
border-bottom: 1px #ccc solid;
margin: 24px 0 24px 0;
}
.added { .added {
background-image: url('<!-- $document-added-background-image -->'); background-image: url('<!-- $document-added-background-image -->');
} }
@ -153,27 +161,7 @@
.moved { .moved {
background-image: url('<!-- $document-moved-background-image -->'); background-image: url('<!-- $document-moved-background-image -->');
} }
.no-buddy-icon {
position: relative;
top: 0;
left: 0;
float: left;
margin-right: 12px;
width: 48px;
background-image: url('<!-- $no-buddy-icon-background-image -->');
background-repeat: no-repeat;
background-position: top center;
}
.event-avatar {
width: 48px;
height: 48px;
border-radius: 4px;
position: absolute;
left: 32px;
}
</style> </style>
</head> </head>
<body oncontextmenu="return false;"> <body oncontextmenu="return false;">

2
SparkleShare/Mac/SparkleStatusIcon.cs
View file

@ -390,7 +390,7 @@ namespace SparkleShare {
public override void MenuWillOpen (NSMenu menu) public override void MenuWillOpen (NSMenu menu)
{ {
InvokeOnMainThread (delegate { InvokeOnMainThread (() => {
NSApplication.SharedApplication.DockTile.BadgeLabel = null; NSApplication.SharedApplication.DockTile.BadgeLabel = null;
}); });
} }