From: Samantha Doherty Date: Thu, 10 Mar 2011 23:05:04 +0000 (-0500) Subject: Big update for neo theme (and a couple wee fixes for rebase). X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b07227b9d26995431c2d3f1eb3b2f18e3f31d34c;p=quix0rs-gnu-social.git Big update for neo theme (and a couple wee fixes for rebase). --- diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css index d230fc0a42..cdc33bd308 100644 --- a/theme/neo/css/display.css +++ b/theme/neo/css/display.css @@ -13,11 +13,19 @@ body { background-color: #C6C8CC; background-image: url(../images/bg.png); - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 82%; + font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 14px; + line-height: 1.6; + color: #222; +} + +input, textarea, select, option { + font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 1em; } a {color: #3e3e8c;} +a:hover {color: blue;} h1 {font-size: 1.6em;} h2 {font-size: 1.6em;} @@ -27,59 +35,48 @@ h5 {font-size: 1.2em;} h6 {font-size: 1em;} #wrap { - width: 930px; + width: 960px; margin: 0px auto; - padding: 0px 15px 10px 15px; - background-color: #fff; - border-left: 10px solid #E0E0E0; - border-right: 10px solid #E0E0E0; + background: #fff url('../images/brdr_black_dot.png') repeat-x 0px 10px; + border-left: 10px solid #fff; + border-right: 10px solid #fff; + padding-top: 10px; } #header { - width: 940px; + width: 960px; padding: 0px; - padding-top: 50px; + padding-top: 12px; } address { float: left; - margin-right: 20px; - margin-top: 0px; -} - -.poweredby { - background: url(../images/sn-tiny.png) no-repeat top left; - height: 40px; - font-size: 0.8em; - color: #fff; - line-height: 42px; - padding-left: 50px; - position: absolute; - top: 6px; - left: 0; + position: relative; + top: 1px; + left: 2px; + margin: 0px; + padding: 0px; + height: 24px; + width: 148px; z-index: 99; - font-style: normal; -} - -.poweredby a { - color: #fff !important; - font-weight: bold; } #site_nav_global_primary { display: block; position: absolute; - top: 0; - left: 0; - z-index: 98; - background-color: #364A84; - width: 960px; - margin-left: -15px; - margin-top: 0px; + top: 10px; + right: 0; + width: 800px; + margin: 0px; height: 24px; line-height: 20px; - border-top: 10px solid #fff; - border-bottom: 1px solid #fff; + -webkit-border-top-right-radius: 6px; + -moz-border-radius-topright: 6px; + border-top-right-radius: 6px; + background: #364A84; + background: -moz-linear-gradient(top, #516499 , #364a84); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#516499), color-stop(100%,#364a84)); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#516499', endColorstr='#364a84',GradientType=0 ); /* XXX move all to ie.css */ } #site_nav_global_primary ul { @@ -91,13 +88,13 @@ address { } #site_nav_global_primary li:last-child { - margin-right: 16px; + margin-right: 10px; } #site_nav_global_primary a { color: #fff !important; text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5); - padding: 2px 12px 2px 12px; + padding: 2px 10px 2px 10px; height: 20px; display: block; float: left; @@ -137,145 +134,255 @@ address { color: #3e3e8c; } -.form_notice { +#core { + clear: both; + margin: 0px; + width: 960px; + border-top: 5px solid #FB6104; +} + +#site_nav_local_views { + display: block; float: left; + width: 138px; margin-top: 0px; - width: 510px; padding: 10px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - background: #cdd1dd; + padding-top: 22px; + background-color: #ececf2; + border-left: 1px solid #d8dae6; + border-right: 1px solid #d8dae6; + min-height: 800px; /* XXX set up equal column heights! */ } -.form_notice fieldset { - width: 100%; +#site_nav_local_views H3 { + margin-bottom: 10px; + padding-bottom: 6px; + background: url('../images/brdr_black_dot.png') repeat-x bottom left; + color: #7a7c87; + font-size: 1.1em; + letter-spacing: 2px; + text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5); + text-transform: uppercase; } -.form_notice textarea { - width: 378px; - height: 54px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; +#site_nav_local_views li { + display: block; + margin: 0px 0px 8px 0px; } -.form_notice label.notice_data-attach { - top: 27px; - right: 86px; +#site_nav_local_views li ul { + margin-bottom: 20px; } -.form_notice #notice_data-geo_wrap label, -.form_notice #notice_data-geo_wrap input { - top: 52px; - right: 86px; +#site_nav_local_views a { + display: block; + padding: 0px 0px 1px 10px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + text-transform: uppercase; + text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5); } -.form_notice #notice_action-submit { - font-size: 0.9em; - top: 80px; - right: -2px; - height: 2.4em; - width: 106px; +#site_nav_local_views a:hover, #site_nav_local_views .current a { + color: #fff; + text-decoration: none; + text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5); + background: #364a84; + background: -moz-linear-gradient(top, #7b8dbb , #364a84); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84)); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 ); } -.form_notice .error, -.form_notice .success, -.form_notice .notice-status { - width: 341px; +#content { + width: 520px; + margin-right: 0px; + padding: 20px; } -.form_notice .error { - margin-left: 0px; -} +/* Input forms */ -#core { - clear: both; - margin: 0px; - width: 930px; - margin-left: 0px; - margin-top: 8px; +.input_forms { + float: left; + position: relative; + top: -20px; + left: -20px; + padding: 18px 20px 0px 20px; + background: #fafafa url('../images/brdr_black_dot.png') repeat-x bottom left; } -#content { - width: 530px; - margin-right: 0px; - padding-left: 30px; - padding-right: 30px; +#input_form_nav { + float: left; + margin-bottom: 10px; } -#site_nav_local_views { +#input_form_nav li a { display: block; float: left; - width: 130px; - margin-top: 5px; + padding: 0px 10px 1px 10px; + margin-right: 10px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + border: 1px solid #ECECF2; + font-weight: bold; + line-height: 1.4em; + text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.9); + background: #ececf2; + background: -moz-linear-gradient(top, #fff , #ececf2); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fff), color-stop(100%,#ececf2)); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fff', endColorstr='#ececf2',GradientType=0 ); } -#site_nav_local_views H3 { - border-bottom: 3px solid #A6ADBF; - color: #A6ADBF; - font-size: 1.1em; - letter-spacing: 2px; - margin-bottom: 10px; - text-transform: uppercase; +#input_form_nav li:hover a, #input_form_nav li.current a { + color: #fff; + text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + border: 1px solid #ececf2; + background: #364a84; + background: -moz-linear-gradient(top, #7b8dbb , #364a84); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84)); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 ); } -#site_nav_local_views li { - display: block; - margin: 0px 0px 6px 0px; +.input_form_nav_tab a, .input_form_nav_tab.current { + text-decoration: none !important; /* XXX cf rebase */ } -#site_nav_local_views li ul { - margin-bottom: 20px; +.input_form { + position: relative; + float: left; + width: 520px; + padding-bottom: 15px; } -#site_nav_local_views a { - padding: 2px 0px 2px 10px; - display: block; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; +#input_form_status { + padding-bottom: 45px; } -#site_nav_local_views a:hover { - background: #8e98b4 !important; - color: #fff !important; - text-decoration: none; - text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5); +.form_notice { + padding: 0px; + background: none; } -#site_nav_local_views .current a { - text-decoration: none; - background: #8e98b4 !important; - color: #fff !important; - text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5); +.form_notice fieldset { + width: auto; + position: static; } -#aside_primary { - background: none; - width: 210px; - padding-top: 0px; +.form_notice #notice_data-text-label { + display: none; /* XXX move into input with js */ +} + +.form_notice textarea { + width: 473px; + height: 42px; + padding: 6px 10px 18px 10px; + border: 1px solid #a6a6a6; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2); + z-index: 97; + font-size: 1.2em; +} + +.form_notice label.notice_data-attach { + top: 0px; + right: 0px; + z-index: 96; +} + +.form_notice .notice_data-geo_wrap label, +.form_notice .notice_data-geo_wrap input { + top: 26px; + right: 0px; + z-index: 99; +} + +.form_notice .count { + position: absolute; + top: 50px; + right: 35px; + font-size: 0.8em; + height: 1em; + z-index: 99; +} + +.form_notice #notice_action-submit { + position: absolute; + top: 100%; + left: 0px; + margin-top: -44px; + float: left; + width: 90px; + padding: 0px; + z-index: 99; +} + +.form_notice .error, +.form_notice .success. +.form_notice .notice-status { + width: 478px; + position: relative; + top: 0px; + float: none; + clear: none; + margin-left: 0px; margin-top: 5px; + padding: 5px 5px 5px 10px; + border: 1px solid #ccc; +} + +.form_notice .error { + border: 1px solid #d05858; +} + +.form_notice .attach-status code { + font-size: 1em; +} + +.input_form fieldset { + margin: 0px; + padding: 0px; +} + +.input_form fieldset fieldset { + margin-bottom: 10px !important; +} + +#aside_primary { + width: 218px; + padding: 10px; + padding-top: 22px; + margin-top: 0px; + background-color: #ececf2; + border-left: 1px solid #d8dae6; + border-right: 1px solid #d8dae6; + min-height: 800px; /* XXX set up equal column heights! */ } #aside_primary .section { width: 100%; margin-left: 0px; margin-right: 0px; + font-size: 0.88em; } #aside_primary h2 { - border-bottom: 3px solid #A6ADBF; - color: #A6ADBF; - font-size: 1.1em; - letter-spacing: 2px; margin-bottom: 10px; + padding-bottom: 6px; + background: url('../images/brdr_black_dot.png') repeat-x bottom left; + color: #7a7c87; + font-size: 1.25em; + letter-spacing: 2px; + text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5); text-transform: uppercase; - text-align: right; } .section ul.entities { - width: 290px; + width: 220px; } .section .entities li { @@ -286,8 +393,8 @@ address { #popular_notices .avatar { position: relative; - top: 2px; - margin-bottom: 4px; + top: 4px; + margin-bottom: 6px; } #aside_primary td { @@ -310,7 +417,7 @@ address { color: #A6ADBF; font-size: 1.4em; letter-spacing: 4px; - text-transform: uppercase; + text-transform: none; } #notices_primary { @@ -323,17 +430,17 @@ address { } .notice { - line-height: 1.35em; + line-height: 1.36em; margin-bottom: 10px; } #content .notice .author .photo { left: 0px; - top: 6px; + top: 9px; } #content .notice .entry-title { - min-height: 34px; + min-height: 35px; } #showstream .notice .entry-title { @@ -345,7 +452,7 @@ address { } .notice div.entry-content { - font-size: 0.9em; + font-size: 0.88em; line-height: 1.2em; margin-top: 6px; opacity: 0.6; @@ -371,6 +478,96 @@ div.entry-content a.response:after { margin-top: 4px; } +.threaded-replies { + clear: both; + float: left; + width: 458px; + margin-left: 59px; + margin-top: 10px; + padding-right: 2px; + border-left: 3px solid #ECECF2; + background: #fafafa; + font-size: 1em; +} + +#content .notice .threaded-replies .notice { + padding-bottom: 14px; + padding-top: 5px; + border-bottom: 2px dotted #eee; + line-height: 1.36em; + margin-top: 0px; + margin-bottom: 0px; + margin-left: 10px; + background: none; +} + +#content .threaded-replies .notice .author .photo { + height: 24px; + width: 24px; + top: 14px; +} + +#content .notice .threaded-replies .notice .entry-title { + margin: 2px 7px 0px 35px; +} + +#content .notice .threaded-replies .notice div.entry-content { + clear:left; + float:left; + margin-left: 35px; + margin-top: 10px; +} + +.threaded-replies li { + list-style-type: none; +} + +.threaded-replies .notice-reply-comments { + margin: 2px 0px 4px 10px; +} + +.threaded-replies .placeholder { + margin: 10px; + width: 426px; +} + +.threaded-replies .notice-reply { + clear: left; + position: relative; + padding: 10px; + padding-bottom: 44px; +} + +.threaded-replies .form_notice textarea { + width: 385px; +} + +.threaded-replies .form_notice label.notice_data-attach { + top: 10px; + right: 10px; +} + +.threaded-replies .form_notice .notice_data-geo_wrap label, +.threaded-replies .form_notice .notice_data-geo_wrap input { + top: 36px; + right: 10px; +} + +.threaded-replies .form_notice .count { + top: 60px; + right: 50px; +} + +.threaded-replies .form_notice #notice_action-submit { + left: 10px; +} + +.threaded-replies .form_notice .error, +.threaded-replies .form_notice .success, +.threaded-replies .form_notice .notice-status { + width: 390px; +} + .pagination { height: 1.2em; } @@ -382,14 +579,10 @@ div.entry-content a.response:after { .entity_profile { float: left; - width: 435px; + width: 360px; margin-top: 4px; } -td.entity_profile { /* cf directory table */ - width: auto; -} - .entity_profile .entity_depiction { margin-top: 4px; } @@ -453,7 +646,7 @@ td.entity_profile { /* cf directory table */ top: -3px; } -.pagination { +#pagination { height: 1.2em; padding-bottom: 12px; -webkit-border-radius: 6px; @@ -493,29 +686,29 @@ td.entity_profile { /* cf directory table */ } .form_notice input.submit, .form_settings input.submit, .form_settings input.cancel { - border-radius: 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5); + height: 1.9em; + padding: 0px 10px; color:#fff; - font-weight: normal; - font-size: 1em; - height: 2.2em; - padding-left: 1em; - padding-right: 1em; - background: #7080aa; - background: -moz-linear-gradient(top, #7b8dbb , #7080aa); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#7080aa)); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#7080aa',GradientType=0 ); - border-width: 1px; + font-weight: bold; + text-transform: uppercase; + font-size: 1.2em; + text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2); + border: 1px solid #d7621c; + border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + background: #FB6104; + background: -moz-linear-gradient(top, #ff9d63 , #FB6104); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff9d63), color-stop(100%,#FB6104)); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff9d63', endColorstr='#FB6104',GradientType=0 ); } .form_notice input.submit:hover, .form_settings input.submit:hover, .form_settings input.cancel:hover { - text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.8); - background: #7b8dbb; - background: -moz-linear-gradient(top, #7080aa , #7b8dbb); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7080aa), color-stop(100%,#7b8dbb)); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7080aa', endColorstr='#7b8dbb',GradientType=0 ); + text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.6); + background: #ff9d63; + background: -moz-linear-gradient(top, #FB6104 , #fc8035); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FB6104), color-stop(100%,#fc8035)); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FB6104', endColorstr='#fc8035',GradientType=0 ); } .form_settings input#settings_design_reset, .form_settings input.cancel { @@ -825,4 +1018,63 @@ ul.bookmark-tags a:hover { margin-right: 0px; } +/* Directory specific styles */ + +td.entity_profile { + width: auto; +} + +#user_directory { + position: relative; + top: -20px; +} + +div#user_directory div.alpha_nav > a { + border-left: 1px solid #ccc !important; + padding-left: 3.5px !important; + padding-right: 4px !important; + margin-right: 0px; + float: left; + line-height: 1.4em; +} + +div#user_directory div.alpha_nav > a.first { + border-left: none !important; +} + +div#user_directory div.alpha_nav a.current { + background-color: #ECECF2 !important; +} + +table.profile_list { + margin-top: 10px; +} + +.profile_list th#created { + width: 100px; +} + +.profile_list th#subscriptions { + width: 120px; +} + +table.profile_list tr.alt { + background-color: #fafafa !important; +} + +.profile_list .entity_actions { + width: 30px; + height: 26px; + margin-right: 5px; +} + +.profile_list .entity_actions input { + width: 26px; + height: 26px; + display: block; + overflow: hidden; + font-size: 0em; +} + + }/*end of @media screen, projection, tv*/ diff --git a/theme/neo/images/brdr_black_dot.png b/theme/neo/images/brdr_black_dot.png new file mode 100644 index 0000000000..8a300b1e93 Binary files /dev/null and b/theme/neo/images/brdr_black_dot.png differ diff --git a/theme/neo/images/brdr_white_dot.png b/theme/neo/images/brdr_white_dot.png new file mode 100644 index 0000000000..cdb2d5b205 Binary files /dev/null and b/theme/neo/images/brdr_white_dot.png differ diff --git a/theme/neo/logo.png b/theme/neo/logo.png index 61a445a61a..3891979530 100644 Binary files a/theme/neo/logo.png and b/theme/neo/logo.png differ diff --git a/theme/neo/theme.ini b/theme/neo/theme.ini index 0209008d40..b85ceca0b4 100644 --- a/theme/neo/theme.ini +++ b/theme/neo/theme.ini @@ -1 +1,5 @@ +external[]="http://fonts.googleapis.com/css?family=Lato:100,100italic,300,300italic,400,400italic,700,700italic,900,900italic" +external[]="http://fonts.googleapis.com/css?family=Cabin:400,500,600,bold" +external[]="http://fonts.googleapis.com/css?family=Puritan:regular,italic,bold,bolditalic" +external[]="http://fonts.googleapis.com/css?family=Cantarell:regular,italic,bold,bolditalic" include=rebase diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css index c1ac1e8f4d..ee88b312a7 100644 --- a/theme/rebase/css/display.css +++ b/theme/rebase/css/display.css @@ -928,7 +928,7 @@ outline:none; text-indent:-9999px; } -.pagination { +#pagination { background-color: #f2f2f2; clear: left; margin-top: 20px; @@ -936,19 +936,15 @@ text-indent:-9999px; height: 1em; } -.pagination dt { - display: none; -} - -.pagination li { +#pagination li { display: inline; } -.pagination .nav_prev { +#pagination .nav_prev { float: left; } -.pagination .nav_next { +#pagination .nav_next { float: right; } @@ -1737,7 +1733,7 @@ body.realtime-popup { right: 70px; } -.realtime-popup .form_notice .notice_data-geo_wrap label, .form_notice .notice_data-geo_wrap input { +.realtime-popup .form_notice .notice_data-geo_wrap label, .realtime-popup .form_notice .notice_data-geo_wrap input { right: 2px; } @@ -1763,8 +1759,8 @@ body.realtime-popup { .notice-options .notice_delete, .notice-options form.form_repeat input.submit, #new_group a, -.pagination .nav_prev a, -.pagination .nav_next a, +#pagination .nav_prev a, +#pagination .nav_next a, button.close, .form_group_leave input.submit, .form_user_unsubscribe input.submit, @@ -1940,12 +1936,12 @@ background-position:0 -1054px; background-position: 0 -1846px; } -.pagination .nav_prev a { +#pagination .nav_prev a { padding-top: 8px; padding-left: 25px; background-position:0 -187px; } -.pagination .nav_next a { +#pagination .nav_next a { padding-top: 9px; padding-right: 25px; background-position: 115% -252px;