scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Small UI changes [SCI-3699] (#1935)

Browse source 
* Small ui changes

* Markup fix

* Add class for addons
This commit is contained in:
aignatov-bio 2019-07-15 13:28:20 +02:00 committed by GitHub
parent 3c32fe0895
commit a8623002e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/constants.scss
View file

@ -31,6 +31,7 @@ $brand-warning-light: #fcf7e4;
$brand-danger-light: #efdfdf;
$brand-light-blue: #e3f1f9;
$brand-academy: #de0170;
$brand-academy-dark: #c60064;
// MS Office colors:
$office-ms-word: #2b579a;

5
app/assets/stylesheets/themes/menu_bar.scss
View file

@ -27,12 +27,13 @@
font-size: $font-size-h6;
margin-left: auto;
margin-right: auto;
padding: 8px 0;
padding: 10px 0;
text-align: center;
word-break: normal;
.fas {
font-size: 18px;
padding-bottom: 5px;
}
}
@ -60,7 +61,7 @@
width: inherit;
.academy-color {
color: $brand-academy;
color: $brand-academy-dark;
}
}

66
app/views/shared/_navigation.html.erb
View file

@ -125,6 +125,39 @@
<% end %>
</li>
<!-- notifications -->
<li class="dropdown notifications-dropdown">
<a href="#"
id="notifications-dropdown"
class="dropdown-toggle"
title="<%= t('nav.label.notifications') %>"
data-toggle="dropdown"
role="button"
aria-haspopup="true"
aria-expanded="false"
data-href="<%= recent_notifications_url(current_user) %>">
<i class="fas fa-bell"></i>
<span class="visible-xs-inline visible-sm-inline"><%= t('nav.label.notifications') %></span>
<span id="count-notifications"
data-href="<%= unseen_notification_url(current_user) %>">
</span>
</a>
<ul class="dropdown-menu dropdown-notifications system-notifications">
<li class="notifications-dropdown-header">
<span><%= t('notifications.title') %></span>
<span class="pull-right">
<%= link_to t('nav.user.settings'), preferences_path %>
</span>
</li>
<li class="notifications-no-recent">
<em><%= t('notifications.no_recent') %></em>
</li>
<li class="notifications-dropdown-footer">
<%= link_to t('notifications.show_all'), notifications_path %>
</li>
</ul>
</li>
<!-- greetings -->
<li id="user-account-dropdown" class="dropdown">
<a href="#"
@ -157,39 +190,6 @@
</ul>
</li>
<!-- notifications -->
<li class="dropdown">
<a href="#"
id="notifications-dropdown"
class="dropdown-toggle"
title="<%= t('nav.label.notifications') %>"
data-toggle="dropdown"
role="button"
aria-haspopup="true"
aria-expanded="false"
data-href="<%= recent_notifications_url(current_user) %>">
<i class="fas fa-bell"></i>
<span class="visible-xs-inline visible-sm-inline"><%= t('nav.label.notifications') %></span>
<span id="count-notifications"
data-href="<%= unseen_notification_url(current_user) %>">
</span>
</a>
<ul class="dropdown-menu dropdown-notifications system-notifications">
<li class="notifications-dropdown-header">
<span><%= t('notifications.title') %></span>
<span class="pull-right">
<%= link_to t('nav.user.settings'), preferences_path %>
</span>
</li>
<li class="notifications-no-recent">
<em><%= t('notifications.no_recent') %></em>
</li>
<li class="notifications-dropdown-footer">
<%= link_to t('notifications.show_all'), notifications_path %>
</li>
</ul>
</li>
<li>
<%= link_to Constants::ACADEMY_TR_LINK,
class: "academy-link flag",