From 625b4f4a534488f0b8f1b797a32d4212814298db Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Wed, 15 Aug 2018 21:06:48 +0200 Subject: [PATCH] Several changes --- asm/libraries/tomcrypt | 2 +- css/modals.css | 78 ++++++++++++++++++++++++++---------------- css/modals.css.map | 2 +- vendor/bbcode | 1 + 4 files changed, 52 insertions(+), 31 deletions(-) create mode 160000 vendor/bbcode diff --git a/asm/libraries/tomcrypt b/asm/libraries/tomcrypt index 5f0bdabf..2c202ee7 160000 --- a/asm/libraries/tomcrypt +++ b/asm/libraries/tomcrypt @@ -1 +1 @@ -Subproject commit 5f0bdabfc023376fed3640391f1a9228a4449fb0 +Subproject commit 2c202ee7c530b84c6387e0dd71be04ac254a1d17 diff --git a/css/modals.css b/css/modals.css index 49a1ac8c..24bd0cf4 100644 --- a/css/modals.css +++ b/css/modals.css @@ -7,30 +7,12 @@ .modal hr { border-top: 3px double #8c8b8b; width: 100%; } -.modal .general_properties, .modal .properties_general { - width: 100%; - /* - .slots { - width: 100%; - display: inline-flex; - flex-direction: row; - - * { - display: inline-flex; - } - - .maximum, .reserved { - a { - width: 140px; - } - - input { - width: 100px; - margin-right: 20px; - } - } - } - */ } +.modal .general_properties, .modal .properties_general, .modal .server_properties, .modal .properties_messages { + width: 100%; } + .modal .general_properties .group_box, .modal .properties_general .group_box, .modal .server_properties .group_box, .modal .properties_messages .group_box { + margin-top: 5px; } + .modal .general_properties .group_box:first-of-type, .modal .properties_general .group_box:first-of-type, .modal .server_properties .group_box:first-of-type, .modal .properties_messages .group_box:first-of-type { + margin-top: 0px; } .modal .input_error { border-radius: 1px; border: solid red; } @@ -41,18 +23,24 @@ .modal .server_properties .virtualserver_welcomemessage { height: 70px; resize: none; } +.modal .properties_messages textarea { + height: 70px; + resize: none; } +.modal .properties_misc .complains { + display: grid; + grid-template-columns: auto auto auto; + grid-template-rows: auto auto; + grid-column-gap: 5px; + margin-bottom: 10px; } .modal .container { padding: 6px; } -.modal .group_box { - margin-top: 5px; } - .modal .group_box:first-of-type { - margin-top: 0px; } .channel_perm_tbl .value { width: 60px; } .group_box { - display: grid; } + display: grid; + grid-template-rows: min-content; } .group_box .header { float: left; margin-bottom: 2px; } @@ -65,4 +53,36 @@ .container { margin: 2px; } +/* Channel edit/create modal */ +.settings_audio { + display: grid; + grid-template-columns: 40% 60%; + grid-gap: 10px; } + .settings_audio .custom { + display: grid; + grid-template-columns: min-content auto; + grid-template-rows: repeat(auto-fill, min-content); + grid-column-gap: 5px; } + .settings_audio .custom select { + height: fit-content; } + .settings_audio .custom .quality { + display: inline-grid; + grid-template-columns: auto min-content; + grid-column-gap: 5px; } + +.settings_advanced { + display: grid; + grid-template-columns: repeat(auto-fill, max-content); + grid-template-rows: repeat(auto-fill, max-content); + grid-gap: 5px; } + .settings_advanced > div:first-of-type { + grid-column: auto / span 2; } + .settings_advanced .max_limited { + width: 100%; + display: inline-flex; } + .settings_advanced .max_limited input[type="number"] { + width: 75px; } + .settings_advanced .group_box fieldset, .settings_advanced .group_box fieldset > div { + width: 100%; } + /*# sourceMappingURL=modals.css.map */ diff --git a/css/modals.css.map b/css/modals.css.map index 12160b34..97469956 100644 --- a/css/modals.css.map +++ b/css/modals.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AAEC,kBAAY;EACX,OAAO,EAAE,IAAI;EACb,qBAAqB,EAAE,qCAAqC;EAC5D,eAAe,EAAE,IAAI;EACrB,YAAY,EAAE,GAAG;EACjB,UAAU,EAAE,UAAU;AAGvB,SAAG;EACF,UAAU,EAAE,kBAAkB;EAC9B,KAAK,EAAE,IAAI;AAGZ,sDAAyC;EACxC,KAAK,EAAE,IAAI;EAGX;;;;;;;;;;;;;;;;;;;;;MAqBE;AAGH,mBAAa;EACZ,aAAa,EAAE,GAAG;EAClB,MAAM,EAAE,SAAS;AAIjB,qCAAY;EACX,qBAAqB,EAAE,UAAU;EACjC,mDAAgB;IACf,UAAU,EAAE,GAAG;AAIjB,uDAA8B;EAC7B,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,IAAI;AAId,iBAAW;EACV,OAAO,EAAE,GAAG;AAGb,iBAAW;EACV,UAAU,EAAE,GAAG;EAEf,+BAAgB;IACf,UAAU,EAAE,GAAG;;AAMlB,wBAAyB;EACxB,KAAK,EAAE,IAAI;;AAIZ,UAAW;EACV,OAAO,EAAE,IAAI;EAEb,kBAAQ;IACP,KAAK,EAAE,IAAI;IACX,aAAa,EAAE,GAAG;EAGnB,mBAAS;IACR,UAAU,EAAE,oBAAmB;IAC/B,MAAM,EAAE,mBAAmB;IAC3B,aAAa,EAAE,KAAK;IACpB,OAAO,EAAE,GAAG;;AAId,UAAW;EACV,MAAM,EAAE,GAAG", +"mappings": "AAEC,kBAAY;EACX,OAAO,EAAE,IAAI;EACb,qBAAqB,EAAE,qCAAqC;EAC5D,eAAe,EAAE,IAAI;EACrB,YAAY,EAAE,GAAG;EACjB,UAAU,EAAE,UAAU;AAGvB,SAAG;EACF,UAAU,EAAE,kBAAkB;EAC9B,KAAK,EAAE,IAAI;AAGZ,8GAAmF;EAClF,KAAK,EAAE,IAAI;EAEX,0JAAW;IACV,UAAU,EAAE,GAAG;IAEf,kNAAgB;MACf,UAAU,EAAE,GAAG;AAKlB,mBAAa;EACZ,aAAa,EAAE,GAAG;EAClB,MAAM,EAAE,SAAS;AAIjB,qCAAY;EACX,qBAAqB,EAAE,UAAU;EACjC,mDAAgB;IACf,UAAU,EAAE,GAAG;AAIjB,uDAA8B;EAC7B,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,IAAI;AAId,oCAA8B;EAC7B,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,IAAI;AAIZ,kCAAW;EACV,OAAO,EAAE,IAAI;EACb,qBAAqB,EAAE,cAAc;EACrC,kBAAkB,EAAE,SAAS;EAC7B,eAAe,EAAE,GAAG;EACpB,aAAa,EAAE,IAAI;AAIrB,iBAAW;EACV,OAAO,EAAE,GAAG;;AAKd,wBAAyB;EACxB,KAAK,EAAE,IAAI;;AAIZ,UAAW;EACV,OAAO,EAAE,IAAI;EACb,kBAAkB,EAAE,WAAW;EAE/B,kBAAQ;IACP,KAAK,EAAE,IAAI;IACX,aAAa,EAAE,GAAG;EAGnB,mBAAS;IACR,UAAU,EAAE,oBAAmB;IAC/B,MAAM,EAAE,mBAAmB;IAC3B,aAAa,EAAE,KAAK;IACpB,OAAO,EAAE,GAAG;;AAId,UAAW;EACV,MAAM,EAAE,GAAG;;AAGZ,+BAA+B;AAC/B,eAAgB;EACf,OAAO,EAAE,IAAI;EACb,qBAAqB,EAAE,OAAO;EAC9B,QAAQ,EAAE,IAAI;EAEd,uBAAQ;IACP,OAAO,EAAE,IAAI;IACb,qBAAqB,EAAE,gBAAgB;IACvC,kBAAkB,EAAE,8BAA8B;IAClD,eAAe,EAAE,GAAG;IAEpB,8BAAO;MACN,MAAM,EAAE,WAAW;IAGpB,gCAAS;MACR,OAAO,EAAE,WAAW;MACpB,qBAAqB,EAAE,gBAAgB;MACvC,eAAe,EAAE,GAAG;;AAKvB,kBAAmB;EAClB,OAAO,EAAE,IAAI;EACb,qBAAqB,EAAE,8BAA8B;EACrD,kBAAkB,EAAE,8BAA8B;EAClD,QAAQ,EAAE,GAAG;EAEb,sCAAoB;IACnB,WAAW,EAAE,aAAa;EAG3B,+BAAa;IACZ,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,WAAW;IACpB,oDAAqB;MACpB,KAAK,EAAE,IAAI;EAKZ,oFAAyB;IACxB,KAAK,EAAE,IAAI", "sources": ["modals.scss"], "names": [], "file": "modals.css" diff --git a/vendor/bbcode b/vendor/bbcode new file mode 160000 index 00000000..67a1519a --- /dev/null +++ b/vendor/bbcode @@ -0,0 +1 @@ +Subproject commit 67a1519a7254f2db9706f13184c0c38f331464b0