From 31cec107b031ef79d2f6cb405449a7b3ca989eac Mon Sep 17 00:00:00 2001 From: peteruithoven Date: Thu, 16 Jan 2014 22:51:19 +0100 Subject: [PATCH] Restyled settings popup --- less/mobile.less | 6 ++++ less/mobile_settingspopup.less | 14 -------- less/popup.less | 31 ++++++++++-------- less/settingsPopup.less | 19 ++++++----- less/styles.less | 1 - www/img/settings_lable.png | Bin 6838 -> 0 bytes .../settings_lable.png => settings_title.png} | Bin www/index.html | 4 +-- 8 files changed, 34 insertions(+), 41 deletions(-) delete mode 100644 less/mobile_settingspopup.less delete mode 100644 www/img/settings_lable.png rename www/img/{buttons/settings_lable.png => settings_title.png} (100%) diff --git a/less/mobile.less b/less/mobile.less index 9b569ce..ffcf208 100644 --- a/less/mobile.less +++ b/less/mobile.less @@ -52,3 +52,9 @@ } } +/* + SETTINGS POPUP +*/ +#popupSettings { + margin: 2% 2%; +} \ No newline at end of file diff --git a/less/mobile_settingspopup.less b/less/mobile_settingspopup.less deleted file mode 100644 index 33ca42a..0000000 --- a/less/mobile_settingspopup.less +++ /dev/null @@ -1,14 +0,0 @@ -/* - - SETTINGS POPUP - MOBILE - -*/ -#popupSettings { - width: 87%; - height: 82%; - margin: 6% 4%; - - > .right { - width: 14%; - } -} \ No newline at end of file diff --git a/less/popup.less b/less/popup.less index 00e62d7..93646b8 100644 --- a/less/popup.less +++ b/less/popup.less @@ -2,8 +2,6 @@ #popupMask { background-color: rgba(255, 255, 255, 0.65); - // z-index: 20; - // border: 10px solid red; position: absolute; top: 0; left: 0; @@ -16,18 +14,18 @@ } .popup { - background-color: white; - border: 2px solid black; + background-color: #fff; + border: 2px solid #222; border-radius: 15px; - top: 30%; + box-shadow: 0px 2px 6px 0px rgba(16, 16, 16, 0.65); position: absolute; left: 50%; - // margin-left: -@popup-width/2; - // width: @popup-width; + top:50%; } .popup .content { - margin: 5%; + /*margin: 5%;*/ + margin: 15px; } .popup { @@ -35,21 +33,26 @@ } #popupWordArt { - width: 50%; - margin-left: -50%/2; + width: 330px; + height:210px; + margin-left: -165px; + margin-top: -105px; input[type="text"] { - width: 100%; + width: 98%; } #btnWordArtOk { float: right; - margin: 15px 0 18px 0; + margin: 15px 0 0 0; } } #popupShape { - width: 30%; - margin-left: -30%/2; + width: 310px; + margin-left: -155px; + height: 230px; + margin-top: -115px; + top: 50%; #shapePreview { // width: 150px; diff --git a/less/settingsPopup.less b/less/settingsPopup.less index 5086358..da8fe2d 100644 --- a/less/settingsPopup.less +++ b/less/settingsPopup.less @@ -4,27 +4,22 @@ */ #popupSettings { - background-color: #fff; - position: absolute; top: 0; left: 0; right: 0; bottom: 0; - z-index: 15; + //z-index: 15; max-width: 775px; max-height: 540px; - width: 80%; - height: 75%; + //width: 80%; + //height: 75%; margin: 7% 8%; - box-shadow: 0px 2px 6px 0px rgba(16, 16, 16, 0.65); - border: 2px solid #222; - border-radius: 15px; padding: 2%; .toppanel { height: 10%; - #settingsLabelContainer { + /*#settingsLabelContainer { width: 100%; height: auto; margin-bottom: 1%; @@ -34,6 +29,12 @@ max-width: 373px; height: auto; } + }*/ + .title { + height: 100%; + max-height: 44px; + width: auto; + margin: 0 0 1% 0; } } .bottompanel { diff --git a/less/styles.less b/less/styles.less index c4aa274..c080811 100644 --- a/less/styles.less +++ b/less/styles.less @@ -14,7 +14,6 @@ only screen and (max-width: 720px) and (min-device-pixel-ratio : 1.5), only screen and (max-width: 720px) and (-webkit-min-device-pixel-ratio : 1.5) { @import "mobile.less"; - @import "mobile_settingspopup.less"; } // FULL diff --git a/www/img/settings_lable.png b/www/img/settings_lable.png deleted file mode 100644 index a8efabada30a7a91f138c0a34ba562424500e18c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6838 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 diff --git a/www/img/buttons/settings_lable.png b/www/img/settings_title.png similarity index 100% rename from www/img/buttons/settings_lable.png rename to www/img/settings_title.png diff --git a/www/index.html b/www/index.html index a2167ac..c10db36 100644 --- a/www/index.html +++ b/www/index.html @@ -142,9 +142,7 @@