From cda9454f49e650ef95c0cd53a36c036a6febd592 Mon Sep 17 00:00:00 2001 From: ciar4n Date: Wed, 25 Jan 2017 14:30:20 +0000 Subject: [PATCH 1/3] Set correct margin-left on row-fluid span --- administrator/templates/isis/css/template-rtl.css | 3 +++ administrator/templates/isis/css/template.css | 3 +++ administrator/templates/isis/less/template.less | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css index bb4a05a943c85..b2de9e90b77c7 100644 --- a/administrator/templates/isis/css/template-rtl.css +++ b/administrator/templates/isis/css/template-rtl.css @@ -8835,6 +8835,9 @@ textarea.noResize { .form-horizontal .controls > .radio.btn-group-yesno:first-child { padding-top: 2px; } +.row-fluid [class*="span"] { + margin-left: 2.12766%; +} .pull-right { float: left; } diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css index 9aeea5f6e538d..2f2509b85fa85 100644 --- a/administrator/templates/isis/css/template.css +++ b/administrator/templates/isis/css/template.css @@ -8835,3 +8835,6 @@ textarea.noResize { .form-horizontal .controls > .radio.btn-group-yesno:first-child { padding-top: 2px; } +.row-fluid [class*="span"] { + margin-left: 2.12766%; +} diff --git a/administrator/templates/isis/less/template.less b/administrator/templates/isis/less/template.less index 8e34e2e243c49..d0f60f57e91a3 100644 --- a/administrator/templates/isis/less/template.less +++ b/administrator/templates/isis/less/template.less @@ -1878,3 +1878,8 @@ textarea.noResize { .form-horizontal .controls > .radio.btn-group-yesno:first-child { padding-top: 2px; } + +// Bootsrap revert of override to default +.row-fluid [class*="span"] { + margin-left: 2.12766%; +} \ No newline at end of file From f19a989e44d0293c64fc389d325a09625c414a0b Mon Sep 17 00:00:00 2001 From: ciar4n Date: Thu, 26 Jan 2017 00:20:15 +0000 Subject: [PATCH 2/3] Wrap in media query --- administrator/templates/isis/css/template-rtl.css | 6 ++++-- administrator/templates/isis/css/template.css | 6 ++++-- administrator/templates/isis/less/template.less | 10 ++++++---- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css index b2de9e90b77c7..9f59459c136fe 100644 --- a/administrator/templates/isis/css/template-rtl.css +++ b/administrator/templates/isis/css/template-rtl.css @@ -8835,8 +8835,10 @@ textarea.noResize { .form-horizontal .controls > .radio.btn-group-yesno:first-child { padding-top: 2px; } -.row-fluid [class*="span"] { - margin-left: 2.12766%; +@media (max-width: 979px) { + .row-fluid [class*="span"] { + margin-left: 2.12766%; + } } .pull-right { float: left; diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css index 2f2509b85fa85..c185eac160d5c 100644 --- a/administrator/templates/isis/css/template.css +++ b/administrator/templates/isis/css/template.css @@ -8835,6 +8835,8 @@ textarea.noResize { .form-horizontal .controls > .radio.btn-group-yesno:first-child { padding-top: 2px; } -.row-fluid [class*="span"] { - margin-left: 2.12766%; +@media (max-width: 979px) { + .row-fluid [class*="span"] { + margin-left: 2.12766%; + } } diff --git a/administrator/templates/isis/less/template.less b/administrator/templates/isis/less/template.less index d0f60f57e91a3..6687b4861615b 100644 --- a/administrator/templates/isis/less/template.less +++ b/administrator/templates/isis/less/template.less @@ -1879,7 +1879,9 @@ textarea.noResize { padding-top: 2px; } -// Bootsrap revert of override to default -.row-fluid [class*="span"] { - margin-left: 2.12766%; -} \ No newline at end of file +// Stop spans from wrapping on smaller screens +@media (max-width: 979px) { + .row-fluid [class*="span"] { + margin-left: 2.12766%; + } +} \ No newline at end of file From ef6758d37bb98aa54c7b448df66e6fb9c2c022db Mon Sep 17 00:00:00 2001 From: ciar4n Date: Thu, 26 Jan 2017 00:41:00 +0000 Subject: [PATCH 3/3] Set 100% width margin to 0 --- administrator/templates/isis/css/template-rtl.css | 5 +++++ administrator/templates/isis/css/template.css | 5 +++++ administrator/templates/isis/less/template.less | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css index 9f59459c136fe..067ee70cccc0f 100644 --- a/administrator/templates/isis/css/template-rtl.css +++ b/administrator/templates/isis/css/template-rtl.css @@ -8840,6 +8840,11 @@ textarea.noResize { margin-left: 2.12766%; } } +@media (max-width: 767px) { + .row-fluid [class*="span"] { + margin-left: 0; + } +} .pull-right { float: left; } diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css index c185eac160d5c..21fd24bde139e 100644 --- a/administrator/templates/isis/css/template.css +++ b/administrator/templates/isis/css/template.css @@ -8840,3 +8840,8 @@ textarea.noResize { margin-left: 2.12766%; } } +@media (max-width: 767px) { + .row-fluid [class*="span"] { + margin-left: 0; + } +} diff --git a/administrator/templates/isis/less/template.less b/administrator/templates/isis/less/template.less index 6687b4861615b..b52fddcba87eb 100644 --- a/administrator/templates/isis/less/template.less +++ b/administrator/templates/isis/less/template.less @@ -1884,4 +1884,9 @@ textarea.noResize { .row-fluid [class*="span"] { margin-left: 2.12766%; } +} +@media (max-width: 767px) { + .row-fluid [class*="span"] { + margin-left: 0; + } } \ No newline at end of file