Skip to content

Commit

Permalink
UI additions regarding to elastic
Browse files Browse the repository at this point in the history
  • Loading branch information
Peck committed Sep 9, 2016
1 parent 0930dab commit 0c50ba7
Show file tree
Hide file tree
Showing 9 changed files with 200 additions and 267 deletions.
25 changes: 20 additions & 5 deletions html/ui/css/app.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -629,9 +629,7 @@ body > .header .logo .icon {
padding-left: 5px;
padding-right: 0;
}
#forging_indicator {
font-size: 14px;
}

.user-panel > .info > p {
margin-bottom: 9px;
}
Expand Down Expand Up @@ -1882,6 +1880,9 @@ body > .header .logo .icon {
background: #fff;
padding: 10px;
}
.bluefix {
background: #2B6586 !important;
}
/* PAGINATION */
.pagination > li > a {
background: #fafafa;
Expand Down Expand Up @@ -2013,6 +2014,8 @@ body > .header .logo .icon {
}
.navbar .nav a {
color: #fff;
padding-right: 7px;
padding-left: 7px;
}
.navbar .nav > li > a:hover,
.navbar .nav > li > a:active,
Expand Down Expand Up @@ -3355,6 +3358,8 @@ input.masked {

body > .header .navbar {
height: 50px;
padding-right: 10px;

}

@media screen and (max-width: 965px) {
Expand All @@ -3372,7 +3377,8 @@ body > .header .navbar {

body > .header .navbar {
margin-left: 150px;
padding-right: 9px;
padding-right: 10px;

}

.navbar .navbar-right > .nav {
Expand Down Expand Up @@ -3517,4 +3523,13 @@ body > .header .navbar {

.numeric {
text-align: right;
}
}

/* Added after fork */
.fullwidth {
width: 100%;
text-align: center;
padding-top: 15px;
padding-bottom: 15px;
background: #ffffff;
}
58 changes: 50 additions & 8 deletions html/ui/html/header.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<header class="header">
<span id="logo">
<a href="#" class="logo" data-page="dashboard">
<img src="img/nxt_logo_small.png" style="opacity:0.95" />
<img src="img/nxt_logo_small.png" style="opacity:0.95; height: 30px;" />
</a>
</span>
<nav class="navbar navbar-static-top" role="navigation">
Expand All @@ -31,10 +31,49 @@
<ul class="nav navbar-nav sends">
<li id="header_client_options" class="dropdown"><a id="header_client_options_link" href="#" data-toggle="modal" data-target="#client_status_modal"></a></li>
<li id="header_send_money" class="dropdown"><a href="#" data-toggle="modal" data-target="#send_money_modal" data-i18n="send_nxt">Send NXT</a></li>
<li id="header_transfer_currency" class="dropdown"><a href="#" data-toggle="modal" data-target="#transfer_currency_modal" data-i18n="send_currency">Send Currency</a></li>
<li id="header_send_message" class="dropdown"><a href="#" data-toggle="modal" data-target="#send_message_modal" data-i18n="send_message">Send Message</a></li>
</ul>
<ul class="nav navbar-nav">


<li><a href="#" id="connected_indicator_item" class="goto-page" data-toggle="tooltip" data-placement="top" title="CONNECTION" data-i18n="[title]server_connection_status" style="padding-top:13px;padding-bottom:13px;">
<span class="badge nm_outer2" style="background-color: #fff;padding:3px;">
<span class="badge nm_inner_subtype" id="connected_indicator" style="background-color: #fff; color:#337ab7;">
<i class="fa fa-circle" style="font-size:12px;"></i> <span data-18n="connected" style="color:#337ab7;">Connected</span>
</span>
</span>
</a>
</li>


<li><a href="#" id="forging_indicator_item" class="goto-page" data-toggle="tooltip" title="" data-placement="bottom" style="padding-top:13px;padding-bottom:13px;">
<span class="badge nm_outer2" style="background-color: #fff;padding:3px;">
<span class="badge nm_inner_subtype" id="forging_indicator" style="background-color: #fff; color:#337ab7;">
<i class="fa fa-circle" style="font-size:12px;"></i> <span data-18n="forging" style="color:#337ab7;">Forging</span>
</span>
</span>
</a>
</li>

<li><a href="#" id="balance_header_item" class="goto-page" data-target="#account_details_modal" data-toggle="modal" style="padding-top:13px;padding-bottom:13px;">
<span class="badge nm_outer2" style="background-color: #fff;padding:3px;">
<span class="badge nm_inner_subtype" style="background-color: #fff;">
<span style="color:#337ab7;">Balance: </span>
<span style="color:#666;" id="account_balance_sidebar">N/A</span>
<span style="color:#337ab7;"> XEL</span>
</span>
</span>
</a>
</li>
<li><a href="#" id="block_height_header_item" class="goto-page" data-page="blocks" style="padding-top:13px;padding-bottom:13px;display:none;">
<span class="badge nm_outer2" style="background-color: #fff;padding:3px;">
<span class="badge nm_inner_subtype" style="background-color: #fff;">
<span style="color:#337ab7;">Block Height: </span>
<span style="color:#666;" id="sidebar_block_link_upper">N/A</span>
</span>
</span>
</a>
</li>

<li><a href="#" id="unconfirmed_notification_menu" class="goto-page" data-page="transactions" data-subpage="unconfirmed" style="padding-top:13px;padding-bottom:13px;display:none;">
<span class="badge nm_outer2" style="background-color: #fff;padding:3px;">
<span class="badge nm_inner_subtype" style="background-color: #fff;">
Expand All @@ -60,16 +99,19 @@
</span>
</a>
</li>
<li id="contacts_menu_li" role="presentation" class="active show_popover" data-toggle="popover" data-delay="250" data-placement="bottom" data-content="CONTACTS" data-container="#header_right" data-i18n="[data-content]contacts">

<li id="header_send_message" role="presentation" class="active show_popover" data-toggle="modal" data-delay="250" data-placement="bottom" data-target="#send_message_modal" data-i18n="[data-content]send_message">
<a href="#" class="goto-page" data-page="contacts">
<i class="fa fa-user"></i>
<i class="fa fa-envelope"></i>
</a>
</li>
<li id="exchange_menu_li" role="presentation" class="active show_popover" data-toggle="popover" data-delay="250" data-placement="bottom" data-content="EXCHANGE" data-container="#header_right" data-i18n="[data-content]exchange">
<a href="#" class="goto-page" data-page="exchange">
<i class="fa fa-exchange"></i>

<li id="contacts_menu_li" role="presentation" class="active show_popover" data-toggle="popover" data-delay="250" data-placement="bottom" data-content="CONTACTS" data-container="#header_right" data-i18n="[data-content]contacts">
<a href="#" class="goto-page" data-page="contacts">
<i class="fa fa-user"></i>
</a>
</li>

<li class="dropdown show_popover" role="presentation" data-toggle="popover" data-delay="250" data-placement="bottom" data-content="SETTINGS" data-container="#header_right" data-i18n="[data-content]settings">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-cog"></i>
Expand Down
Loading

0 comments on commit 0c50ba7

Please sign in to comment.