diff options
Diffstat (limited to 'public/assets')
| -rw-r--r-- | public/assets/css/bucky.css | 51 | ||||
| -rw-r--r-- | public/assets/css/hootstream.css | 1 | ||||
| -rw-r--r-- | public/assets/js/lib/views/admin/adminz.js | 52 | ||||
| -rw-r--r-- | public/assets/js/lib/views/index/index.js | 4 | ||||
| -rw-r--r-- | public/assets/js/lib/views/stream/index.js | 4 |
5 files changed, 72 insertions, 40 deletions
diff --git a/public/assets/css/bucky.css b/public/assets/css/bucky.css index 5ecb837..a6f9b0e 100644 --- a/public/assets/css/bucky.css +++ b/public/assets/css/bucky.css @@ -40,16 +40,20 @@ label { } button, input[type="submit"] { - font-size: 10px; + font-size: 1rem; font-family: Trebuchet MS, Helvetica, Arial, sans-serif; font-weight: bold; + text-transform: uppercase; + background-color: #c8d0dc; color: #140a0a; border: 2px #140a0a solid; - padding: 2px; - margin: 3px; - background-color: #c8d0dc; - text-transform: uppercase; + padding: 0.75rem; + margin-left: 0.5rem; + min-width: 3rem; + opacity: 0.6; + transition: opacity 0.1s; cursor: pointer; + border-radius: 0.25rem; } .desktop button:hover, .desktop input[type="submit"] { @@ -1281,6 +1285,28 @@ header .search_form { margin-left: 7px; } +@media (max-width: 720px) { + #login, + #signup { + margin-top: 1rem; + } + #login label, + #signup label { + font-size: 1rem; + padding: 0.5rem; + padding-right: 1rem; + } + #login input, + #signup input { + font-size: 1rem; + padding: 0.5rem; + } + #login form div, + #signup form div { + margin-bottom: 0.75rem; + } +} + /* ADMIN */ .admin { @@ -1392,10 +1418,11 @@ audio { /* mobile css and errata */ -@media (min-width: 700px) and (max-width: 1000px) { - #sidebar { +@media (min-width: 720px) and (max-width: 1000px) { + /* #sidebar { display: none; } +*/ #content { width: 100%; } @@ -1406,7 +1433,7 @@ audio { display: block; } } -@media (max-width: 700px) { +@media (max-width: 720px) { html { padding-bottom: 0px; } @@ -1418,8 +1445,8 @@ audio { justify-content: flex-start; } h1 { - font-size: 20px; - margin-bottom: 10px; + font-size: 1.5rem; + padding: 0.5rem 1.25rem; } #sidebar, #content { @@ -1511,8 +1538,8 @@ audio { input[type="submit"] { color: #f8f8f8; border: 2px #eee solid; - padding: 2px; - margin: 3px; + padding: 0.25rem; + margin: 0; background-color: #18202c; text-transform: uppercase; cursor: pointer; diff --git a/public/assets/css/hootstream.css b/public/assets/css/hootstream.css index 2acd5ce..29fd401 100644 --- a/public/assets/css/hootstream.css +++ b/public/assets/css/hootstream.css @@ -383,7 +383,6 @@ #hootform form button { margin: 0; padding: 0.25rem; - padding: 0.25rem; margin-left: 0.5rem; min-width: 3rem; font-size: 0.75rem; diff --git a/public/assets/js/lib/views/admin/adminz.js b/public/assets/js/lib/views/admin/adminz.js index caed86d..cd0c93d 100644 --- a/public/assets/js/lib/views/admin/adminz.js +++ b/public/assets/js/lib/views/admin/adminz.js @@ -1,39 +1,41 @@ var AdminView = View.extend({ - - events: { - }, + events: {}, action: "/api/admin", - initialize: function(opt){ + initialize: function (opt) { // this.hootbox = new HootBox ({ parent: this }) - this.password = new ChangePasswordForm ({ parent: this }) - this.lastlog = new LastLog ({ parent: this }) + this.password = new ChangePasswordForm({ parent: this }); + this.lastlog = new LastLog({ parent: this }); }, - load: function(){ - $("body").addClass("index").addClass("admin") - $.get(this.action, this.populate.bind(this)) + load: function () { + $("body").addClass("index").addClass("admin"); + $.get(this.action, this.populate.bind(this)); }, - populate: function(data){ - $("body").removeClass('loading') - console.log(data) - this.password.load(data.usernames) - this.lastlog.load(data.lastlog) + populate: function (data) { + $("body").removeClass("loading"); + console.log(data); + this.password.load(data.usernames); + this.lastlog.load(data.lastlog); if (data.mail.count) { - $(".alert").show().html( - "<a href='/mail'>" + - "You have " + - data.mail.count + - " new message" + - courtesy_s(data.mail.count) + - "!</a>") + $(".alert") + .show() + .html( + "<a href='/mail'>" + + "You have " + + data.mail.count + + " new message" + + courtesy_s(data.mail.count) + + "!</a>" + ); if (is_mobile) { - $("#content").prepend( $(".alert") ) + $("#content").prepend($(".alert")); } } - $(".search_form input").focus() + if (is_desktop) { + $(".search_form input").focus(); + } }, - -}) +}); diff --git a/public/assets/js/lib/views/index/index.js b/public/assets/js/lib/views/index/index.js index cd5f650..b370c9e 100644 --- a/public/assets/js/lib/views/index/index.js +++ b/public/assets/js/lib/views/index/index.js @@ -50,7 +50,9 @@ var IndexView = View.extend({ $("#content").prepend($(".alert")); } } - $(".search_form input").focus(); + if (is_desktop) { + $(".search_form input").focus(); + } }, success: function () { diff --git a/public/assets/js/lib/views/stream/index.js b/public/assets/js/lib/views/stream/index.js index 0a2aeb9..fef23ef 100644 --- a/public/assets/js/lib/views/stream/index.js +++ b/public/assets/js/lib/views/stream/index.js @@ -38,7 +38,9 @@ var StreamView = View.extend({ $("#content").prepend($(".alert")); } } - $(".search_form input").focus(); + if (is_desktop) { + $(".search_form input").focus(); + } }, onComment: function (comment) { |