mirror/FreshRSS
0
0 Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-10-20 10:14:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into statistics

Browse Source 
Conflicts:
	p/themes/Dark/freshrss.css
	p/themes/Flat/freshrss.css
	p/themes/Origine/freshrss.css
This commit is contained in:
Alexis Degrugillier committed 2014-01-26 09:14:27 -05:00
2 parents b0641fd0eb c2998ffc97
commit 964128bd5f
3 files changed
+62 -76
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

p/themes/Dark/freshrss.css
+21 -26
View File
@@ -876,47 +876,42 @@ input.extend {
}
}
.stat{
.stat {
border:1px solid #2f2f2f;
border-radius:10px;
margin: 10px 0;
margin:10px 0;
padding:0 5px;
}
.stat h2{
.stat > h2 {
border-bottom:1px solid #2f2f2f;
margin:0;
margin:0 -5px;
padding-left:5px;
}
.stat h2 + *{
margin:5px;
.stat > div {
margin:5px 0;
}
.stat h2 + div + div{
margin:0 5px 5px 5px;
}
.stat h2 + table{
.stat > table {
border-collapse:collapse;
width:calc(100% - 10px);
margin:5px 0;
width:100%;
}
.stat h2 + table th{
padding:5px;
}
.stat h2 + table td{
padding:5px;
}
.stat h2 + table td.numeric{
text-align:center;
}
.stat h2 + table thead th{
.stat > table > thead > tr {
border-bottom:2px solid #2f2f2f;
}
.stat h2 + table tbody tr *{
.stat > table > tbody > tr {
border-bottom:1px solid #2f2f2f;
}
.stat h2 + table tbody tr:last-child *{
.stat > table > tbody > tr:last-child {
border-bottom:0;
}
.stat h2 + table tr *{
.stat > table th, .stat > table td {
border-left:2px solid #2f2f2f;
padding:5px;
}
.stat h2 + table tr *:first-child{
.stat > table th:first-child, .stat > table td:first-child {
border-left:0;
}
}
.stat > table td.numeric{
margin:5px 0;
text-align:center;
}
p/themes/Flat/freshrss.css
+21 -25
View File
@@ -843,47 +843,43 @@ input.extend {
}
}
.stat{
.stat {
border:1px solid #aaa;
border-radius:10px;
margin: 10px 0;
box-shadow:2px 2px 5px #aaa;
margin:10px 0;
padding:0 5px;
}
.stat h2{
.stat > h2 {
border-bottom:1px solid #aaa;
margin:0;
margin:0 -5px;
padding-left:5px;
}
.stat h2 + *{
margin:5px;
.stat > div {
margin:5px 0;
}
.stat h2 + div + div{
margin:0 5px 5px 5px;
}
.stat h2 + table{
.stat > table {
border-collapse:collapse;
width:calc(100% - 10px);
margin:5px 0;
width:100%;
}
.stat h2 + table th{
padding:5px;
}
.stat h2 + table td{
padding:5px;
}
.stat h2 + table td.numeric{
text-align:center;
}
.stat h2 + table thead th{
.stat > table > thead > tr {
border-bottom:2px solid #aaa;
}
.stat h2 + table tbody tr *{
.stat > table > tbody > tr {
border-bottom:1px solid #aaa;
}
.stat h2 + table tbody tr:last-child *{
.stat > table > tbody > tr:last-child {
border-bottom:0;
}
.stat h2 + table tr *{
.stat > table th, .stat > table td {
border-left:2px solid #aaa;
padding:5px;
}
.stat h2 + table tr *:first-child{
.stat > table th:first-child, .stat > table td:first-child {
border-left:0;
}
.stat > table td.numeric{
margin:5px 0;
text-align:center;
}
p/themes/Origine/freshrss.css
+20 -25
View File
@@ -899,48 +899,43 @@ input.extend {
}
}
.stat{
.stat {
border:1px solid #aaa;
border-radius:10px;
box-shadow:2px 2px 5px #aaa;
margin: 10px 0;
margin:10px 0;
padding:0 5px;
}
.stat h2{
.stat > h2 {
border-bottom:1px solid #aaa;
margin:0;
margin:0 -5px;
padding-left:5px;
}
.stat h2 + *{
margin:5px;
.stat > div {
margin:5px 0;
}
.stat h2 + div + div{
margin:0 5px 5px 5px;
}
.stat h2 + table{
.stat > table {
border-collapse:collapse;
width:calc(100% - 10px);
margin:5px 0;
width:100%;
}
.stat h2 + table th{
padding:5px;
}
.stat h2 + table td{
padding:5px;
}
.stat h2 + table td.numeric{
text-align:center;
}
.stat h2 + table thead th{
.stat > table > thead > tr {
border-bottom:2px solid #aaa;
}
.stat h2 + table tbody tr *{
.stat > table > tbody > tr {
border-bottom:1px solid #aaa;
}
.stat h2 + table tbody tr:last-child *{
.stat > table > tbody > tr:last-child {
border-bottom:0;
}
.stat h2 + table tr *{
.stat > table th, .stat > table td {
border-left:2px solid #aaa;
padding:5px;
}
.stat h2 + table tr *:first-child{
.stat > table th:first-child, .stat > table td:first-child {
border-left:0;
}
.stat > table td.numeric{
margin:5px 0;
text-align:center;
}