Skip to content
This repository has been archived by the owner on Jan 3, 2019. It is now read-only.

hd #259

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

hd #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bac8201
cleaning and styling
atticussterman Apr 18, 2016
4cc5bf8
message signing
atticussterman Apr 18, 2016
56c1b13
Merge pull request #1 from atticussterman/master
BitLox Apr 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/application.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
@import "pages/send/_index";
@import "pages/receive/_index";
@import "pages/history/_index";
@import "pages/tokens/_index";
@import "pages/sign/_index";

// loader
@import "loader/_index";
Binary file added app/assets/img/BITLOX_LOGO.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/img/BITLOX_LOGO_BLACK_WHITE_INLINE.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/img/BITLOX_LOGO_WHITE.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/img/BITLOX_LOGO_WHITE_BLACK_INLINE.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/img/BITLOX_LOGO_WHITE_OUTLINE.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 23 additions & 14 deletions app/core_css/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,37 @@ $base_line_height: 1.5;

// Brand colours

$grey--light: #FAFAFA;
$grey: #CCCDC8;
$bitlox-white: #F3F3F2;
$bitlox-gray-light: #A6A6A7;
$bitlox-gray: #5B5B5A;
$bitlox-gray-dark: #3F3F40;
$bitlox-red: #860B0B;
$bitlox-red-dark: #5A1010;
$bitlox-green: #0B862E;
$bitlox-yellow: #93911B;
$bitlox-black: #171616;

$blue: #58A1FF;
$yellow: #FBC12C;
$dark-blue: #102E42;
$grey--light: $bitlox-gray-light;
$grey: $bitlox-gray;

$green: #9AD25C;
$red: #FC8276;
$blue: $bitlox-red;
$yellow: $bitlox-yellow;
$dark-blue: $bitlox-red-dark;

$purple: #2E2B44;
$purple--light: #464368;
$purple--highlight: #858DF0;
$green: $bitlox-green;
$red: $bitlox-red;

$silver: #949da1;
$purple: $bitlox-red-dark;
$purple--light: $bitlox-red;
$purple--highlight: $bitlox-white;

$silver: $bitlox-white;


// Sometimes abstract terms are useful:

$foreground: $purple;
$background: #FDFDFD;
$foreground: $bitlox-white;
$background: $bitlox-black;

$focus_color: #4fa1fd;
$alert_color: #fd9833;

6 changes: 4 additions & 2 deletions app/core_css/mixins/_snippets.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@
cursor: pointer;
}

@mixin monospaced {
font-family: monospace;
font-size: 1.05em;
}

// get rid of z-index glitching

Expand Down Expand Up @@ -92,5 +96,3 @@
@mixin tabfocus() {
outline: 2px solid $focus_color;
}


127 changes: 28 additions & 99 deletions app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,103 +1,32 @@
<!doctype html>
<html>
<head>
<title>Hive Web</title>
<link rel="icon" sizes="16x16 24x24 32x32 48x48 64x64" href="assets/img/favicon.ico">
<link rel="apple-touch-icon" href="assets/img/apple-touch-icon-precomposed.png" sizes="152x152">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1 user-scalable=0">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<link rel="stylesheet" href="assets/css/application.css">
<link rel="stylesheet" href="https://s3.amazonaws.com/fonts.typotheque.com/WF-018717-007225.css" type="text/css" />
</head>
<body>
<div id="geo-overlay" class="z-1000"></div>
<div id="general-purpose-overlay" class="z-1000"></div>
<div id="tooltip" class="z-9000"></div>
<div id="transaction-detail" class="z-9000"></div>
<div id="flash-modal" class="z-9000"></div>
<div id="app"></div>
<div id="auth" class="auth__modal current">
<div id="loader">
<div id="logo_animation">
<div id="logo_frame">
<svg viewBox="0 0 198 221" version="1.1">
<g class="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g class="Imported-Layers-6" transform="translate(0.000000, 1.000000)" fill="#F9D04B">
<path d="M98.141,218.826 C94.016,218.826 89.947,217.735 86.374,215.673 L11.786,172.61 C4.529,168.419 0.02,160.611 0.02,152.23 L0.02,66.104 C0.02,57.723 4.529,49.914 11.786,45.724 L86.374,2.661 C93.52,-1.463 102.763,-1.463 109.906,2.661 L184.494,45.724 C191.751,49.914 196.26,57.723 196.26,66.104 L196.26,152.23 C196.26,160.611 191.751,168.419 184.494,172.61 L109.906,215.673 C106.335,217.735 102.266,218.826 98.141,218.826 L98.141,218.826 Z M98.141,6.763 C95.288,6.763 92.474,7.517 90.002,8.944 L15.414,52.008 C10.394,54.906 7.275,60.308 7.275,66.104 L7.275,152.23 C7.275,158.026 10.394,163.429 15.414,166.327 L90.002,209.39 C94.945,212.244 101.338,212.244 106.278,209.39 L180.866,166.327 C185.886,163.429 189.005,158.026 189.005,152.23 L189.005,66.104 C189.005,60.308 185.886,54.906 180.866,52.008 L106.278,8.944 C103.808,7.517 100.993,6.763 98.141,6.763 L98.141,6.763 Z" class="Fill-1"></path>
</g>
</g>
</svg>
</div>
<div id="logo_block5">
<svg viewBox="0 0 55 30" version="1.1">
<g class="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g class="f1" transform="translate(-293.000000, -484.000000)" fill="#F9D04B">
<g class="Imported-Layers" transform="translate(222.000000, 458.000000)">
<path d="M118.419,54.512 L77.476,54.512 C73.226,54.512 70.196,50.393 71.442,46.33 C74.813,35.343 79.148,27.248 91.101,26.686 C91.305,26.677 93.798,26.669 96.458,26.664 L96.458,26.661 C96.698,26.662 96.964,26.662 97.222,26.663 C97.465,26.662 97.707,26.662 97.948,26.661 L97.948,26.664 C100.962,26.669 104.588,26.677 104.795,26.686 C116.747,27.248 121.082,35.343 124.453,46.33 C125.699,50.393 122.669,54.512 118.419,54.512" class="Fill-8"></path>
</g>
</g>
</g>
</svg>
</div>
<div id="logo_block4">
<svg viewBox="0 0 114 30" version="1.1">
<g class="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g class="Imported-Layers-2" transform="translate(-41.000000, -60.000000)" fill="#F9D04B">
<path d="M141.595,60.772 L53.753,60.772 C44.535,60.772 41.651,67.717 41.651,75.893 L41.651,81.362 C41.651,86.333 45.06,88.644 50.418,88.644 L80.725,88.644 C81.063,88.644 81.387,88.526 81.652,88.315 C86.059,84.811 91.621,82.706 97.674,82.643 C103.727,82.706 109.29,84.811 113.697,88.315 C113.962,88.526 114.285,88.644 114.624,88.644 L144.93,88.644 C150.288,88.644 153.697,86.333 153.697,81.362 L153.697,75.893 C153.697,67.717 150.813,60.772 141.595,60.772" class="Fill-2"></path>
</g>
</g>
</svg>
</div>
<div id="logo_block3">
<svg viewBox="0 0 158 35" version="1.1">
<g class="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" >
<g class="Imported-Layers-3" transform="translate(-19.000000, -91.000000)" fill="#F9D04B">
<g transform="translate(20.000000, 92.000000)">
<path d="M51.742,16.837 C51.742,14.003 52.199,11.279 53.037,8.727 C53.983,5.845 51.719,2.901 48.686,2.901 L8.263,2.901 C5.756,2.901 -0.457,3.436 -0.457,17.239 C-0.457,31.043 5.756,30.773 8.263,30.773 L48.686,30.773 C51.719,30.773 53.983,27.828 53.037,24.947 C52.199,22.395 51.742,19.671 51.742,16.837" class="Fill-4"></path>
<path d="M103.939,16.837 C103.939,14.003 103.482,11.279 102.644,8.727 C101.697,5.845 103.962,2.901 106.995,2.901 L147.418,2.901 C149.925,2.901 156.138,3.436 156.138,17.239 C156.138,31.043 149.925,30.773 147.418,30.773 L106.995,30.773 C103.962,30.773 101.697,27.828 102.644,24.947 C103.482,22.395 103.939,19.671 103.939,16.837" class="Fill-5"></path>
</g>
</g>
</g>
</svg>
<div id="logo_key">
<svg viewBox="0 0 35 36" version="1.1">
<g class="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g class="Imported-Layers-2" transform="translate(-81.000000, -91.000000)" fill="#F9D04B">
<path d="M97.948,91.947 C88.62,91.947 81.058,99.509 81.058,108.837 C81.058,118.165 88.62,125.727 97.948,125.727 C107.275,125.727 114.837,118.165 114.837,108.837 C114.837,99.509 107.275,91.947 97.948,91.947 L97.948,91.947 Z M100.429,112.054 L100.429,117.55 C100.429,118.921 99.318,120.031 97.948,120.031 C96.577,120.031 95.466,118.921 95.466,117.55 L95.466,112.054 C93.175,111.086 91.566,108.818 91.566,106.174 C91.566,102.65 94.423,99.793 97.948,99.793 C101.472,99.793 104.329,102.65 104.329,106.174 C104.329,108.818 102.72,111.086 100.429,112.054 L100.429,112.054 Z" class="Fill-6"></path>
</g>
</g>
</svg>
</div>
</div>
<div id="logo_block2">
<svg viewBox="0 0 114 29" version="1.1">
<g class="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g class="Imported-Layers-4" transform="translate(-41.000000, -129.000000)" fill="#F9D04B">
<path d="M141.595,156.901 L53.753,156.901 C44.535,156.901 41.651,149.956 41.651,141.781 L41.651,136.312 C41.651,131.34 45.06,129.029 50.418,129.029 L80.725,129.029 C81.063,129.029 81.387,129.148 81.652,129.358 C86.059,132.862 91.621,134.967 97.674,135.03 C103.727,134.967 109.29,132.862 113.697,129.358 C113.962,129.148 114.285,129.029 114.624,129.029 L144.93,129.029 C150.288,129.029 153.697,131.34 153.697,136.312 L153.697,141.781 C153.697,149.956 150.813,156.901 141.595,156.901" class="Fill-3"></path>
</g>
</g>
</svg>
</div>
<div id="logo_block1">
<svg viewBox="0 0 55 30" version="1.1">
<g class="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g class="Imported-Layers-5" transform="translate(-71.000000, -163.000000)" fill="#F9D04B">
<path d="M118.419,163.158 L77.476,163.158 C73.226,163.158 70.196,167.278 71.442,171.34 C74.813,182.327 79.148,190.422 91.101,190.984 C91.305,190.994 93.798,191.001 96.458,191.007 L96.458,191.009 C96.698,191.009 96.964,191.008 97.222,191.008 C97.465,191.008 97.707,191.009 97.948,191.009 L97.948,191.007 C100.962,191.001 104.588,190.994 104.795,190.984 C116.747,190.422 121.082,182.327 124.453,171.34 C125.699,167.278 122.669,163.158 118.419,163.158" class="Fill-7"></path>
</g>
</g>
</svg>
<head>
<title>Bitlox Web</title>
<link rel="icon" sizes="16x16 24x24 32x32 48x48 64x64" href="assets/img/favicon.ico">
<link rel="apple-touch-icon" href="assets/img/apple-touch-icon-precomposed.png" sizes="152x152">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<link rel="stylesheet" href="assets/css/application.css">
<link rel="stylesheet" href="https://s3.amazonaws.com/fonts.typotheque.com/WF-018717-007225.css" type="text/css" />
</head>
<body>
<div id="general-purpose-overlay" class="z-1000"></div>
<div id="tooltip" class="z-9000"></div>
<div id="transaction-detail" class="z-9000"></div>
<div id="flash-modal" class="z-9000"></div>
<div id="app"></div>
<div id="auth" class="auth__modal current">
<div id="loader">

<div id="loader-message"></div>
<div class="preload jigsaw-light">a</div>
<div class="preload jigsaw-regular">a</div>
<div class="preload jigsaw-medium">a</div>
<div class="preload jigsaw-bold">a</div>
</div>
</div>
</div>
<div id="loader-message"></div>
<div class="preload jigsaw-light">a</div>
<div class="preload jigsaw-regular">a</div>
<div class="preload jigsaw-medium">a</div>
<div class="preload jigsaw-bold">a</div>
</div>
</div>
<script src='assets/js/loader.js'></script>
</body>
<script src='assets/js/loader.js'></script>
</body>
</html>

Loading