diff --git a/badged/admin/assets/css/admin.min.css b/badged/admin/assets/css/admin.min.css index d0c65e5..e50bc97 100644 --- a/badged/admin/assets/css/admin.min.css +++ b/badged/admin/assets/css/admin.min.css @@ -1,8 +1,6 @@ #badgedoptions a,#badgedoptions input.button-primary,#badgedoptions .kremalicious{text-decoration:none;-webkit-transition:all .2s ease-in-out 0;transition:all .2s ease-in-out 0} -#badgedoptions form h3{font-family:HelveticaNeue-Light,"Helvetica Neue Light","Helvetica Neue",sans-serif;font-size:18px;font-weight:400;border-bottom:1px solid #eee;border-top:1px solid #eee;margin-top:.5em;padding:10px 0} -#badgedoptions footer{border-top:1px solid #eee;color:#666} -#badgedoptions .icon32{background:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAADi0lEQVRIx42VbUyVZRjH/xwTBHG4wkgHW2YuF8sMKmvuzKJWSeW01iznh2qrsVq1NqutRqMXdFbo5oIPAplIviR4GK9RB20m5kmQQoFUOgbyKgcIHe8cf314zvGc5zzIvH9fnl3/+7nu9/8lTdfCFat79JDsekIpWqUkLdF83aKbaGGaq7ujUj/adfhMq8c9AONTrZ6m3kLX65larQRFzPx7hO6865X9fwxPME3rvZpVphTF3Xgmc/Xw1yVXx5mh/Tv49g4tm34eMQueKWnydxzjMm7cNNOCmzb6mfQpk95tZUpSpGX0Bamnu4wuo1zkr2loZ8qXZHetVijcvPaVpS2G2MdpE7X8fv37b4Z9KdIPaalmBXZ+8VelhtCGy0Q5TiqpCYoMADA+tTFDsf4EUYs3DY0BdHHcRA3FQDc/BsVqGQHgZKdWabYx/rI9dQDD/BpEFQ4KOQ90sc+k1PuW8c4uxUlSxKKXjXP/E+d1DlBGHR6Mee0NUpw4cQNQ361HFCYt/PwQwBWqgsgJOvtOvjNpVRwBwHst+S1FSvc7zgOcpTyIPThw4KAF6CDPpJVT7tvKLxxaJK1u9gCUkmcik0y+5Chwka0hWh4uAPafUaL0rHF5d7DFwsdUAhfYbFGKADjWqZXSC5NegG/YZiGdKuACH1qUgwDU9courR+fAtjJdgufUQ208olFOQyAq0d26bm+UYDdfGthK07gHzIsSjUAzg49KqU0eADKybWQ5dvELRblFADfN2q5lFTQBNDIXgvZHAPayLIo/QC8f1AJUnxaAcAIRRbyOQG0kx0S/8X3oG5P0zwpKnJj9zBAPRUh/IDLd5HM8TYAKi/JrlmSTQ9sPwkwgYsaE0XUA10UmqINviv+fI4SjOd8a8wbHcPGezhh4jdyKSCHn4NijT5z+6lTT2uOkcCmxFcPeK8BDNIQ4khmzmEY9sBYYrriFRbw4yd31vvt1E3TDWjzW6530z6tMOzEb2qxWp971v+APbhpDaGdIZ86MpVWIruiza5sU5zWfXBkzOtPMs4g/fTSRz9DBCpNz+iafNkVE5h+IMVteiw1t/m/mQpLRce9GUpWtGzTlRab5mm5Xnu34vjlSW/or1cmSjvW5OtFLdEc6+iBvQhXnB7Uhjs+3VxdcK7o0qn+oz3F7dmNbxbrPa1V4s3UaJsiFKN4JesprdMGvaS1elz3aaGiNds69v/dlhd6/99OsgAAAABJRU5ErkJggg==') no-repeat center center}@media print, (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 120dpi) {#badgedoptions .icon32 #badgedoptions .icon32{background-image:url('../img/icon-badged-32@2x.png') !important;background-size:32px 32px}} -#badgedoptions p.submit{background:#fcfcfc;padding:.7em .5em;border-top:1px solid #eee;margin-top:4em;margin-bottom:3em} +#badgedoptions form h3{font-family:HelveticaNeue-Light,"Helvetica Neue Light","Helvetica Neue",sans-serif;font-size:18px;font-weight:400;border-bottom:1px solid #e3e3e3;border-top:1px solid #e3e3e3;margin-top:.5em;padding:10px 0} +#badgedoptions footer{border-top:1px solid #e3e3e3;color:#666} #badgedoptions .radio-row{margin-bottom:0} .kremalicious{background:url('../img/kremalicious-cloud.svg') no-repeat left -2px;background-size:16px;width:16px;height:16px;margin-left:10px;margin-right:1px;margin-bottom:-1px;display:inline-block;vertical-align:bottom;opacity:.5}.kremalicious-link:hover .kremalicious{opacity:1} diff --git a/badged/admin/assets/less/admin.less b/badged/admin/assets/less/admin.less index 8df1909..dd13445 100644 --- a/badged/admin/assets/less/admin.less +++ b/badged/admin/assets/less/admin.less @@ -24,36 +24,17 @@ font-family: HelveticaNeue-Light,"Helvetica Neue Light","Helvetica Neue",sans-serif; font-size: 18px; font-weight: 400; - border-bottom: 1px solid #eee; - border-top: 1px solid #eee; + border-bottom: 1px solid @admin-border-color; + border-top: 1px solid @admin-border-color; margin-top: .5em; padding: 10px 0; } footer { - border-top: 1px solid #eee; + border-top: 1px solid @admin-border-color; color: #666; } - .icon32 { - background: data-uri('../img/icon-badged-32.png') no-repeat center center; - - @media @highDPI { - #badgedoptions .icon32 { - background-image: url('../img/icon-badged-32@2x.png') !important; - background-size: 32px 32px; - } - } - } - - p.submit { - background: #fcfcfc; - padding: .7em .5em; - border-top: 1px solid #eee; - margin-top: 4em; - margin-bottom: 3em; - } - .radio-row { margin-bottom: 0 } } diff --git a/badged/admin/assets/less/scaffolding.less b/badged/admin/assets/less/scaffolding.less index 6e02c99..36c0a6d 100644 --- a/badged/admin/assets/less/scaffolding.less +++ b/badged/admin/assets/less/scaffolding.less @@ -7,17 +7,19 @@ // Variables // -@font-size: 12px; -@line-height: 20px; -@font-weight: 200; -@font-family: 'Helvetica Neue', Helvetica, Verdana, Geneva, sans-serif; -@font-color: #fff; +@font-size: 12px; +@line-height: 20px; +@font-weight: 200; +@font-family: 'Helvetica Neue', Helvetica, Verdana, Geneva, sans-serif; +@font-color: #fff; + +@font-size-ios6: 11px; +@line-height-ios6: 17px; +@font-weight-ios6: normal; +@font-family-ios6: Helvetica, Verdana, Geneva, sans-serif; +@font-color-ios6: #fff; -@font-size-ios6: 11px; -@line-height-ios6: 17px; -@font-weight-ios6: normal; -@font-family-ios6: Helvetica, Verdana, Geneva, sans-serif; -@font-color-ios6: #fff; +@admin-border-color: #e3e3e3; // High DPI Media Query @highDPI: ~"print, (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 120dpi) "; diff --git a/badged/admin/views/admin.php b/badged/admin/views/admin.php index 120865b..7510c40 100644 --- a/badged/admin/views/admin.php +++ b/badged/admin/views/admin.php @@ -18,15 +18,15 @@