From 82ae6bac85be7bc0ac80b99bad757cdd4d8aa87d Mon Sep 17 00:00:00 2001 From: Scott O'Hara Date: Thu, 23 Jan 2014 21:14:46 -0500 Subject: [PATCH 1/2] updates to the ui basic styling for selects add new .ui-row class and convert

to

's keep .ui p as fallback for updated .ui-row class --- css/ui.css | 38 +++++++++++---- index.html | 134 ++++++++++++++++++++++++++--------------------------- 2 files changed, 95 insertions(+), 77 deletions(-) diff --git a/css/ui.css b/css/ui.css index 9d8465c..b652841 100644 --- a/css/ui.css +++ b/css/ui.css @@ -1,3 +1,9 @@ +.ui * { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} + .ui { position: fixed; right: 0; @@ -9,6 +15,10 @@ overflow-y: auto; } +.btn-row { + text-align: center; +} + .ui:not(.visible) { -webkit-transform: translate(100%, 0); transform: translate(100%, 0); @@ -29,11 +39,16 @@ font-size: 13px; line-height: 1.4; border-radius: 4px; - padding: 10px; + padding: 8px; -webkit-font-smoothing: subpixel-antialiased; transition: all 250ms linear; } +.ui select { + border: 1px solid #ccc; + padding: 4px; +} + .ui button:hover, .ui select:hover, .ui input:hover, .ui :focus, #toggle:hover { color: #000; opacity: 0.8; @@ -43,27 +58,25 @@ color: #fff; } -.ui:not([id]) p:nth-of-type(1) button { +.btn-row-1 button { background-color: #1abc9c; } -.ui:not([id]) p:nth-of-type(2) button { +.btn-row-2 button { background-color: #3498db; } -.ui:not([id]) p:nth-of-type(3) button { +.btn-row-3 button { background-color: #2ecc71; } - .ui button, #toggle { cursor: pointer; - text-align: center; width: 82px; } .ui select, .ui input, .ui #color { - width: 168px; + width: 100%; } .ui button:first-child { @@ -74,8 +87,13 @@ font-weight: bold; } -.ui p { - margin: 8px 16px; +.ui p, .ui-row { + margin: 0; + padding: 8px; +} + +.btn-row-2 { + padding: 0 8px; } .ui table { @@ -171,4 +189,4 @@ .ui#help table { font-size: 80%; -} \ No newline at end of file +} diff --git a/index.html b/index.html index 729c572..5bc32a5 100644 --- a/index.html +++ b/index.html @@ -16,31 +16,31 @@

Map

-

+

-

-

+

+
-

-

+

+
-

+

Item

-

- Layout +

+ -

-

- Shape +

+
+ -

-

+

+
Value -

-

- Status +

+
+ -

-

- Color +

+
+ - - - - - - - - - + + + + + + + + + -

+
GitHub project page
@@ -84,69 +84,69 @@

Item

-

- Storage +

+ -

- +
+
-

- Format - -

-

+

+ + +
+
-

+
-

+

Saved maps -

-

+

+
-

-

+

+
-

+
-

- Server - -

-

- Auth - +

+
+ + -

-

- Saved maps - -

-

+

+
+ + +
+
-

-

+

+
-

+
-

- Format - -

-

+

+ + +
+
-

+
From 5f0d73b6a64f362cf3532562b350fdd850216f44 Mon Sep 17 00:00:00 2001 From: Scott O'Hara Date: Fri, 24 Jan 2014 07:53:34 -0500 Subject: [PATCH 2/2] makes sure that buttons always have white text when within a .btn-row --- css/ui.css | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/css/ui.css b/css/ui.css index b652841..5e38601 100644 --- a/css/ui.css +++ b/css/ui.css @@ -19,6 +19,22 @@ text-align: center; } +.btn-row button{ + color: #fff; +} + +.btn-row-1 button { + background-color: #1abc9c; +} + +.btn-row-2 button { + background-color: #3498db; +} + +.btn-row-3 button { + background-color: #2ecc71; +} + .ui:not(.visible) { -webkit-transform: translate(100%, 0); transform: translate(100%, 0); @@ -58,18 +74,6 @@ color: #fff; } -.btn-row-1 button { - background-color: #1abc9c; -} - -.btn-row-2 button { - background-color: #3498db; -} - -.btn-row-3 button { - background-color: #2ecc71; -} - .ui button, #toggle { cursor: pointer; width: 82px;