12 files changed, 337 insertions, 390 deletions
diff --git a/ui/app/css/debug.scss b/ui/app/css/debug.scss
deleted file mode 100644
index 3e125bcd4..000000000
--- a/ui/app/css/debug.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-debug / dev
-*/
-
-#app-content {
-  border: 2px solid green;
-}
-
-#design-container {
-  position: absolute;
-  left: 360px;
-  top: -42px;
-  width: calc(100vw - 360px);
-  height: 100vh;
-  overflow: scroll;
-}
-
-#design-container img {
-  width: 2000px;
-  margin-right: 600px;
-}
-\ No newline at end of file
diff --git a/ui/app/css/fonts.scss b/ui/app/css/fonts.scss
deleted file mode 100644
index 2afaa26e1..000000000
--- a/ui/app/css/fonts.scss
+++ /dev/null
@@ -1,42 +0,0 @@
-@import url(https://fonts.googleapis.com/css?family=Roboto:300,500);
-@import url(https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css);
-
-@font-face {
-  font-family: 'Montserrat Regular';
-    src: url('/fonts/Montserrat/Montserrat-Regular.woff') format('woff');
-    src: url('/fonts/Montserrat/Montserrat-Regular.ttf') format('truetype');
-  font-weight: normal;
-  font-style: normal;
-  font-size: 'small';
-}
-
-@font-face {
-  font-family: 'Montserrat Bold';
-    src: url('/fonts/Montserrat/Montserrat-Bold.woff') format('woff');
-    src: url('/fonts/Montserrat/Montserrat-Bold.ttf') format('truetype');
-  font-weight: normal;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'Montserrat Light';
-    src: url('/fonts/Montserrat/Montserrat-Light.woff') format('woff');
-    src: url('/fonts/Montserrat/Montserrat-Light.ttf') format('truetype');
-  font-weight: normal;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'Montserrat UltraLight';
-    src: url('/fonts/Montserrat/Montserrat-UltraLight.woff') format('woff');
-    src: url('/fonts/Montserrat/Montserrat-UltraLight.ttf') format('truetype');
-  font-weight: normal;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'DIN OT';
-    src: url('/fonts/DIN_OT/DINOT-2.otf') format('opentype');
-  font-weight: normal;
-  font-style: normal;
-}
diff --git a/ui/app/css/index.scss b/ui/app/css/index.scss
index a0e952f19..01899ccad 100644
--- a/ui/app/css/index.scss
+++ b/ui/app/css/index.scss
@@ -4,11 +4,6 @@
   http://www.creativebloq.com/web-design/manage-large-css-projects-itcss-101517528
   https://www.xfive.co/blog/itcss-scalable-maintainable-css-architecture/
  */
-@import './fonts.scss';
-@import './reset.scss';
-@import './lib.scss';
-@import './transitions.scss';
-
 @import './itcss/settings/index.scss';
 @import './itcss/tools/index.scss';
 @import './itcss/generic/index.scss';
diff --git a/ui/app/css/itcss/components/index.scss b/ui/app/css/itcss/components/index.scss
index 03a974877..acd3dc108 100644
--- a/ui/app/css/itcss/components/index.scss
+++ b/ui/app/css/itcss/components/index.scss
@@ -3,5 +3,5 @@
 @import './footer.scss';
 @import './identicon.scss';
 @import './network.scss';
-@import './sections.scss';
 @import './newui-sections.scss';
+@import './sections.scss';
diff --git a/ui/app/css/itcss/generic/index.scss b/ui/app/css/itcss/generic/index.scss
index 0beb63efe..a0ce312cc 100644
--- a/ui/app/css/itcss/generic/index.scss
+++ b/ui/app/css/itcss/generic/index.scss
@@ -1,4 +1,9 @@
-// Generic styles
+/*
+  Generic
+ */
+
+@import './reset.scss';
+
 * {
   box-sizing: border-box;
 }
diff --git a/ui/app/css/reset.scss b/ui/app/css/itcss/generic/reset.scss
index fef74825d..fef74825d 100644
--- a/ui/app/css/reset.scss
+++ b/ui/app/css/itcss/generic/reset.scss
diff --git a/ui/app/css/itcss/settings/variables.scss b/ui/app/css/itcss/settings/variables.scss
index e237ba6c4..6d105f2e3 100644
--- a/ui/app/css/itcss/settings/variables.scss
+++ b/ui/app/css/itcss/settings/variables.scss
@@ -2,7 +2,6 @@
   Variables
  */
 
-
 // Colors
 $white-linen: #FAF6F0; // formerly 'faint orange (textfield shades)'
 $rajah: #F5C26D; // formerly 'light orange (button shades)'
diff --git a/ui/app/css/itcss/tools/index.scss b/ui/app/css/itcss/tools/index.scss
index e69de29bb..3634c839b 100644
--- a/ui/app/css/itcss/tools/index.scss
+++ b/ui/app/css/itcss/tools/index.scss
@@ -0,0 +1,2 @@
+@import './utilities.scss';
+
diff --git a/ui/app/css/itcss/tools/utilities.scss b/ui/app/css/itcss/tools/utilities.scss
index 09fbc8fc0..5e26ede64 100644
--- a/ui/app/css/itcss/tools/utilities.scss
+++ b/ui/app/css/itcss/tools/utilities.scss
@@ -1,6 +1,19 @@
 /*
   Utility Classes
  */
+
+/* color */
+
+.color-orange {
+  color: #F7861C; // TODO: move to settings/variables
+}
+
+.color-forest {
+  color: #0A5448; // TODO: move to settings/variables
+}
+
+/* lib */
+
 .full-size {
   height: 100%;
   width: 100%;
@@ -20,6 +33,268 @@
   flex-direction: column;
 }
 
+.full-width {
+  width: 100%;
+}
+
+.full-height {
+  height: 100%;
+}
+
+.flex-column {
+  display: flex;
+  flex-direction: column;
+}
+
+.space-between {
+  justify-content: space-between;
+}
+
+.space-around {
+  justify-content: space-around;
+}
+
+.flex-column-bottom {
+  display: flex;
+  flex-direction: column-reverse;
+}
+
+.flex-row {
+  display: flex;
+  flex-direction: row;
+}
+
+.flex-space-between {
+  justify-content: space-between;
+}
+
+.flex-space-around {
+  justify-content: space-around;
+}
+
+.flex-right {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
+}
+
+.flex-left {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+}
+
+.flex-fixed {
+  flex: none;
+}
+
+.flex-basis-auto {
+  flex-basis: auto;
+}
+
+.flex-grow {
+  flex: 1 1 auto;
+}
+
+.flex-wrap {
+  flex-wrap: wrap;
+}
+
+.flex-center {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.flex-justify-center {
+  justify-content: center;
+}
+
+.flex-align-center {
+  align-items: center;
+}
+
+.flex-self-end {
+  align-self: flex-end;
+}
+
+.flex-self-stretch {
+  align-self: stretch;
+}
+
+.flex-vertical {
+  flex-direction: column;
+}
+
+.z-bump {
+  z-index: 1;
+}
+
+.select-none {
+  cursor: inherit;
+  -moz-user-select: none;
+  -webkit-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+.pointer {
+  cursor: pointer;
+}
+.cursor-pointer {
+  cursor: pointer;
+  transform-origin: center center;
+  transition: transform 50ms ease-in-out;
+}
+.cursor-pointer:hover {
+  transform: scale(1.1);
+}
+.cursor-pointer:active {
+  transform: scale(0.95);
+}
+
+.cursor-disabled {
+  cursor: not-allowed;
+}
+
+.margin-bottom-sml {
+  margin-bottom: 20px;
+}
+
+.margin-bottom-med {
+  margin-bottom: 40px;
+}
+
+.margin-right-left {
+  margin: 0 20px;
+}
+
+.bold {
+  font-weight: bold;
+}
+
+.text-transform-uppercase {
+  text-transform: uppercase;
+}
+
+.font-small {
+  font-size: 12px;
+}
+
+.font-medium {
+  font-size: 1.2em;
+}
+
+hr.horizontal-line {
+  display: block;
+  height: 1px;
+  border: 0;
+  border-top: 1px solid #ccc;
+  margin: 1em 0;
+  padding: 0;
+}
+
+.hover-white:hover {
+  background: white;
+}
+
+.red-dot {
+  background: #E91550;
+  color: white;
+  border-radius: 10px;
+}
+
+.diamond {
+  transform: rotate(45deg);
+  background: #038789;
+}
+
+.hollow-diamond {
+  transform: rotate(45deg);
+  border: 3px solid #690496;
+}
+
+.golden-square {
+  background: #EBB33F;
+}
+
+.pending-dot {
+  background: red;
+  left: 14px;
+  top: 14px;
+  color: white;
+  border-radius: 10px;
+  height: 20px;
+  min-width: 20px;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 4px;
+  z-index: 1;
+}
+
+.keyring-label {
+  z-index: 1;
+  font-size: 11px;
+  background: rgba(255,0,0,0.8);
+  bottom: -47px;
+  color: white;
+  border-radius: 10px;
+  height: 20px;
+  min-width: 20px;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 4px;
+}
+
+.ether-balance {
+  display: flex;
+  align-items: center;
+}
+
+.tabSection {
+  min-width: 350px;
+}
+
+.menu-icon {
+  display: inline-block;
+  height: 9px;
+  min-width: 9px;
+  margin: 13px;
+}
+.ether-icon {
+  background: rgb(0, 163, 68);
+  border-radius: 20px;
+}
+.testnet-icon {
+  background: #2465E1;
+}
+
+.drop-menu-item {
+  display: flex;
+  align-items: center;
+}
+
+.invisible {
+  visibility: hidden;
+}
+
+.one-line-concat {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.critical-error {
+  text-align: center;
+  margin-top: 20px;
+  color: red;
+}
+
+
 /*
   Misc
  */
diff --git a/ui/app/css/itcss/trumps/index.scss b/ui/app/css/itcss/trumps/index.scss
index e69de29bb..6b0c999be 100644
--- a/ui/app/css/itcss/trumps/index.scss
+++ b/ui/app/css/itcss/trumps/index.scss
@@ -0,0 +1,53 @@
+/*
+  Trumps
+ */
+
+
+// Transitions
+
+/* universal */
+.app-primary .main-enter {
+  position: absolute;
+  width: 100%;
+}
+
+/* center position */
+.app-primary.from-right .main-enter-active,
+.app-primary.from-left .main-enter-active {
+  overflow-x: hidden;
+  transform: translateX(0px);
+  transition: transform 300ms ease-in;
+}
+
+/* exited positions */
+.app-primary.from-left .main-leave-active {
+  transform: translateX(360px);
+  transition: transform 300ms ease-in;
+}
+.app-primary.from-right .main-leave-active {
+  transform: translateX(-360px);
+  transition: transform 300ms ease-in;
+}
+
+.sidebar.from-left {
+  transform: translateX(-320px);
+  transition: transform 300ms ease-in;
+}
+
+/* loader transitions */
+.loader-enter, .loader-leave-active {
+  opacity: 0.0;
+  transition: opacity 150 ease-in;
+}
+.loader-enter-active, .loader-leave {
+  opacity: 1.0;
+  transition: opacity 150 ease-in;
+}
+
+/* entering positions */
+.app-primary.from-right .main-enter:not(.main-enter-active) {
+  transform: translateX(360px);
+}
+.app-primary.from-left .main-enter:not(.main-enter-active) {
+  transform: translateX(-360px);
+}
diff --git a/ui/app/css/lib.scss b/ui/app/css/lib.scss
deleted file mode 100644
index b0ca958a2..000000000
--- a/ui/app/css/lib.scss
+++ /dev/null
@@ -1,272 +0,0 @@
-/* color */
-
-.color-orange {
-  color: #F7861C;
-}
-
-.color-forest {
-  color: #0A5448;
-}
-
-/* lib */
-
-.full-width {
-  width: 100%;
-}
-
-.full-height {
-  height: 100%;
-}
-
-.flex-column {
-  display: flex;
-  flex-direction: column;
-}
-
-.space-between {
-  justify-content: space-between;
-}
-
-.space-around {
-  justify-content: space-around;
-}
-
-.flex-column-bottom {
-  display: flex;
-  flex-direction: column-reverse;
-}
-
-.flex-row {
-  display: flex;
-  flex-direction: row;
-}
-
-.flex-space-between {
-  justify-content: space-between;
-}
-
-.flex-space-around {
-  justify-content: space-around;
-}
-
-.flex-right {
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-end;
-}
-
-.flex-left {
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-start;
-}
-
-.flex-fixed {
-  flex: none;
-}
-
-.flex-basis-auto {
-  flex-basis: auto;
-}
-
-.flex-grow {
-  flex: 1 1 auto;
-}
-
-.flex-wrap {
-  flex-wrap: wrap;
-}
-
-.flex-center {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.flex-justify-center {
-  justify-content: center;
-}
-
-.flex-align-center {
-  align-items: center;
-}
-
-.flex-self-end {
-  align-self: flex-end;
-}
-
-.flex-self-stretch {
-  align-self: stretch;
-}
-
-.flex-vertical {
-  flex-direction: column;
-}
-
-.z-bump {
-  z-index: 1;
-}
-
-.select-none {
-  cursor: inherit;
-  -moz-user-select: none;
-  -webkit-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.pointer {
-  cursor: pointer;
-}
-.cursor-pointer {
-  cursor: pointer;
-  transform-origin: center center;
-  transition: transform 50ms ease-in-out;
-}
-.cursor-pointer:hover {
-  transform: scale(1.1);
-}
-.cursor-pointer:active {
-  transform: scale(0.95);
-}
-
-.cursor-disabled {
-  cursor: not-allowed;
-}
-
-.margin-bottom-sml {
-  margin-bottom: 20px;
-}
-
-.margin-bottom-med {
-  margin-bottom: 40px;
-}
-
-.margin-right-left {
-  margin: 0 20px;
-}
-
-.bold {
-  font-weight: bold;
-}
-
-.text-transform-uppercase {
-  text-transform: uppercase;
-}
-
-.font-small {
-  font-size: 12px;
-}
-
-.font-medium {
-  font-size: 1.2em;
-}
-
-hr.horizontal-line {
-  display: block;
-  height: 1px;
-  border: 0;
-  border-top: 1px solid #ccc;
-  margin: 1em 0;
-  padding: 0;
-}
-
-.hover-white:hover {
-  background: white;
-}
-
-.red-dot {
-  background: #E91550;
-  color: white;
-  border-radius: 10px;
-}
-
-.diamond {
-  transform: rotate(45deg);
-  background: #038789;
-}
-
-.hollow-diamond {
-  transform: rotate(45deg);
-  border: 3px solid #690496;
-}
-
-.golden-square {
-  background: #EBB33F;
-}
-
-.pending-dot {
-  background: red;
-  left: 14px;
-  top: 14px;
-  color: white;
-  border-radius: 10px;
-  height: 20px;
-  min-width: 20px;
-  position: relative;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 4px;
-  z-index: 1;
-}
-
-.keyring-label {
-  z-index: 1;
-  font-size: 11px;
-  background: rgba(255,0,0,0.8);
-  bottom: -47px;
-  color: white;
-  border-radius: 10px;
-  height: 20px;
-  min-width: 20px;
-  position: relative;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 4px;
-}
-
-.ether-balance {
-  display: flex;
-  align-items: center;
-}
-
-.tabSection {
-  min-width: 350px;
-}
-
-.menu-icon {
-  display: inline-block;
-  height: 9px;
-  min-width: 9px;
-  margin: 13px;
-}
-.ether-icon {
-  background: rgb(0, 163, 68);
-  border-radius: 20px;
-}
-.testnet-icon {
-  background: #2465E1;
-}
-
-.drop-menu-item {
-  display: flex;
-  align-items: center;
-}
-
-.invisible {
-  visibility: hidden;
-}
-
-.one-line-concat {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.critical-error {
-  text-align: center;
-  margin-top: 20px;
-  color: red;
-}
diff --git a/ui/app/css/transitions.scss b/ui/app/css/transitions.scss
deleted file mode 100644
index 5f9f31ed7..000000000
--- a/ui/app/css/transitions.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-/* universal */
-.app-primary .main-enter {
-  position: absolute;
-  width: 100%;
-}
-
-/* center position */
-.app-primary.from-right .main-enter-active,
-.app-primary.from-left .main-enter-active {
-  overflow-x: hidden;
-  transform: translateX(0px);
-  transition: transform 300ms ease-in;
-}
-
-/* exited positions */
-.app-primary.from-left .main-leave-active {
-  transform: translateX(360px);
-  transition: transform 300ms ease-in;
-}
-.app-primary.from-right .main-leave-active {
-  transform: translateX(-360px);
-  transition: transform 300ms ease-in;
-}
-
-.sidebar.from-left {
-  transform: translateX(-320px);
-  transition: transform 300ms ease-in;
-}
-
-/* loader transitions */
-.loader-enter, .loader-leave-active {
-  opacity: 0.0;
-  transition: opacity 150 ease-in;
-}
-.loader-enter-active, .loader-leave {
-  opacity: 1.0;
-  transition: opacity 150 ease-in;
-}
-
-/* entering positions */
-.app-primary.from-right .main-enter:not(.main-enter-active) {
-  transform: translateX(360px);
-}
-.app-primary.from-left .main-enter:not(.main-enter-active) {
-  transform: translateX(-360px);
-}
-