Skip to content

Commit

Permalink
css: shrunk vertical navbar + refactoring
Browse files Browse the repository at this point in the history 
- shrunk vertical nav from col-3 to col-2
- refactored base.css
  • Loading branch information
Aditya Anand committed Jan 4, 2018
1 parent 6a5a158 commit 267b415
Show file tree
Hide file tree
Showing 11 changed files with 364 additions and 217 deletions.
547 changes: 347 additions & 200 deletions app/assets/v2/css/base.css
View file

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions app/assets/v2/js/shared.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ function timeDifference(current, previous) {
var unit = 'year';
}
var plural = amt != 1 ? 's' : '';
return amt + ' '+unit+plural+' ago';

return amt + ' '+unit+plural+' ago';
};

var sync_web3 = function(issueURL, bountydetails, callback){
Expand Down Expand Up @@ -252,7 +252,7 @@ var retrieveAmount = function(){
var address = $('select[name=deonomination').val();
var denomination = tokenAddressToDetails(address)['name'];
var request_url = '/sync/get_amount?amount='+amount+'&denomination=' + denomination;

//use cached conv rate if possible.
if(document.conversion_rates && document.conversion_rates[denomination]){
var usd_amount = amount / document.conversion_rates[denomination];
Expand Down Expand Up @@ -343,10 +343,10 @@ window.addEventListener('load', function() {
var timeout_value = 100;
setTimeout(function(){
if (typeof web3 =='undefined'){
$("#sidebar_head").html("Web3 disabled <img src='/static/v2/images/icons/question.png'>");
$("#sidebar_head").html("Web3 disabled <br> <img src='/static/v2/images/icons/question.png'>");
$("#sidebar_p").html("Please install <a target=new href=https://chrome.google.com/webstore/detail/metamask/nkbihfbeogaeaoehlefnkodbefgpgknn?hl=en> Metamask</a>. ");
} else if (typeof web3.eth.accounts[0] =='undefined'){
$("#sidebar_head").html("Web3 locked <img src='/static/v2/images/icons/lock.png'>");
$("#sidebar_head").html("Web3 locked <br> <img src='/static/v2/images/icons/lock.png'>");
$("#sidebar_p").html("Please unlock <a target=new href=https://chrome.google.com/webstore/detail/metamask/nkbihfbeogaeaoehlefnkodbefgpgknn?hl=en> Metamask</a>. ");
} else {
web3.version.getNetwork((error, netId) => {
Expand Down Expand Up @@ -395,9 +395,9 @@ window.addEventListener('load', function() {
}
var sidebar_p = "Connected to " + network + ".";
if(is_supported_network){
$("#sidebar_head").html("Web3 enabled <img src='/static/v2/images/icons/rss.png'>");
$("#sidebar_head").html("Web3 enabled <br> <img src='/static/v2/images/icons/rss.png'>");
} else {
$("#sidebar_head").html("Unsupported network <img src='/static/v2/images/icons/battery_empty.png'>");
$("#sidebar_head").html("Unsupported network <br> <img src='/static/v2/images/icons/battery_empty.png'>");
sidebar_p += "<br>(try " + recommended_network + " instead)";
}
$("#sidebar_p").html(sidebar_p);
Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/templates/bounty_details.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{% include 'shared/nav_internal.html' %}
</div>
<div class="row no-gutter">
<div class="col-3" style="background: #eee; ">
<div class="col-2" style="background: #eee; ">
{% include 'shared/current_balance.html' %}
{% include 'shared/sidebar_search.html' %}
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/templates/claim_bounty.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
{% include 'shared/nav_internal.html' %}
</div>
<div class="row no-gutter">
<div class="col-3" style="background: #eee; ">
<div class="col-2" style="background: #eee; ">
{% include 'shared/current_balance.html' %}
{% include 'shared/sidebar_search.html' %}
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/templates/clawback_expired_bounty.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
{% include 'shared/nav_internal.html' %}
</div>
<div class="row no-gutter">
<div class="col-3" style="background: #eee; ">
<div class="col-2" style="background: #eee; ">
{% include 'shared/current_balance.html' %}
{% include 'shared/sidebar_search.html' %}
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/templates/dashboard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

</div>
<div class="row no-gutter">
<div class="col-3" style="background: #eee; ">
<div class="col-2" style="background: #eee; ">
{% include 'shared/current_balance.html' %}
{% include 'shared/sidebar_search.html' %}
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/templates/process_bounty.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
{% include 'shared/nav_internal.html' %}
</div>
<div class="row no-gutter">
<div class="col-3" style="background: #eee; ">
<div class="col-2" style="background: #eee; ">
{% include 'shared/current_balance.html' %}
{% include 'shared/sidebar_search.html' %}
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/templates/profile_details.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{% include 'shared/nav_internal.html' %}
</div>
<div class="row no-gutter">
<div class="col-3" style="background: #eee; ">
<div class="col-2" style="background: #eee; ">
{% include 'shared/current_balance.html' %}
{% include 'shared/sidebar_search.html' %}
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/templates/submit_bounty.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
{% include 'shared/nav_internal.html' %}
</div>
<div class="row no-gutter">
<div class="col-3" style="background: #eee; ">
<div class="col-2" style="background: #eee; ">
{% include 'shared/current_balance.html' %}
{% include 'shared/sidebar_search.html' %}
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/dashboard/templates/toolbox.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<div class="container-fluid header dash">
{% include 'shared/nav_internal.html' %}
<div class="row no-gutter">
<div class="col-3" style="background: #eee; ">
<div class="col-2" style="background: #eee; ">
{% include 'shared/current_balance.html' %}
{% include 'shared/sidebar_search.html' %}
</div>
Expand Down Expand Up @@ -63,7 +63,7 @@ <h3 class="sub-title">{{actor.title}}</h3>
<div class="title">{{tool.name}}</div>
<div class="description">
{{tool.description | safe}}

</div>
<div class="button_container">
<a class="btn btn-xs btn-success pulseClick" role="button" href="{{tool.link}}">Try it ></a>
Expand Down
2 changes: 1 addition & 1 deletion app/retail/templates/leaderboard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{% include 'shared/nav_internal.html' %}
</div>
<div class="row no-gutter">
<div class="col-3" style="background: #eee; ">
<div class="col-2" style="background: #eee; ">
{% include 'shared/current_balance.html' %}
{% include 'shared/sidebar_search.html' %}
</div>
Expand Down

0 comments on commit 267b415

Please sign in to comment.