diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css index 40aa5768e..15b9fa8d6 100644 --- a/view/theme/frost-mobile/style.css +++ b/view/theme/frost-mobile/style.css @@ -1140,8 +1140,11 @@ input#dfrn-url { margin-top: 10px; } +.toplevel_item { + margin-bottom: 60px; +} + .wall-item-content-wrapper { - margin-top: 60px; padding-top: 30px; border-top: 2px solid #AAAAAA; position: relative; @@ -1238,9 +1241,6 @@ input#dfrn-url { top: 80px; /* z-index: 100;*/ } -.wall-item-wrapper { - margin-left:10px; -} .wall-item-lock { margin-top: 30px; left: 105px; @@ -1395,6 +1395,7 @@ input#dfrn-url { .wall-item-body { text-align: justify; float: left; + clear: left; /* width: 300px;*/ overflow: hidden; margin-top: 10px; @@ -3289,6 +3290,11 @@ aside input[type='text'] { margin-top: 10px; } +.filesavetags, .categorytags { + display: block; + clear: left; +} + .body-tag, .filesavetags, .categorytags { opacity: 0.5; filter:alpha(opacity=50); diff --git a/view/theme/frost-mobile/theme.php b/view/theme/frost-mobile/theme.php index 7d95fc888..b934522c6 100644 --- a/view/theme/frost-mobile/theme.php +++ b/view/theme/frost-mobile/theme.php @@ -4,7 +4,7 @@ * Name: Frost--mobile version * Description: Like frosted glass * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0). - * Version: Version 0.2.14 + * Version: Version 0.2.15 * Author: Zach P * Maintainer: Zach P */ diff --git a/view/theme/frost/default.php b/view/theme/frost/default.php index cf30e1fca..06ca40c17 100644 --- a/view/theme/frost/default.php +++ b/view/theme/frost/default.php @@ -28,11 +28,9 @@
-
-
diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index de454ce74..c12e14de7 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -78,9 +78,10 @@ blockquote { } .hide-comments-outer { - margin-left: 0px; + margin-left: 75px; font-weight: 700; opacity: 0.4; + border-bottom: 1px solid #AAA; } .hide-comments-outer:hover { opacity: 1.0; @@ -297,37 +298,29 @@ aside { } /* section */ -div.section-wrapper { +section { width: 565px; - margin-left: auto; - margin-right: auto; - - padding-right:2em; - display: block; - background-color: #ffffff; - background-image: url(border.jpg); - background-position: top right; - background-repeat: no-repeat; -} - -section { - margin: 0px 0px 0px 0px; - - width: 100%; + margin-left: auto; + margin-right: auto; + margin-top: 0px; + margin-bottom: 0px; padding-left: 1em; padding-right: 1em; padding-top: 1em; - background-image: url(border.jpg); + background-color: #ffffff; +/* background-image: url(border.jpg); background-position: top left; - background-repeat: no-repeat; + background-repeat: no-repeat;*/ min-height: 112px; - border-top: 1px solid #babdb6; + border-top: 1px solid #babdb6; + border-left: 1px dotted #AAA; + border-right: 1px dotted #AAA; } .tabs { @@ -1104,8 +1097,11 @@ input#dfrn-url { margin-top: 10px; } +.toplevel_item { + margin-bottom: 40px; +} + .wall-item-content-wrapper { - margin-top: 60px; padding-top: 30px; border-top: 2px solid #AAA; position: relative; @@ -1114,8 +1110,8 @@ input#dfrn-url { .wall-item-content-wrapper.comment { margin-top: 10px; - padding-top: none; - margin-left: 50px; + padding-top: 0px; + margin-left: 75px; border: none; } @@ -1124,12 +1120,18 @@ input#dfrn-url { margin-left: 0px; opacity: 0.4; } +.wall-item-dislike { + margin-bottom: 15px; +} .wall-item-like:hover, .wall-item-dislike:hover { opacity: 1.0; } .wall-item-like.comment, .wall-item-dislike.comment { - margin-left: 50px; + margin-left: 75px; +} +.wall-item-dislike.comment { + margin-bottom: 0px; } .wall-item-info { @@ -1176,8 +1178,8 @@ input#dfrn-url { .wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; } -.comment .wall-item-photo-menu-button { /*top: 44px;*/ top: 64px;} -.comment .wall-item-photo-menu { /*top: 60px;*/ top: 80px; } +.comment .wall-item-photo-menu-button { /*top: 44px;*/ top: 34px;} +.comment .wall-item-photo-menu { /*top: 60px;*/ top: 50px; } .wallwall .wwto { left: 50px; @@ -1201,9 +1203,6 @@ input#dfrn-url { top: 70px; z-index: 100; } -.wall-item-wrapper { - margin-left:10px; -} .wall-item-lock { margin-top: 30px; left: 105px; @@ -1212,6 +1211,7 @@ input#dfrn-url { } .comment .wall-item-lock { left: 65px; + margin-top: 0px; } .wall-item-ago { @@ -1349,6 +1349,7 @@ input#dfrn-url { .wall-item-body { text-align: justify; float: left; + clear: left; /*width: 450px;*/ width: 100%; margin-top: 10px; @@ -1364,28 +1365,23 @@ input#dfrn-url { .wall-item-tools { clear: both; -/* background-image: url("head.jpg"); - background-position: 0 -20px; - background-repeat: repeat-x;*/ + margin-top: 10px; margin-left: 0px; - margin-bottom: 7px; -/* padding: 5px 10px 0px;*/ - padding: 5px 10px 0px 2px; - height: 28px; + padding: 10px 10px 0px 2px; + + height: 22px; + border-bottom: 1px solid #ddd; } .wall-item-author { -/* margin-top: 10px;*/ margin-top: 0px; } .comment .wall-item-tools { -/* background:none;*/ -/* background-image: url("head.jpg"); - background-position: 0 -20px; - background-repeat: repeat-x;*/ margin-left: 0px; + margin-top: 0px; + padding-top: 0px; } .comment-edit-wrapper { @@ -1398,7 +1394,7 @@ input#dfrn-url { display: block; margin-top: 15px; background: #f3f3f3; - margin-left: 50px; + margin-left: 75px; } .comment-wwedit-wrapper.comment { @@ -3098,6 +3094,11 @@ aside input[type='text'] { margin-top: 10px; } +.filesavetags, .categorytags { + display: block; + clear: left; +} + .body-tag, .filesavetags, .categorytags { opacity: 0.5; filter:alpha(opacity=50); @@ -3121,8 +3122,20 @@ aside input[type='text'] { } -#item-delete-selected { +#item-delete-selected-top { margin-top: 30px; + padding-bottom: 1.5em; +} +#item-delete-selected-top-icon, #item-delete-selected-top-desc { + float: left; + margin-right: 5px; +} +#item-delete-selected-top-desc:hover { + text-decoration: underline; +} + +#item-delete-selected { + margin-top: 0px; } #item-delete-selected-end { diff --git a/view/theme/frost/theme.php b/view/theme/frost/theme.php index 4ab651988..a3d4b0ac9 100644 --- a/view/theme/frost/theme.php +++ b/view/theme/frost/theme.php @@ -4,7 +4,7 @@ * Name: Frost * Description: Like frosted glass * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0). - * Version: Version 0.2.12 + * Version: Version 0.3 * Author: Zach P * Maintainer: Zach P */ diff --git a/view/theme/frost/threaded_conversation.tpl b/view/theme/frost/threaded_conversation.tpl new file mode 100644 index 000000000..1e77f91c2 --- /dev/null +++ b/view/theme/frost/threaded_conversation.tpl @@ -0,0 +1,22 @@ +{{ if $dropping }} + +{{ endif }} + +$live_update + +{{ for $threads as $item }} +{{ inc $item.template }}{{ endinc }} +{{ endfor }} + +
+ +{{ if $dropping }} + +
+{{ endif }}