From f00420c92f0511054b960c70496cf1b9abaa858c Mon Sep 17 00:00:00 2001 From: Colin McLeod Date: Mon, 6 Jul 2015 11:20:08 -0700 Subject: [PATCH] UI Tweaks --- .../directives/directive-component-select.js | 4 +- app/less/outfit.less | 5 -- app/less/select.less | 52 +++++++++---------- app/less/table.less | 4 ++ 4 files changed, 32 insertions(+), 33 deletions(-) diff --git a/app/js/directives/directive-component-select.js b/app/js/directives/directive-component-select.js index 57228f46..e51dc205 100755 --- a/app/js/directives/directive-component-select.js +++ b/app/js/directives/directive-component-select.js @@ -24,7 +24,7 @@ angular.module('app').directive('componentSelect', function() { list.push(' '); } - list.push(o.class, o.rating); + list.push('', o.class, o.rating); if (o.missile) { list.push('/' + o.missile); @@ -35,7 +35,7 @@ angular.module('app').directive('componentSelect', function() { list.push(' ' + o.name); } - list.push(''); + list.push(''); prevClass = o.class; prevRating = o.rating; } diff --git a/app/less/outfit.less b/app/less/outfit.less index b2f21653..3aecf8d7 100755 --- a/app/less/outfit.less +++ b/app/less/outfit.less @@ -148,11 +148,6 @@ table.total { .user-select-none(); cursor: default; - [ng-click] { - cursor: pointer; - } - - h1 { font-family: @fStandard; color: @bgBlack; diff --git a/app/less/select.less b/app/less/select.less index ff1a6e8e..d7f4941e 100755 --- a/app/less/select.less +++ b/app/less/select.less @@ -29,16 +29,19 @@ select { padding: 0.5em 0; width: 100%; margin: 0; - max-height: 300px; + max-height: 500px; overflow-y: auto; overflow-x: hidden; z-index: 0; -webkit-overflow-scrolling: touch; background-color: @bg; border: 1px solid @primary; - white-space: nowrap; text-align: center; + .tablet({ + max-height: 300px; + }); + &::-webkit-scrollbar { width: 0.5em; } @@ -53,6 +56,7 @@ select { } .select-group { + white-space: nowrap; line-height: 1.5em; text-align: left; margin: 0.5em 0; @@ -61,11 +65,15 @@ select { border-bottom: 1px solid @primary-disabled; } - .empty-c, .c, .lc { - cursor: pointer; + @optionSpacing: 2em; + .empty-c, .c, .lc { + white-space: nowrap; + text-align: center; + cursor: pointer; + line-height:@optionSpacing; color: @primary-disabled; - stroke-width: 1em; + stroke-width: 5px; stroke: @primary-disabled; &:hover { @@ -83,27 +91,10 @@ select { } } - @optionSpacing: 2em; - - .lc { - line-height:@optionSpacing; - text-align: left; - } - - .empty-c { - line-height:@optionSpacing; - text-align: center; - } - - - .c { + .lc, .c { border:1px solid @primary-disabled; - display: inline-block; - padding: 0.1em; + padding: 0.1em 0.2em; margin: 0.3em; - width: 2em; - line-height: @optionSpacing; - text-align: center; &:hover { border:1px solid @warning; @@ -117,10 +108,19 @@ select { } } + .c { + display: inline-block; + width: 2em; + } + + span { + vertical-align: middle; + } + ul { display: inline-block; text-align: left; - min-width: 15em; + min-width: 16em; margin: 0 auto; padding: 0; list-style: none; @@ -128,7 +128,7 @@ select { &.hardpoint { .c { - width: 4.4em; + width: 4.5em; padding: 0.1em 0.2em; } ul { diff --git a/app/less/table.less b/app/less/table.less index bb0af584..92f02a41 100755 --- a/app/less/table.less +++ b/app/less/table.less @@ -8,6 +8,10 @@ table { color: @primary; text-decoration: none; } + + [ng-click] { + cursor: pointer; + } } thead {