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 a8efaba..0000000 Binary files a/www/img/settings_lable.png and /dev/null differ 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 @@