diff options
Diffstat (limited to 'view/theme/dispy')
-rw-r--r-- | view/theme/dispy/nav.tpl | 17 | ||||
-rw-r--r-- | view/theme/dispy/style.css | 144 |
2 files changed, 128 insertions, 33 deletions
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl index 4fc12d867..3938777e9 100644 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -1,6 +1,6 @@ $langselector -<span id="banner">$banner</span> +<span id="banner">$banner</span> {{ if $nav.login }}<a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a> {{ endif }} <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a> @@ -25,20 +25,21 @@ $langselector {{ if $nav.messages }}<li><a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a></li>{{ endif }} {{ if $nav.contacts }}<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0">$nav.contacts.1</a></li>{{ endif }} - {{ if $nav.manage }}<li><a id="nav-manage-link" class="nav-commlink nav-sep $nav.manage.2" href="$nav.manage.0">$nav.manage.1</a></li>{{ endif }} - + {{ if $nav.profiles }}<li><a id="nav-profiles-link" class="nav-commlink nav-sep $nav.profiles.2" href="$nav.profiles.0">$nav.profiles.1</a></li>{{ endif }} {{ if $nav.settings }}<li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0">$nav.settings.1</a></li>{{ endif }} - {{ if $nav.profiles }}<li><a id="nav-profiles-link" class="nav-commlink $nav.profiles.2" href="$nav.profiles.0">$nav.profiles.1</a></li>{{ endif }} + + {{ if $nav.manage }}<li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0">$nav.manage.1</a></li>{{ endif }} + {{ if $nav.logout }}<li><a id="nav-logout-link" class="nav-commlink nav-sep $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a></li> {{ endif }} </ul> <div id="notifications"> - {{ if $nav.network }}<div id="net-update-wrap" class="nav-ajax-update"><a id="net-update" href="$nav.network.0" title="$nav.network.1">1</a></div>{{ endif }} - {{ if $nav.home }}<div id="home-update-wrap" class="nav-ajax-update"><a id="home-update" href="$nav.home.0" title="$nav.home.1">2</a></div>{{ endif }} - {{ if $nav.notifications }}<div id="notify-update-wrap" class="nav-ajax-update"><a id="notify-update" href="$nav.notifications.0" title="$nav.notifications.1">3</a></div>{{ endif }} - {{ if $nav.messages }}<div id="mail-update-wrap" class="nav-ajax-update"><a id="mail-update" href="$nav.messages.0" title="$nav.messages.1">4</a></div>{{ endif }} + {{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }} + {{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }} + {{ if $nav.notifications }}<a id="notify-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }} + {{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }} </div> </div> diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index d2d47427f..7d7dc1098 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -11,6 +11,8 @@ a:hover { color: #729fcf; padding-bottom: 0px; border-bottom: 1px dotted #729fcf .required { display: inline; color: #ff0000;} +.fakelink { color: #3465a4; cursor: pointer; } +.fakelink :hover{ color: #729fcf; } input[type=submit] { margin-top: 20px; @@ -23,7 +25,19 @@ input[type=submit] { border: 0px; } +.smalltext { font-size: 0.7em } +#panel { + position: absolute; + font-size:0.8em; + -webkit-border-radius: 5px ; + -moz-border-radius: 5px; + border-radius: 5px; + border: 1px solid #ffffff; + background-color: #2e3436; + color: #eeeeec; + padding:1em; +} /** * login @@ -40,7 +54,7 @@ nav { background-color: #2e3436; color: #eeeeec; position: relative; - padding: 0px 20%; + padding: 0px 10%; } nav a { text-decoration: none; color: #eeeeec; border:0px;} nav a:hover { text-decoration: none; color: #eeeeec; border:0px;} @@ -129,7 +143,6 @@ nav .nav-link { top:-19px; left: 0px; } .nav-ajax-update { - display: none; width: 30px; height: 19px; background: transparent url('notifications.png') 0px 0px no-repeat; @@ -140,20 +153,30 @@ nav .nav-link { text-align: center; float: left; margin-right: -4px; + display: none; } -.nav-ajax-update a { display: block;} -#net-update-wrap { background-position: 0px 0px; } -#mail-update-wrap { background-position: -30px 0px; } -#notify-update-wrap { background-position: -60px 0px; } -#home-update-wrap { background-position: -90px 0px; } +#net-update { background-position: 0px 0px; } +#mail-update { background-position: -30px 0px; } +#notify-update { background-position: -60px 0px; } +#home-update { background-position: -90px 0px; } /** sysmsg **/ #sysmsg { - position:absolute; top: 20px; left:40%; + position:fixed; + bottom: 0px; right:10%; -moz-box-shadow: 0px 0px 5px #888; -webkit-box-shadow: 0px 0px 5px #888; box-shadow: 0px 0px 5px #888; - padding: 10px; background-color: #fff; + padding: 10px; + background-color: #fcaf3e; border:2px solid #f8911b; + border-bottom:0px; + padding-bottom: 50px; + z-index: 1000; +} +#sysmsg br { + display:block; + margin:2px 0px; + border-top: 1px solid #ccccce; } /** @@ -162,7 +185,7 @@ nav .nav-link { aside { position: absolute; - right: 20%; + right: 11%; width: 200px; font-size: 0.7em; @@ -175,6 +198,17 @@ aside h4 { font-size: 1.2em; } aside #viewcontacts { text-align: right;} +#profile-extra-links ul { margin-left: 0px; padding-left: 0px; list-style: none; } + +#dfrn-request-link { + background: #3465A4 url('connect.png') no-repeat right center; + border-radius: 5px 5px 5px 5px; + color: #FFFFFF; + display: block; + font-size: 1.2em; + padding: 0.2em 0.5em; +} + /** * contacts block */ @@ -185,6 +219,7 @@ aside #viewcontacts { text-align: right;} * jot **/ #profile-jot-text_tbl { margin-bottom: 10px; } +#profile-jot-text_ifr { width: 99.9%!important } #profile-jot-submit-wrapper { float: right;} #profile-jot-perms { float: right; @@ -206,6 +241,7 @@ aside #viewcontacts { text-align: right;} -moz-border-radius: 5px 0px 0px 5px; border-radius: 5px 0px 0px 5px; border: 0px; + margin-top: 0px; } #character-counter { float: right; padding: 8px 10px; @@ -221,11 +257,54 @@ aside #viewcontacts { text-align: right;} #profile-jot-tools-end, #profile-jot-banner-end { clear: both; } +#profile-jot-email-wrapper { + margin: 10px 10% 0px 10%; + border: 1px solid #555753; + border-bottom: 0px; +} +#profile-jot-email-label { background-color: #555753; color: #ccccce; padding: 5px;} +#profile-jot-email { margin: 5px; width: 90%; } + +#profile-jot-networks { + margin: 0px 10%; + border: 1px solid #555753; + border-top: 0px; + border-bottom: 0px; + padding: 5px; +} +#profile-jot-acl-wrapper { + margin: 0px 10%; + border: 1px solid #555753; + border-top: 0px; +} +#group_allow_wrapper, +#group_deny_wrapper, +#acl-permit-outer-wrapper { width: 47%; float: left; } + +#contact_allow_wrapper, +#contact_deny_wrapper, +#acl-deny-outer-wrapper { width: 47%; float: right; } + +#acl-permit-text, +#acl-deny-text {background-color: #555753; color: #ccccce; padding: 5px;} + +#acl-permit-wrapper, +#acl-deny-wrapper { padding: 5px; } + +#acl-allow-group-label, +#acl-allow-contact-label, +#acl-deny-group-label, +#acl-deny-contact-label { display: block } + +#profile-jot-acl-wrapper select { width: 100%; } + +#acl-wrapper-end, +#profile-jot-end { clear: both; height: 5px; } /** * section */ -section { margin: 10px 20% 0px 20%; font-size: 0.8em; padding-right: 230px;} +section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;} /** tabs **/ .tabs-wrapper {list-style: none; padding: 0px; margin: 0px; border-bottom: 1px solid #729fcf; } @@ -311,8 +390,10 @@ section { margin: 10px 20% 0px 20%; font-size: 0.8em; padding-right: 230px;} text-overflow: ellipsis; -o-text-overflow: ellipsis; } -.wall-item-location span { float: left; } -.wall-item-location a { margin-left: 25px; display: block;} +.wall-item-location .icon { float: left; } +.wall-item-location > a { margin-left: 25px; font-size: 0.7em; display: block;} +.wall-item-location .smalltext { margin-left: 25px; font-size: 0.7em; display: block;} +.wall-item-location > br { display: none; } .wallwall .wwto { left: -10px; @@ -335,7 +416,7 @@ section { margin: 10px 20% 0px 20%; font-size: 0.8em; padding-right: 230px;} } .wall-item-photo-menu { - min-width 92px; + min-width: 92px; border: 2px solid #FFFFFF; border-top: 0px; background: #555753; @@ -351,11 +432,12 @@ section { margin: 10px 20% 0px 20%; font-size: 0.8em; padding-right: 230px;} .wall-item-photo-menu li a { white-space: nowrap; display: block; padding: 5px 2px; color: #eeeeec; } .wall-item-photo-menu li a:hover { color: #555753; background: #eeeeec; } - - /** * comment */ + + .ccollapse-wrapper { font-size: 0.9em; margin-left: 80px; } + .wall-item-outside-wrapper.comment { margin-left: 80px; } .wall-item-outside-wrapper.comment .wall-item-photo { width: 40px; height: 40px;} .wall-item-outside-wrapper.comment .wall-item-photo-wrapper {width: 40px; height: 40px; } @@ -367,10 +449,8 @@ section { margin: 10px 20% 0px 20%; font-size: 0.8em; padding-right: 230px;} .wall-item-outside-wrapper.comment .wall-item-author { margin-left: 60px;} .wall-item-outside-wrapper.comment .wall-item-photo-menu { + min-width: 50px; top: 60px; - -webkit-border-radius: 0px 5px 5px 5px; - -moz-border-radius: 0px 5px 5px 5px; - border-radius: 0px 5px 5px 5px; } @@ -485,6 +565,24 @@ section { margin: 10px 20% 0px 20%; font-size: 0.8em; padding-right: 230px;} background-color: #ffffff; } +#contact-edit-banner-name { font-size: 1.5em; } +#contact-edit-photo-wrapper {position: relative; float: left; padding: 20px;} +#contact-edit-direction-icon { position: absolute; top: 60px; left:0px;} +#contact-edit-nav-wrapper { margin-left: 210px; } +#contact-edit-links { float: left; margin-top: 23px; } +#contact-drop-links { margin-left: 5px; } +#contact-edit-nav-wrapper .icon { + border: 1px solid #babdb6; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +#contact-edit-poll-wrapper { margin-left: 50px; } +#contact-edit-last-update-text { margin-bottom: 15px; } +#contact-edit-last-updated { font-weight: bold; } +#contact-edit-poll-text { display: inline; } +#contact-edit-end { clear: both; } + /** * register, settings & profile forms */ @@ -517,8 +615,6 @@ section { margin: 10px 20% 0px 20%; font-size: 0.8em; padding-right: 230px;} } .settings-submit-wrapper, .profile-edit-submit-wrapper { margin: 30px 0px;} -.settings-submit-wrapper input, - .profile-listing { float: left; margin: 20px 20px 0px 0px} #profile-edit-links ul { margin: 20px 0px; padding: 0px; list-style: none; } @@ -610,7 +706,5 @@ section { margin: 10px 20% 0px 20%; font-size: 0.8em; padding-right: 230px;} /** * footer - */ - .cc-license { margin-top: 100px; font-size: 0.7em; } -footer { display: block; margin: 50px 20%; clear: both; } -
\ No newline at end of file + */
.cc-license { margin-top: 100px; font-size: 0.7em; } +footer { display: block; margin: 50px 20%; clear: both; }
\ No newline at end of file |