refactor mobile header, close #4579
This commit is contained in:
flaburgan
parent
fdfe50b581
commit
0f2773053e
3 changed files with 73 additions and 90 deletions
|
|
@ -32,6 +32,7 @@
|
|||
* Add a white background to images shown in the lightbox [#4475](https://github.com/diaspora/diaspora/issues/4475)
|
||||
* Refactor getting_started page, test if facebook is available, fix [#4520](https://github.com/diaspora/diaspora/issues/4520)
|
||||
* Avoid publishing empty posts [#4542](https://github.com/diaspora/diaspora/pull/4542)
|
||||
* Refactor mobile header, fix [#4579](https://github.com/diaspora/diaspora/issues/4579)
|
||||
|
||||
## Features
|
||||
* Add oEmbed content to the mobile view [#4343](https://github.com/diaspora/diaspora/pull/4353)
|
||||
|
|
|
|||
|
|
@ -308,36 +308,24 @@ body {
|
|||
.right {
|
||||
float: right; }
|
||||
|
||||
.navbar {
|
||||
@include box-shadow(0,1px,2px,#333);
|
||||
}
|
||||
|
||||
.navbar-inner {
|
||||
@include box-shadow(0,1px,2px,#333);
|
||||
|
||||
background: {
|
||||
image: image-url("header-bg-long.jpg");
|
||||
}
|
||||
|
||||
width: 100%;
|
||||
header {
|
||||
position: fixed;
|
||||
top: 0px;
|
||||
left: 0px;
|
||||
right: 0px;
|
||||
min-width: 250px;
|
||||
z-index: 10;
|
||||
background: url("header-bg-long.jpg") rgb(40,35,35);
|
||||
@include box-shadow(0, 1px, 2px, #333);
|
||||
border-bottom: 1px solid #222;
|
||||
|
||||
border: {
|
||||
bottom: 1px solid #222;
|
||||
}
|
||||
}
|
||||
#header_title { display: inline-block; }
|
||||
|
||||
#nav_badges {
|
||||
display: inline-block;
|
||||
#nav_badges {
|
||||
float: right;
|
||||
padding: 4px 12px;
|
||||
|
||||
a:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
margin: 4px 12px;
|
||||
|
||||
.badge {
|
||||
position: relative;
|
||||
display: inline;
|
||||
margin-left: 3px;
|
||||
padding: 8px 3px;
|
||||
|
|
@ -354,9 +342,9 @@ body {
|
|||
a {
|
||||
padding: 5px 0px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.badge_count {
|
||||
.badge_count {
|
||||
-moz-border-radius: 2px 2px 2px 2px;
|
||||
-webkit-border-radius: 2px 2px 2px 2px;
|
||||
border-radius: 2px 2px 2px 2px;
|
||||
|
|
@ -369,23 +357,19 @@ body {
|
|||
line-height: 12px;
|
||||
color: white;
|
||||
font-size: smaller;
|
||||
}
|
||||
}
|
||||
|
||||
#notification {
|
||||
#notification {
|
||||
right: 140px;
|
||||
}
|
||||
}
|
||||
|
||||
#conversation {
|
||||
#conversation {
|
||||
right: 110px;
|
||||
}
|
||||
}
|
||||
|
||||
.badge-inverse {
|
||||
.badge-inverse {
|
||||
background-color: #333333 !important;
|
||||
}
|
||||
|
||||
#header_title {
|
||||
position: relative;
|
||||
top: -3px;
|
||||
}
|
||||
}
|
||||
|
||||
footer {
|
||||
|
|
|
|||
|
|
@ -46,28 +46,26 @@
|
|||
= yield(:head)
|
||||
|
||||
%body
|
||||
.navbar.navbar-fixed-top
|
||||
.navbar-inner
|
||||
.container{:style => "position: relative;"}
|
||||
= link_to(image_tag('branding/header-logo2x.png', :height => 40, :width => 40, :id => 'header_title'), stream_path)
|
||||
%header
|
||||
= link_to(image_tag('branding/header-logo2x.png', height: 40, width: 40), stream_path, id: 'header_title')
|
||||
|
||||
- if user_signed_in?
|
||||
#nav_badges
|
||||
= link_to(image_tag('icons/my_activity.png', :class => 'my_activity'), activity_stream_path, :class => "badge badge-inverse", :id => "my_activity_badge")
|
||||
= link_to(image_tag('icons/notifications_grey.png', :height => 16, :width => 16, :id => 'notification-flag'), notifications_path, :class => "badge badge-inverse", :id => "notification_badge")
|
||||
= link_to(image_tag('icons/my_activity.png', class: 'my_activity'), activity_stream_path, class: "badge badge-inverse", id: "my_activity_badge")
|
||||
= link_to(image_tag('icons/notifications_grey.png', height: 16, width: 16, id: 'notification-flag'), notifications_path, class: "badge badge-inverse", id: "notification_badge")
|
||||
- if current_user.unread_notifications.count > 0
|
||||
.badge_count{:id => "notification"}
|
||||
.badge_count{id: "notification"}
|
||||
= current_user.unread_notifications.count
|
||||
= link_to(image_tag('icons/mail_grey.png', :height => 11, :width => 17), conversations_path, :class => "badge badge-inverse", :id => "conversations_badge")
|
||||
= link_to(image_tag('icons/mail_grey.png', height: 11, width: 17), conversations_path, class: "badge badge-inverse", id: "conversations_badge")
|
||||
- if current_user.unread_message_count > 0
|
||||
.badge_count{:id => "conversation"}
|
||||
.badge_count{id: "conversation"}
|
||||
= current_user.unread_message_count
|
||||
= link_to(image_tag('icons/search_grey.png', :height => 14, :width => 14), people_path, :class => "badge badge-inverse", :id => "people_badge")
|
||||
= link_to(image_tag('icons/user_grey.png', :height => 16, :width => 16), contacts_path, :class => "badge badge-inverse", :id => "contacts_badge")
|
||||
= link_to(image_tag('icons/search_grey.png', height: 14, width: 14), people_path, class: "badge badge-inverse", id: "people_badge")
|
||||
= link_to(image_tag('icons/user_grey.png', height: 16, width: 16), contacts_path, class: "badge badge-inverse", id: "contacts_badge")
|
||||
- if yield(:header_action).present?
|
||||
= yield(:header_action)
|
||||
- else
|
||||
= link_to(image_tag('icons/compose_mobile2.png', :class => 'compose_icon'), new_status_message_path)
|
||||
= link_to(image_tag('icons/compose_mobile2.png', class: 'compose_icon'), new_status_message_path)
|
||||
|
||||
#main.container{:role => "main"}
|
||||
.row
|
||||
|
|
|
|||
Loading…
Reference in a new issue