diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-03-02 20:52:03 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-03-02 20:52:03 +0100 |
| commit | ea800c0b8c2d0cbbc56da951894ccda678fa8997 (patch) | |
| tree | 409e40c2941a4471865c3118fe1c99ef6ed2b992 | |
| parent | 6b467974a33a054d96b69c8c3b85b2807ffd5f29 (diff) | |
| parent | e6eee5ba92bc64ea0c9855831bddf66acccd9bee (diff) | |
| download | volse-hubzilla-ea800c0b8c2d0cbbc56da951894ccda678fa8997.tar.gz volse-hubzilla-ea800c0b8c2d0cbbc56da951894ccda678fa8997.tar.bz2 volse-hubzilla-ea800c0b8c2d0cbbc56da951894ccda678fa8997.zip | |
Merge branch 'master' of https://github.com/friendica/red
| -rw-r--r-- | include/taxonomy.php | 4 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 20 |
3 files changed, 13 insertions, 13 deletions
diff --git a/include/taxonomy.php b/include/taxonomy.php index 3d1ac7058..ef3639067 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -152,7 +152,7 @@ function tagadelic($uid, $count = 0, $authors = '', $flags = 0, $restrict = 0, $ $range = max(.01, $max - $min) * 1.0001; for($x = 0; $x < count($tags); $x ++) { - $tags[$x][2] = 1 + floor(7 * ($tags[$x][1] - $min) / $range); + $tags[$x][2] = 1 + floor(9 * ($tags[$x][1] - $min) / $range); } return $tags; @@ -199,7 +199,7 @@ function dir_tagadelic($count = 0) { $range = max(.01, $max - $min) * 1.0001; for($x = 0; $x < count($tags); $x ++) { - $tags[$x][2] = 1 + floor(5 * ($tags[$x][1] - $min) / $range); + $tags[$x][2] = 1 + floor(9 * ($tags[$x][1] - $min) / $range); } return $tags; diff --git a/version.inc b/version.inc index 36fcceb22..baaf78090 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-03-01.958 +2015-03-02.959 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 8c4b8eb81..248c85592 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1459,50 +1459,50 @@ header { .shared_header img { margin-right: 10px; } .tag1 { - font-size : 1.0em !important; + font-size : 0.9em !important; } .tag2 { - font-size : 1.2em !important; + font-size : 1.0em !important; } .tag3 { - font-size : 1.4em !important; + font-size : 1.1em !important; } .tag4 { - font-size : 1.6em !important; + font-size : 1.2em !important; } .tag5 { - font-size : 1.8em !important; + font-size : 1.3em !important; } .tag6 { - font-size : 2.0em !important; + font-size : 1.4em !important; } .tag7 { - font-size : 2.2em !important; + font-size : 1.5em !important; } .tag8 { - font-size : 2.4em !important; + font-size : 1.6em !important; } .tag9 { - font-size : 2.6em !important; + font-size : 1.7em !important; } .tag10 { - font-size : 2.8em !important; + font-size : 1.8em !important; } |