torproject/webwml
1
0
Fork 0
mirror of https://github.com/torproject/webwml.git synced 2024-11-27 03:30:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
hiro 2018-11-05 13:53:52 +01:00
commit 216b3d1b7a
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
css/layout.css
View File

@ -1399,7 +1399,7 @@ p.blogDate {
background-color: #F8F9FA;
width: 100%;
height: 300px;
margin-bottom: 35px;
margin-bottom: 35px;
}
.eoy-wrap {
@ -1417,7 +1417,7 @@ p.blogDate {
}
.eoy-message {
width: 55%;
width: 55%;
float: right;
padding-left: 35px;
}
@ -1449,7 +1449,7 @@ p.blogDate {
text-align: left;
}
.tor-strength-in-num > p.title {
.tor-strength-in-num > p {
text-transform: uppercase;
}
@ -1466,10 +1466,7 @@ p.blogDate {
font-size: 60%;
}
.eoy-btn-container{
padding-top: 5%;
padding-bottom: 5%;
}
.eoy-btn-container{ padding: 3% 0;}
.eoy-btn {
background-color: #420C5D;
@ -1477,8 +1474,8 @@ p.blogDate {
width: 120px;
height: 35px;
padding: 10px;
padding-left: 20px;
padding-right: 20px;
padding-left: 20px;
padding-right: 20px;
}
.count-me-in {
@ -1488,6 +1485,7 @@ p.blogDate {
font-weight: 600;
line-height: 17px;
text-align: center;
text-decoration: none;
}
mark {
@ -1505,4 +1503,13 @@ mark {
width: 90%;
margin:auto;
padding:auto;
text-align: center;
}
.align-center {
text-align: center;
width: 100%;
align-content: center;
font-size-adjust: 0.7;
line-height: 1.5em;
}

9
css/layout.min.css vendored
View File

@ -71,10 +71,7 @@
font-size: 60%;
}
.eoy-btn-container{
padding-top: 5%;
padding-bottom: 5%;
}
.eoy-btn-container{ padding: 3% 0;}
.eoy-btn {
background-color: #420C5D;
@ -131,6 +128,6 @@ mark {
text-align: center;
width: 100%;
align-content: center;
font-size-adjust: 1;
line-height: 3em;
font-size-adjust: 0.7;
line-height: 1.5em;
}