From: Michael Vogel Date: Sun, 2 Mar 2014 00:29:20 +0000 (+0100) Subject: "vier": Several design changes. New option for coloured network items. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2b5345323f2e79bce9dd503e948d37e5810bd16b;p=friendica.git "vier": Several design changes. New option for coloured network items. --- diff --git a/view/theme/vier/config.php b/view/theme/vier/config.php index 653d2c80df..b06551bed2 100644 --- a/view/theme/vier/config.php +++ b/view/theme/vier/config.php @@ -39,7 +39,8 @@ function theme_admin_post(&$a){ function vier_form(&$a, $style){ $styles = array( "shadow"=>"Shadow", - "flat"=>"Flat" + "flat"=>"Flat", + "netcolour"=>"Coloured Networks" ); $t = get_markup_template("theme_settings.tpl" ); $o .= replace_macros($t, array( diff --git a/view/theme/vier/css/font2.css b/view/theme/vier/css/font2.css index 2357af604b..289d75fe3b 100644 --- a/view/theme/vier/css/font2.css +++ b/view/theme/vier/css/font2.css @@ -30,7 +30,7 @@ } .icon.s10 { - font-size: 1em; + font-size: 0.7em; } .icon.s16 { font-size: 1.2em; diff --git a/view/theme/vier/netcolour.css b/view/theme/vier/netcolour.css new file mode 100644 index 0000000000..c76e5b0af4 --- /dev/null +++ b/view/theme/vier/netcolour.css @@ -0,0 +1,34 @@ +.tread-wrapper { + background-color: #fafafa; +} +.twit { + /* background-color: #FFFAFA; */ + background-color: #fafeff; +} +.pump { + /* background-color: #FAFFFA; */ + background-color: #fcfffa; +} +.face { + /* background-color: #FAFAFF; */ + background-color: #fafcff; +} +.feed { + /* background-color: #FFFFFA; */ + background-color: #fffdfa; +} +.dspr { + background-color: #FFFAFF; +} +.dfrn { + background-color: #FAFAFA; +} +.stat { + /* background-color: #FAFFFF; */ + background-color: #fffafd; +} +.mail { + /* background-color: #FFFFF9; */ + background-color: #fffafa; +} + diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 87944a8614..7901612068 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -125,7 +125,8 @@ img { background-repeat: no-repeat; width: 18px; height: 18px; - display: block; + /* display: block; */ + display: inline-block; overflow: hidden; padding: 1px; color: #999; @@ -1116,18 +1117,18 @@ section.minimal { /* wall item */ .tread-wrapper { /* border-bottom: 1px solid #BDCDD4; */ -border-bottom: 1px solid #D2D2D2; + border-bottom: 1px solid #D2D2D2; position: relative; padding: 5px; margin-bottom: 10px; box-shadow: 1px 1px 6px -3px rgba(0, 0, 0, 0.7); - background-color: #FAFaFa; + background-color: #FFFFFF; /* width: 755px; */ } .wall-item-decor { position: absolute; left: 755px; - left: calc(100% - 7px); + left: calc(100% - 16px); /* top: -10px; */ width: 16px; } @@ -1157,15 +1158,19 @@ border-bottom: 1px solid #D2D2D2; .wall-item-bottom { /* font-size: 14px; */ } -.wall-item-container .wall-item-bottom { - opacity: 0; +/* .wall-item-container .wall-item-bottom { */ +.wall-item-container .wall-item-links, +.wall-item-container .wall-item-actions { + opacity: 0.2; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; -o-transition: all 0.2s ease-in-out; -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } -.wall-item-container:hover .wall-item-bottom { +/* .wall-item-container:hover .wall-item-bottom { */ +.wall-item-container:hover .wall-item-links, +.wall-item-container:hover .wall-item-actions { opacity: 1; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -1448,37 +1453,6 @@ border-bottom: 1px solid #D2D2D2; padding-right: 12px; */ } -.twit { - /* background-color: #FFFAFA; */ - background-color: #fafeff; -} -.pump { - /* background-color: #FAFFFA; */ - background-color: #fcfffa; -} -.face { - /* background-color: #FAFAFF; */ - background-color: #fafcff; -} -.feed { - /* background-color: #FFFFFA; */ - background-color: #fffdfa; -} -.dspr { - background-color: #FFFAFF; -} -.dfrn { - background-color: #FAFAFA; -} -.stat { - /* background-color: #FAFFFF; */ - background-color: #fffafd; -} -.mail { - /* background-color: #FFFFF9; */ - background-color: #fffafa; -} - #profile-jot-form { box-shadow: 1px 1px 6px -3px #666; background-color: #fafafa; diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl index 57e1fe9f20..3062b518f3 100644 --- a/view/theme/vier/templates/wall_thread.tpl +++ b/view/theme/vier/templates/wall_thread.tpl @@ -27,8 +27,8 @@ {{if $item.thread_level!=1}}
{{/if}}
- {{$item.star.starred}} - {{if $item.lock}}{{$item.lock}}{{/if}} + +
@@ -57,11 +57,11 @@
{{$item.name}} - {{if $item.owner_url}}{{$item.via}} {{$item.owner_name}} {{/if}} + {{if $item.owner_url}}{{$item.via}} {{$item.owner_name}} {{/if}} {{if $item.plink}}{{$item.created}}{{else}} {{$item.created}} {{/if}} - {{if $item.lock}}{{$item.lock}} {{/if}} + {{if $item.lock}}{{$item.lock}}{{/if}} {{$item.network_name}} @@ -92,7 +92,7 @@
@@ -100,8 +100,9 @@ {{/if}}{{/if}} {{if $item.vote}} + {{if $item.vote.like}} - {{if $item.vote.dislike}} + {{/if}}{{if $item.vote.dislike}} {{/if}} {{if $item.vote.share}} diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index ece90facea..e2d007732b 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -18,6 +18,8 @@ $a->theme_info = array(); $style = get_pconfig(local_user(), 'vier', 'style'); if ($style == "flat") $a->page['htmlhead'] .= ''."\n"; +else if ($style == "netcolour") + $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= <<< EOT