diff options
-rw-r--r-- | images/rhash-16.png | bin | 0 -> 679 bytes | |||
-rwxr-xr-x | include/text.php | 1 | ||||
-rw-r--r-- | view/theme/redbasic/css/dark.css | 175 | ||||
-rw-r--r-- | view/theme/redbasic/css/mod_page.css | 22 | ||||
-rw-r--r-- | view/theme/redbasic/css/style.css | 8 | ||||
-rw-r--r-- | view/theme/redbasic/js/redbasic.js | 11 | ||||
-rw-r--r-- | view/theme/redbasic/php/config.php | 1 | ||||
-rw-r--r-- | view/theme/redbasic/php/style.php | 4 | ||||
-rwxr-xr-x | view/tpl/page_display.tpl | 4 |
9 files changed, 214 insertions, 12 deletions
diff --git a/images/rhash-16.png b/images/rhash-16.png Binary files differnew file mode 100644 index 000000000..23dd9e4b3 --- /dev/null +++ b/images/rhash-16.png diff --git a/include/text.php b/include/text.php index 086104466..f10541144 100755 --- a/include/text.php +++ b/include/text.php @@ -891,6 +891,7 @@ function smilies($s, $sample = false) { '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />', '<img class="smiley" src="' . $a->get_baseurl() . '/images/like.gif" alt=":like" />', '<img class="smiley" src="' . $a->get_baseurl() . '/images/dislike.gif" alt=":dislike" />', + '<img class="smiley" src="' . $a->get_baseurl() . '/images/rhash-16.png" alt="red#" /></a>', '<a href="http://project.friendika.com">~friendika <img class="smiley" src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>', '<a href="http://friendica.com">~friendica <img class="smiley" src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>' ); diff --git a/view/theme/redbasic/css/dark.css b/view/theme/redbasic/css/dark.css index 869f8ec3d..74e109f95 100644 --- a/view/theme/redbasic/css/dark.css +++ b/view/theme/redbasic/css/dark.css @@ -1,5 +1,170 @@ -body, button, input, select, textarea {color: #eec !important; background: #2e2f2e;} -.wall-item-outside-wrapper.shiny, .wall-item-content-wrapper.shiny, .shiny {background: #2e3436;} -.wall-item-outside-wrapper, .wall-item-content-wrapper.comment {background: #2e2f2e;} -#profile-jot-text, #photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper, #jot #jot-title, #jot-category, .tab {background: #333; color: #eec;} -.wall-item
\ No newline at end of file +body { font-family: sans-serif; + font-size: 12px; + background-color: #101010; + background-image: -moz-linear-gradient(top, #000 16%, #101010 82%); + background-image: linear-gradient(bottom, #000 16%, #101010 82%); + background-image: -o-linear-gradient(bottom, #000 16%, #101010 82%); + background-image: -webkit-linear-gradient(bottom, #000 16%, #101010 82%); + background-image: -ms-linear-gradient(bottom, #000 16%, #101010 82%); + background-repeat: no-repeat; + background-attachment: fixed; + color: #eec; + +} + +aside { +border: none; +color: #fff; +} + +.fn { + color: #fff; +} + +.acl-list-item, +.profile-jot-net { + color: #000; +} + + +.tab.active { + color: #fff; +} + +blockquote {color: #000;} + +.wall-item-content-wrapper { + background: #262626; + border-radius: 5px; + box-shadow: 12px 12px 12px #000; + margin-bottom: 20px; +} + +.wall-item-content-wrapper.comment { + margin-left: 50px; + box-shadow: 5px 5px 5px #000; +} + +.comment-edit-text-empty, .comment-edit-text-full { + border-radius: 5px 5px 5px 5px; + box-shadow: 5px 5px 5px #000 inset; +} + + +#profile-jot-text { + height: 20px; + color:#000; + border: 1px solid #cccccc; + padding: 8px; + margin-right: 0px; + width: 90%; + -moz-border-radius: 5px; + border-radius: 5px; + box-shadow: 4px 4px 3px 0 #666 inset; +} +#profile-jot-text:hover { + color: #000000; +} + +#profile-jot-submit { + height: auto; + background-color: #0080FF; + color: #eeeeec; + font-weight: bold; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + border: 2px outset #222420 !important; + margin: 0; + float: right; + text-shadow: 1px 1px #111; + width: auto; + box-shadow: 5px 5px 5px #444; +} + + +.widget { + border-bottom: 1px solid #eec; + padding: 8px; + margin-top: 5px; + -moz-border-radius:5px; + -webkit-border-radius:5px; + border-radius:5px; + +} + +nav a, +nav a:active, +nav a:visited, +nav a:link { + color: #ffffff; + text-decoration: none; + outline: none; +} + +.nav-menu.selected a { + color: #0080ff !important; +} + +nav .nav-menu-icon { + position: relative; + height: 22px; + padding: 5px; +/* margin: 3px 10px; */ + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} + +nav .nav-notify { + background-color: #0080FF; + color: #fff; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + opacity: 0.6; + filter:alpha(opacity=60); + +} +.nav-notify:hover, nav .nav-notify.selected span { + color: #ffffff; +} + +ul.menu-popup { + + position: absolute; + display: none; + width: 10em; + background: #000; + color: #fff; + padding: 0px; + list-style: none; + border-radius: 0px 0px 20px 20px; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +ul.menu-popup a { + display: block; + color: #FFFFFF; + padding: 5px 10px; + text-decoration: none; +} + + +ul.menu-popup a:hover { + background-color: #888888; + color: #FFFFFF; +} +ul.menu-popup .menu-sep { + border-top: 1px solid #9eabb0; +} + +.wall-item-photo, +.photo, +.contact-block-img, +.my-comment-photo { + border-radius: 5px; + box-shadow: 4px 4px 3px #000; +}
\ No newline at end of file diff --git a/view/theme/redbasic/css/mod_page.css b/view/theme/redbasic/css/mod_page.css new file mode 100644 index 000000000..26c16b88c --- /dev/null +++ b/view/theme/redbasic/css/mod_page.css @@ -0,0 +1,22 @@ +section { +left: 0px; +width: 800px; +margin-left: auto; +margin-right: auto; +} +body {background-color: #d00 !important;} + +.page-content-wrapper {background: #fff; + color: #000; + border-radius: 20px; + box-shadow: 5px 5px 5px #111; +} + +h3.page-title { +padding-top: 30px; + color: #033} +.page-body {padding: 40px;} + +.page-body strong {color: #033;} + +.nav-links {margin-top: 5px;}
\ No newline at end of file diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 60f4e3fe2..70a994809 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -929,12 +929,12 @@ footer { /* background: #fff; */ /* border-radius: 5px; */ /* box-shadow: 12px 12px 12px #111; */ - border-left: 1px solid #eec; +/* border-left: 1px solid #eec; */ } .wall-item-content-wrapper.comment { /* background: #fff; */ - border-left: 1px solid #e0e0e0; +/* border-left: 1px solid #e0e0e0; */ margin-left: 50px; /* box-shadow: 5px 5px 5px #222; */ } @@ -945,9 +945,9 @@ footer { .wall-item-content-wrapper.comment { - background: #ffffff; +/* background: #ffffff; border-left: 1px solid #e0e0e0; - +*/ } .wall-item-like.comment, .wall-item-dislike.comment { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 00b8fa39f..c1f67dcd5 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -86,4 +86,13 @@ $('.savedsearchterm').hover( }); - + $(document).ready(function(){ + var doctitle = document.title; + function checkNotify() { + if(document.getElementById("notify-update").innerHTML != "") + document.title = "("+document.getElementById("notify-update").innerHTML+") " + doctitle; + else + document.title = doctitle; + }; + setInterval(function () {checkNotify();}, 10 * 1000); + })
\ No newline at end of file diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 21399945c..9b1cf1fbd 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -96,6 +96,7 @@ function redbasic_form(&$a, $font_size, $line_height, $colour, $shadow, $navcolo $colour_schemes = array( 'redbasic' => 'redbasic', 'fancyred' => 'fancyred', + 'dark' => 'dark', ); $shadows = array( 'true' => 'Yes', diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index e011d6185..e5b128546 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -41,7 +41,9 @@ // In non-expert mode, we just let them choose font size, line height, and a colour scheme. A colour scheme is just a pre-defined set of the above variables. // But only apply these settings in non-expert mode to prevent confusion when turning expert mode on and off. if(! feature_enabled(local_user(),'expert')) { - if ($colour_scheme === 'fancyred') {$shadows = true; $navcolour = 'black'; $shadows = true; $displaystyle = 'fancy'; $linkcolour = 'f00'; $shiny = "opaque";} + if ($colour_scheme === 'fancyred') {$shadows = true; $navcolour = 'black'; $displaystyle = 'fancy'; $linkcolour = 'f00'; $shiny = "opaque";} + // Dark themes are very different - we need to do some of these from scratch, so don't bother setting vars for anything else + if ($colour_scheme === 'dark') {$colour = 'dark'; $navcolour = 'black';} } // This is probably the easiest place to apply global settings. Don't bother with site line height and such. Instead, check pconfig for global user settings. diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl index e61a86fc9..2abb80e92 100755 --- a/view/tpl/page_display.tpl +++ b/view/tpl/page_display.tpl @@ -4,9 +4,11 @@ * *}} <div class=page"> - <h3 class="page-title">{{$title}}</h3> +<div class="page-content-wrapper" id="page-content-wrapper" > + <h3 class="page-title">{{$title}}</h3> <div class="page-author"><a class=="page-author-link" href="{{$auth_url}}">{{$author}}</a></div> <div class="page-date">{{$date}}</div> <div class="page-body">{{$body}}</div> </div> +</div>
\ No newline at end of file |