Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

landing: Fixup styling of /compare/ page.

This commit is contained in:
Tim Abbott 2017-05-15 22:17:32 -07:00
parent fb2647397b
commit 5c745bf72a
2 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
static/styles/landing-page.css
View File

@ -590,7 +590,7 @@ a:not(.no-style):hover:before {
/* -- compare css -- */ /* -- compare css -- */
.compare { .compare {
background-color: #2d3035; background-color: #3e6157;
color: #fff; color: #fff;
} }
@ -598,10 +598,23 @@ a:not(.no-style):hover:before {
margin-top: 0px; margin-top: 0px;
} }
.compare .padded-content {
width: 900px;
margin: 0 auto;
}
.compare table { .compare table {
width: 100%; width: 100%;
text-align: left; text-align: left;
border-collapse: collapse; border-collapse: collapse;
font-weight: 400;
color: rgba(255,255,255,0.8);
}
.compare table thead th:last-of-type {
width: 120px;
} }
.compare table thead th.uniform { .compare table thead th.uniform {
@ -614,20 +627,23 @@ a:not(.no-style):hover:before {
} }
.compare thead { .compare thead {
border-bottom: 1px solid #73797d; border-bottom: 5px solid rgba(0,0,0,0.1);
} }
.compare thead th { .compare thead th {
font-weight: 600; font-weight: 600;
padding: 15px 0px; padding: 15px 0px;
color: #fff;
} }
.compare thead th.normal { .compare thead th.normal {
font-weight: normal; font-weight: normal;
color: inherit;
} }
.compare tbody tr { .compare tbody tr {
border-bottom: 1px solid #393c40; border-bottom: 1px solid rgb(56, 88, 79);
} }
.compare tbody tr td { .compare tbody tr td {
@ -671,6 +687,16 @@ a:not(.no-style):hover:before {
font-weight: 300; font-weight: 300;
} }
.compare .terms {
margin-top: 30px;
font-weight: 400;
font-size: 0.7em;
line-height: 1.2;
color: rgba(255,255,255,0.8);
}
.screen .line { .screen .line {
width: 100%; width: 100%;
height: 6px; height: 6px;

25
templates/zerver/compare.html
View File

@ -14,7 +14,6 @@
<th class="normal uniform">Slack</th> <th class="normal uniform">Slack</th>
<th class="normal uniform">Mattermost</th> <th class="normal uniform">Mattermost</th>
<th class="normal uniform">Hipchat</th> <th class="normal uniform">Hipchat</th>
<th></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -50,7 +49,7 @@
<td>Free and open source software</td> <td>Free and open source software</td>
<td class="yes"></td> <td class="yes"></td>
<td class="no"></td> <td class="no"></td>
<td>See below</td> <td>See below*</td>
<td class="no"></td> <td class="no"></td>
</tr> </tr>
<tr> <tr>
@ -90,16 +89,18 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<p> <p class="terms">
On Mattermost's licensing: The components of Mattermost <span class="term">
are, technically, released under open source licenses. * On Mattermost's licensing: The components of Mattermost
However, Mattermost was founded by an ex-Microsoft team, are, technically, released under open source licenses.
is developed primarily by paid employees, and their However, Mattermost was founded by an ex-Microsoft team,
licensing and trademark policies do not allow third is developed primarily by paid employees, and their
parties to distribute patched Mattermost servers without licensing and trademark policies do not allow third
renaming the project in their fork. In contrast, Zulip is parties to distribute patched Mattermost servers without
a true open source project with a wide development renaming the project in their fork. In contrast, Zulip is
community and a clean Apache 2.0 license. a true open source project with a wide development
community and a clean Apache 2.0 license.
</span>
</p> </p>
</div> </div>
</div> </div>