Skip to content

Commit 0879e84

Browse files
xoriolexoriole
committed
Tribler 7 minor updates
Disabled user voice plugin
1 parent 31c056d commit 0879e84

File tree

7 files changed

+185
-160
lines changed

7 files changed

+185
-160
lines changed

‎about.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@
8383
</li>
8484
<li><a href="http://forum.tribler.org">Forum</a></li>
8585
</ul>
86-
</nav>
86+
</nav>
87+
</div>
8788
</header>
8889

8990
<div id="wrap"><br>
@@ -99,7 +100,7 @@ <h1>About Tribler</h1>
99100
We expanded it with, amongst others, streaming from magnet links, keyword search for content, channels and reputation-management. All these features are implemented in a completely distributed manner, not relying on any centralized component. Still, Tribler manages to remain fully backwards compatible with BitTorrent.</p><br>
100101
<p>Work on Tribler has been supported by multiple Internet research European grants. In total we received 3,538,609 Euro in funding for our open source self-organising systems research.</p>
101102
<p>Roughly 10 to 15 scientists and engineers work on it full-time. Our ambition is to make darknet technology, security and privacy the default for all Internet users.
102-
As of 2013 we have received code from 46 contributors and 143.705 lines of code.</p><br>
103+
As of 2017 we have received code from 56 contributors and 146.003 lines of code.</p><br>
103104
<div class="vision">
104105
<h2>Vision & Mission</h2>
105106
<p>"Push the boundaries of self-organising systems, robust reputation systems and craft collaborative systems with millions of active participants under continuous attack from spammers and other adversarial entities."</p>
@@ -119,8 +120,8 @@ <h2>Tribler Contact Information</h2><br>
119120
<strong>Visiting address</strong>
120121
<p>We are based at the Computer Science building at Delft University of Technology</p><br>
121122

122-
<p>Mekelweg 4, seventh floor<br>
123-
2628 CD Delft<br>
123+
<p>Van Mourik Broekmanweg 6, 3rd floor<br>
124+
2628 XE Delft<br>
124125
The Netherlands</p>
125126
</p>
126127
</div>

‎css/style.css‎

Lines changed: 53 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ h2, h3 {
1616
}
1717

1818
a {
19-
color: #d0d0d0; text-decoration: none;
19+
color: #ffbc86; text-decoration: none;
20+
}
21+
a:hover {
22+
color: #F86F00;
2023
}
21-
a:hover {
22-
color: #ffffff;
23-
}
2424

2525
#wrap {
2626
width: 960px; margin: 0 auto 24px auto; background: #505050;
@@ -40,13 +40,14 @@ header img.header-logo {
4040
-moz-box-shadow: 2px 2px 8px rgba(0,0,0,0.2);
4141
-webkit-box-shadow: 2px 2px 8px rgba(0,0,0,0.2);
4242
}
43-
header img.facebook-icon, .twitter-icon, .github-icon{
44-
background:#eee;
43+
header img.facebook-icon, header img.twitter-icon, header img.github-icon{
44+
background-color:#505050;
4545
border-radius: 50%;
4646
position: absolute;
47+
width:24px;
4748
}
4849
header img.facebook-icon:hover, .twitter-icon:hover, .github-icon:hover{
49-
background:#fff;
50+
background:#505050;
5051
}
5152
header img.facebook-icon {
5253
margin: 5px 0 0 15px;
@@ -120,7 +121,7 @@ header nav {
120121
}
121122

122123
#main {
123-
clear: both; height: 550px; overflow: hidden; margin: 0;
124+
clear: both; height: 650px; overflow: hidden; margin: 0;
124125
color: #D0D0D0;
125126
padding-top: 70px;
126127
background: #505050;
@@ -259,9 +260,9 @@ header nav {
259260
margin: 0 0 5px 0; padding: 0 13px 0 13px;
260261
text-align:center;
261262
}
262-
#content .download p a {
263+
/*#content .download p a {
263264
color: #fff;
264-
}
265+
}*/
265266
#content .changelog{
266267
clear:both;
267268
margin: 20px 20px 20px 20px;
@@ -299,6 +300,7 @@ footer {
299300
color: #505050;
300301
background: #505050;
301302
padding-top:20px;
303+
margin-bottom:20px;
302304
}
303305
footer .button p, footer .button a{
304306
display: block;
@@ -491,3 +493,44 @@ footer {
491493
border-style:solid;
492494
border-width:0 1px 1px 1px;
493495
}
496+
497+
.notification{
498+
margin-top:16px;
499+
}
500+
.notification h2{
501+
color: #fff;
502+
font-size: large;
503+
text-shadow: 1px 1px 1px #f8680647;
504+
}
505+
.download_section{
506+
padding:10px 0;
507+
text-align: center;
508+
}
509+
.download_section a.download_url, .download_section a.download_url{
510+
color: white;
511+
padding: 16px 24px;
512+
margin: 8px;
513+
font-size: 20px;
514+
font-weight: bold;
515+
text-align: center;
516+
display: inline-block;
517+
text-decoration: none;
518+
background: #FF6F00;
519+
-moz-border-radius: 5px;
520+
-webkit-border-radius: 5px;
521+
border-radius: 5px;
522+
box-shadow: 2px 2px 8px rgba(0,0,0,0.2);
523+
-moz-box-shadow: 2px 2px 8px rgba(0,0,0,0.2);
524+
-webkit-box-shadow: 2px 2px 8px rgba(0,0,0,0.2);
525+
}
526+
#release_dlcount{
527+
margin-top:4px;
528+
font-size: large;
529+
}
530+
#total_downloads_all_versions{
531+
background-color: #71717161;
532+
padding: 5px 10px;
533+
border-radius: 5px;
534+
font-weight: bold;
535+
color: #fff;
536+
}

‎download.html‎

Lines changed: 41 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -59,31 +59,32 @@
5959
<a href="/"><img class="header-logo" src="img/tribler-logo.png" alt="Return to the homepage" /></a>
6060

6161
<nav>
62-
<ul>
63-
<li><a href="/">Tribler</a>
64-
<ul>
65-
<li><a href="about.html">About Tribler</a></li>
66-
<li><a href="anonymity.html">Anonymity</a></li>
67-
<li><a href="http://statistics.tribler.org">Statistics</a></li>
68-
</ul>
69-
</li>
70-
<li><a href="download.html">Download</a></li>
71-
<li><a href="support-index.html">Support</a>
72-
<ul>
73-
<li><a href="howto.html">Get Started</a></li>
74-
<li><a href="faq.html">FAQ</a></li>
75-
</ul>
76-
</li>
77-
<li><a href="developer-index.html">Developers</a>
78-
<ul>
79-
<li><a href="https://github.com/Tribler/tribler">Github</a></li>
80-
<li><a href="https://github.com/Tribler/tribler/wiki">Wiki</a></li>
81-
<li><a href="/TitleIndex">Archive</a></li>
82-
</ul>
83-
</li>
84-
<li><a href="http://forum.tribler.org">Forum</a></li>
85-
</ul>
86-
</nav>
62+
<ul>
63+
<li><a href="/">Tribler</a>
64+
<ul>
65+
<li><a href="about.html">About Tribler</a></li>
66+
<li><a href="anonymity.html">Anonymity</a></li>
67+
<li><a href="http://statistics.tribler.org">Statistics</a></li>
68+
</ul>
69+
</li>
70+
<li><a href="download.html">Download</a></li>
71+
<li><a href="support-index.html">Support</a>
72+
<ul>
73+
<li><a href="howto.html">Get Started</a></li>
74+
<li><a href="faq.html">FAQ</a></li>
75+
</ul>
76+
</li>
77+
<li><a href="developer-index.html">Developers</a>
78+
<ul>
79+
<li><a href="https://github.com/Tribler/tribler">Github</a></li>
80+
<li><a href="https://github.com/Tribler/tribler/wiki">Wiki</a></li>
81+
<li><a href="/TitleIndex">Archive</a></li>
82+
</ul>
83+
</li>
84+
<li><a href="http://forum.tribler.org">Forum</a></li>
85+
</ul>
86+
</nav>
87+
</div>
8788
</header>
8889

8990
<div id="wrap"><br>
@@ -94,33 +95,41 @@
9495
<p><img src="img/win.png" width=100px height=100px></p>
9596

9697
<p>
97-
<a href="https://github.com/Tribler/tribler/releases/download/v6.5.2/Tribler_6.5.2.exe">Tribler 6.5.2 for Windows</a><br>
98+
<a href="https://github.com/Tribler/tribler/releases/download/v7.0.0-rc5/Tribler_7.0.0-rc5_x64.exe">Tribler 7.0.0-rc5 for Windows</a><br>
99+
<a href="https://github.com/Tribler/tribler/releases/download/v6.5.2/Tribler_6.5.2.exe">Tribler 6.5.2</a><br>
98100
Windows Vista, and Windows 7 / 8 / 10
99101
</p>
100102
</div>
101103

102104
<div class="download">
103-
<p class="title">Mac OS X</p>
105+
<p class="title">macOS</p>
104106

105107
<p><img src="img/osx.png" width=100px height=100px></p>
106108

107-
<p><a href="https://github.com/Tribler/tribler/releases/download/v6.5.2/Tribler-6.5.2.dmg">Tribler 6.5.2 for Mac OS X</a></br>(Snow Leopard or newer)</p>
109+
<p>
110+
<a href="https://github.com/Tribler/tribler/releases/download/v7.0.0-rc5/Tribler-7.0.0-rc5.dmg">Tribler 7.0.0-rc5 for macOS</a></br>
111+
<a href="https://github.com/Tribler/tribler/releases/download/v6.5.2/Tribler-6.5.2.dmg">Tribler 6.5.2 </a></br>
112+
(Snow Leopard or newer)
113+
</p>
108114
</div>
109115

110116
<div class="download">
111117
<p class="title">Ubuntu Linux</p>
112118

113119
<p><img src="img/linux.png" width=100px height=100px></p>
114120

115-
<p><a href="https://github.com/Tribler/tribler/releases/download/v6.5.2/tribler_6.5.2_all.deb">Tribler 6.5.2 for Ubuntu</a> </p>
121+
<p><a href="https://github.com/Tribler/tribler/releases/download/v7.0.0-rc5/tribler_7.0.0-rc5_all.deb">Tribler 7.0.0-rc5 for Ubuntu</a> </p>
122+
<p><a href="https://github.com/Tribler/tribler/releases/download/v6.5.2/tribler_6.5.2_all.deb">Tribler 6.5.2</a> </p>
116123

117-
<p><a href="https://github.com/Tribler/tribler/tree/v6.5.2">Browse source code </a> <br/> or <a href="https://github.com/Tribler/tribler/releases/download/v6.5.2/Tribler-v6.5.2.tar.xz">download source tar</a><br></p>
124+
<p><a href="https://github.com/Tribler/tribler/tree/v7.0.0-rc5">Browse source code </a> <br/>
125+
<a href="https://github.com/Tribler/tribler/archive/v7.0.0-rc5.tar.gz">Download source tar</a><br>
126+
</p>
118127

119128
</div>
120129

121130
<div class="changelog">
122-
<p>To see the short changelog <a href="https://github.com/Tribler/tribler/releases/tag/v6.5.2">click here</a>.</p>
123-
<p>To see a complete list of the changes, please <a href="https://github.com/Tribler/tribler/compare/v6.4.3...v6.5.2">click here</a>.</p>
131+
<p>To see the short changelog <a href="https://github.com/Tribler/tribler/tree/v7.0.0-rc5">click here</a>.</p>
132+
<p>To see a complete list of the changes, please <a href="https://github.com/Tribler/tribler/compare/v7.0.0-rc5...v6.5.2">click here</a>.</p>
124133
<br/>
125134
</div>
126135

‎img/facebook-icon.png‎

715 Bytes
Loading

‎img/github-icon.png‎

2.71 KB
Loading

‎img/twitter-icon.png‎

1.59 KB
Loading

0 commit comments

Comments
 (0)