From ac1151e48eae497f895b603e25d5f71b0c7f3282 Mon Sep 17 00:00:00 2001 From: ciar4n Date: Wed, 31 Aug 2016 21:49:13 +0100 Subject: [PATCH] Minor fixes --- .../templates/isis/css/jui/chosen.css | 2 +- .../templates/isis/css/template-rtl.css | 218 ++++++++++-------- administrator/templates/isis/css/template.css | 201 ++++++++-------- .../templates/isis/less/template-rtl.less | 17 +- .../templates/isis/less/template.less | 15 +- .../templates/isis/less/variables.less | 2 +- 6 files changed, 244 insertions(+), 211 deletions(-) diff --git a/administrator/templates/isis/css/jui/chosen.css b/administrator/templates/isis/css/jui/chosen.css index 3b05fb5d559ce..b7eb2ace61cae 100644 --- a/administrator/templates/isis/css/jui/chosen.css +++ b/administrator/templates/isis/css/jui/chosen.css @@ -64,7 +64,7 @@ background-color: #ffffff; border-radius: 3px; line-height: 26px; - border: 1px solid #cacaca; + border: 1px solid #cccccc; border: 1px solid rgba(0,0,0,0.2); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05); } diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css index 51db22b294f71..2727fa9f88b20 100644 --- a/administrator/templates/isis/css/template-rtl.css +++ b/administrator/templates/isis/css/template-rtl.css @@ -824,9 +824,9 @@ pre { background-color: #f5f5f5; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } pre.prettyprint { margin-bottom: 18px; @@ -1723,9 +1723,9 @@ table { border-collapse: separate; *border-collapse: collapse; border-left: 0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .table-bordered th, .table-bordered td { @@ -1745,34 +1745,34 @@ table { .table-bordered thead:first-child tr:first-child > th:first-child, .table-bordered tbody:first-child tr:first-child > td:first-child, .table-bordered tbody:first-child tr:first-child > th:first-child { - -webkit-border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - border-top-left-radius: 4px; + -webkit-border-top-left-radius: 3px; + -moz-border-radius-topleft: 3px; + border-top-left-radius: 3px; } .table-bordered thead:first-child tr:first-child > th:last-child, .table-bordered tbody:first-child tr:first-child > td:last-child, .table-bordered tbody:first-child tr:first-child > th:last-child { - -webkit-border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; - border-top-right-radius: 4px; + -webkit-border-top-right-radius: 3px; + -moz-border-radius-topright: 3px; + border-top-right-radius: 3px; } .table-bordered thead:last-child tr:last-child > th:first-child, .table-bordered tbody:last-child tr:last-child > td:first-child, .table-bordered tbody:last-child tr:last-child > th:first-child, .table-bordered tfoot:last-child tr:last-child > td:first-child, .table-bordered tfoot:last-child tr:last-child > th:first-child { - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-left-radius: 4px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-bottomleft: 3px; + border-bottom-left-radius: 3px; } .table-bordered thead:last-child tr:last-child > th:last-child, .table-bordered tbody:last-child tr:last-child > td:last-child, .table-bordered tbody:last-child tr:last-child > th:last-child, .table-bordered tfoot:last-child tr:last-child > td:last-child, .table-bordered tfoot:last-child tr:last-child > th:last-child { - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; + -webkit-border-bottom-right-radius: 3px; + -moz-border-radius-bottomright: 3px; + border-bottom-right-radius: 3px; } .table-bordered tfoot + tbody:last-child tr:last-child td:first-child { -webkit-border-bottom-left-radius: 0; @@ -1788,17 +1788,17 @@ table { .table-bordered caption + tbody tr:first-child td:first-child, .table-bordered colgroup + thead tr:first-child th:first-child, .table-bordered colgroup + tbody tr:first-child td:first-child { - -webkit-border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - border-top-left-radius: 4px; + -webkit-border-top-left-radius: 3px; + -moz-border-radius-topleft: 3px; + border-top-left-radius: 3px; } .table-bordered caption + thead tr:first-child th:last-child, .table-bordered caption + tbody tr:first-child td:last-child, .table-bordered colgroup + thead tr:first-child th:last-child, .table-bordered colgroup + tbody tr:first-child td:last-child { - -webkit-border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; - border-top-right-radius: 4px; + -webkit-border-top-right-radius: 3px; + -moz-border-radius-topright: 3px; + border-top-right-radius: 3px; } .table-striped tbody > tr:nth-child(odd) > td, .table-striped tbody > tr:nth-child(odd) > th { @@ -2115,9 +2115,9 @@ table th[class*="span"], .typeahead { z-index: 1051; margin-top: 2px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .well { min-height: 20px; @@ -2125,9 +2125,9 @@ table th[class*="span"], margin-bottom: 20px; background-color: #f0f0f0; border: 1px solid #f0f0f0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .well blockquote { border-color: #f0f0f0; @@ -2223,9 +2223,9 @@ button.close { background-color: #f3f3f3; color: #333; border: 1px solid #b3b3b3; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); } .btn:hover, @@ -2485,21 +2485,21 @@ input[type="submit"].btn.btn-mini { } .btn-group > .btn:first-child { margin-left: 0; - -webkit-border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - border-top-left-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-left-radius: 4px; + -webkit-border-top-left-radius: 3px; + -moz-border-radius-topleft: 3px; + border-top-left-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-bottomleft: 3px; + border-bottom-left-radius: 3px; } .btn-group > .btn:last-child, .btn-group > .dropdown-toggle { - -webkit-border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; + -webkit-border-top-right-radius: 3px; + -moz-border-radius-topright: 3px; + border-top-right-radius: 3px; + -webkit-border-bottom-right-radius: 3px; + -moz-border-radius-bottomright: 3px; + border-bottom-right-radius: 3px; } .btn-group > .btn.large:first-child { margin-left: 0; @@ -2625,14 +2625,14 @@ input[type="submit"].btn.btn-mini { margin-top: -1px; } .btn-group-vertical > .btn:first-child { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } .btn-group-vertical > .btn:last-child { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } .btn-group-vertical > .btn-large:first-child { -webkit-border-radius: 6px 6px 0 0; @@ -2650,9 +2650,9 @@ input[type="submit"].btn.btn-mini { text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); background-color: #fcf8e3; border: 1px solid #faebcc; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .alert, .alert h4 { @@ -3069,9 +3069,9 @@ input[type="submit"].btn.btn-mini { background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); border: 1px solid #d4d4d4; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); @@ -3539,9 +3539,9 @@ input[type="submit"].btn.btn-mini { margin: 0 0 18px; list-style: none; background-color: #f5f5f5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .breadcrumb > li { display: inline-block; @@ -3567,9 +3567,9 @@ input[type="submit"].btn.btn-mini { *zoom: 1; margin-left: 0; margin-bottom: 0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); @@ -3609,21 +3609,21 @@ input[type="submit"].btn.btn-mini { .pagination ul > li:first-child > a, .pagination ul > li:first-child > span { border-left-width: 1px; - -webkit-border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - border-top-left-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-left-radius: 4px; + -webkit-border-top-left-radius: 3px; + -moz-border-radius-topleft: 3px; + border-top-left-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-bottomleft: 3px; + border-bottom-left-radius: 3px; } .pagination ul > li:last-child > a, .pagination ul > li:last-child > span { - -webkit-border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; + -webkit-border-top-right-radius: 3px; + -moz-border-radius-topright: 3px; + border-top-right-radius: 3px; + -webkit-border-bottom-right-radius: 3px; + -moz-border-radius-bottomright: 3px; + border-bottom-right-radius: 3px; } .pagination-centered { text-align: center; @@ -3847,9 +3847,9 @@ input[type="submit"].btn.btn-mini { text-align: center; text-decoration: none; background-color: #000000; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .tooltip-arrow { position: absolute; @@ -4038,9 +4038,9 @@ input[type="submit"].btn.btn-mini { padding: 4px; line-height: 18px; border: 1px solid #ddd; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); @@ -4236,9 +4236,9 @@ a.badge:focus { -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .progress .bar { width: 0%; @@ -4377,9 +4377,9 @@ a.badge:focus { .accordion-group { margin-bottom: 2px; border: 1px solid #e5e5e5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .accordion-heading { border-bottom: 0; @@ -5496,9 +5496,9 @@ a.badge:focus { .nav-collapse .btn { padding: 4px 10px 4px; font-weight: normal; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .nav-collapse .dropdown-menu li + li a { margin-bottom: 2px; @@ -7377,7 +7377,7 @@ body .navbar-fixed-top { #toolbar .btn { line-height: 24px; margin-right: 4px; - padding: 0 10px 0 0; + padding: 0 10px; } #toolbar .btn-success { width: 148px; @@ -7393,7 +7393,9 @@ body .navbar-fixed-top { background-color: transparent; border-right: 0; border-left: 0; - width: 10px; + width: 16px; + margin-left: 0; + margin-right: 0; } #toolbar #toolbar-options, #toolbar #toolbar-help { @@ -7406,12 +7408,15 @@ body .navbar-fixed-top { border-right: 1px solid #b3b3b3; height: auto; line-height: inherit; - margin: 0 6px 0 0; + margin: 0 6px 0 -10px; opacity: 1; text-shadow: none; width: 28px; z-index: -1; } +#toolbar iframe .btn-group .btn { + margin-left: -1px !important; +} html[dir=rtl] #toolbar #toolbar-options, html[dir=rtl] #toolbar #toolbar-help { float: left; @@ -8087,7 +8092,7 @@ input.input-large-text { [class^="chzn-color"].chzn-single .chzn-single-with-drop div, [class*=" chzn-color"].chzn-single .chzn-single-with-drop div { background-color: transparent; - border: none !important; + border: none; } .chzn-color.chzn-single[rel="value_1"], .chzn-color-reverse.chzn-single[rel="value_0"], @@ -8219,7 +8224,7 @@ input.input-large-text { } .chzn-color[rel="value_"] div { background-color: #f3f3f3; - border-left: 1px solid #b3b3b3; + border-left: 1px solid #cccccc; } /* Widen the drop downs for the Permissions Field */ #permissions-sliders .input-small { @@ -8258,9 +8263,9 @@ a.grid_true { background-color: #f0f0f0; border-bottom: 1px solid #dedede; border-right: 1px solid #dedede; - -webkit-border-radius: 0 0 4px 0; - -moz-border-radius: 0 0 4px 0; - border-radius: 0 0 4px 0; + -webkit-border-radius: 0 0 3px 0; + -moz-border-radius: 0 0 3px 0; + border-radius: 0 0 3px 0; } .j-sidebar-container.j-sidebar-hidden { left: -16.5%; @@ -9100,16 +9105,14 @@ input[type="url"] { display: none; } #toolbar .btn { - margin-right: 0px; - margin-left: 4px; - padding: 0 0 0 10px; + padding: 0 10px; } #toolbar [class^="icon-"], #toolbar [class*=" icon-"] { border-radius: 0 3px 3px 0; border-right: 0; border-left: 1px solid #b3b3b3; - margin: 0 0 0 6px; + margin: 0 -10px 0 6px; } .chzn-container-single .chzn-single { padding-left: 8px; @@ -9121,6 +9124,17 @@ input[type="url"] { .chzn-container-single .chzn-single abbr { left: 36px; } +.chzn-container-multi .chzn-choices .search-choice { + padding-left: 7px; +} +.chzn-container-multi .chzn-choices .search-choice .search-choice-close { + margin-left: 0; + margin-right: 3px; +} +.chzn-container .chzn-single.chzn-color[rel="value_0"] div, +.chzn-container .chzn-single.chzn-color[rel="value_1"] div { + border-right: none; +} .container-logo { padding-top: 0; float: left; diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css index 0dc5c0e10daab..43f3c3396a942 100644 --- a/administrator/templates/isis/css/template.css +++ b/administrator/templates/isis/css/template.css @@ -824,9 +824,9 @@ pre { background-color: #f5f5f5; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } pre.prettyprint { margin-bottom: 18px; @@ -1723,9 +1723,9 @@ table { border-collapse: separate; *border-collapse: collapse; border-left: 0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .table-bordered th, .table-bordered td { @@ -1745,34 +1745,34 @@ table { .table-bordered thead:first-child tr:first-child > th:first-child, .table-bordered tbody:first-child tr:first-child > td:first-child, .table-bordered tbody:first-child tr:first-child > th:first-child { - -webkit-border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - border-top-left-radius: 4px; + -webkit-border-top-left-radius: 3px; + -moz-border-radius-topleft: 3px; + border-top-left-radius: 3px; } .table-bordered thead:first-child tr:first-child > th:last-child, .table-bordered tbody:first-child tr:first-child > td:last-child, .table-bordered tbody:first-child tr:first-child > th:last-child { - -webkit-border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; - border-top-right-radius: 4px; + -webkit-border-top-right-radius: 3px; + -moz-border-radius-topright: 3px; + border-top-right-radius: 3px; } .table-bordered thead:last-child tr:last-child > th:first-child, .table-bordered tbody:last-child tr:last-child > td:first-child, .table-bordered tbody:last-child tr:last-child > th:first-child, .table-bordered tfoot:last-child tr:last-child > td:first-child, .table-bordered tfoot:last-child tr:last-child > th:first-child { - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-left-radius: 4px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-bottomleft: 3px; + border-bottom-left-radius: 3px; } .table-bordered thead:last-child tr:last-child > th:last-child, .table-bordered tbody:last-child tr:last-child > td:last-child, .table-bordered tbody:last-child tr:last-child > th:last-child, .table-bordered tfoot:last-child tr:last-child > td:last-child, .table-bordered tfoot:last-child tr:last-child > th:last-child { - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; + -webkit-border-bottom-right-radius: 3px; + -moz-border-radius-bottomright: 3px; + border-bottom-right-radius: 3px; } .table-bordered tfoot + tbody:last-child tr:last-child td:first-child { -webkit-border-bottom-left-radius: 0; @@ -1788,17 +1788,17 @@ table { .table-bordered caption + tbody tr:first-child td:first-child, .table-bordered colgroup + thead tr:first-child th:first-child, .table-bordered colgroup + tbody tr:first-child td:first-child { - -webkit-border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - border-top-left-radius: 4px; + -webkit-border-top-left-radius: 3px; + -moz-border-radius-topleft: 3px; + border-top-left-radius: 3px; } .table-bordered caption + thead tr:first-child th:last-child, .table-bordered caption + tbody tr:first-child td:last-child, .table-bordered colgroup + thead tr:first-child th:last-child, .table-bordered colgroup + tbody tr:first-child td:last-child { - -webkit-border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; - border-top-right-radius: 4px; + -webkit-border-top-right-radius: 3px; + -moz-border-radius-topright: 3px; + border-top-right-radius: 3px; } .table-striped tbody > tr:nth-child(odd) > td, .table-striped tbody > tr:nth-child(odd) > th { @@ -2115,9 +2115,9 @@ table th[class*="span"], .typeahead { z-index: 1051; margin-top: 2px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .well { min-height: 20px; @@ -2125,9 +2125,9 @@ table th[class*="span"], margin-bottom: 20px; background-color: #f0f0f0; border: 1px solid #f0f0f0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .well blockquote { border-color: #f0f0f0; @@ -2223,9 +2223,9 @@ button.close { background-color: #f3f3f3; color: #333; border: 1px solid #b3b3b3; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); } .btn:hover, @@ -2485,21 +2485,21 @@ input[type="submit"].btn.btn-mini { } .btn-group > .btn:first-child { margin-left: 0; - -webkit-border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - border-top-left-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-left-radius: 4px; + -webkit-border-top-left-radius: 3px; + -moz-border-radius-topleft: 3px; + border-top-left-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-bottomleft: 3px; + border-bottom-left-radius: 3px; } .btn-group > .btn:last-child, .btn-group > .dropdown-toggle { - -webkit-border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; + -webkit-border-top-right-radius: 3px; + -moz-border-radius-topright: 3px; + border-top-right-radius: 3px; + -webkit-border-bottom-right-radius: 3px; + -moz-border-radius-bottomright: 3px; + border-bottom-right-radius: 3px; } .btn-group > .btn.large:first-child { margin-left: 0; @@ -2625,14 +2625,14 @@ input[type="submit"].btn.btn-mini { margin-top: -1px; } .btn-group-vertical > .btn:first-child { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; + -webkit-border-radius: 3px 3px 0 0; + -moz-border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; } .btn-group-vertical > .btn:last-child { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; + -webkit-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 3px 3px; + border-radius: 0 0 3px 3px; } .btn-group-vertical > .btn-large:first-child { -webkit-border-radius: 6px 6px 0 0; @@ -2650,9 +2650,9 @@ input[type="submit"].btn.btn-mini { text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); background-color: #fcf8e3; border: 1px solid #faebcc; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .alert, .alert h4 { @@ -3069,9 +3069,9 @@ input[type="submit"].btn.btn-mini { background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); border: 1px solid #d4d4d4; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); @@ -3539,9 +3539,9 @@ input[type="submit"].btn.btn-mini { margin: 0 0 18px; list-style: none; background-color: #f5f5f5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .breadcrumb > li { display: inline-block; @@ -3567,9 +3567,9 @@ input[type="submit"].btn.btn-mini { *zoom: 1; margin-left: 0; margin-bottom: 0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); @@ -3609,21 +3609,21 @@ input[type="submit"].btn.btn-mini { .pagination ul > li:first-child > a, .pagination ul > li:first-child > span { border-left-width: 1px; - -webkit-border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - border-top-left-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-left-radius: 4px; + -webkit-border-top-left-radius: 3px; + -moz-border-radius-topleft: 3px; + border-top-left-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-bottomleft: 3px; + border-bottom-left-radius: 3px; } .pagination ul > li:last-child > a, .pagination ul > li:last-child > span { - -webkit-border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; + -webkit-border-top-right-radius: 3px; + -moz-border-radius-topright: 3px; + border-top-right-radius: 3px; + -webkit-border-bottom-right-radius: 3px; + -moz-border-radius-bottomright: 3px; + border-bottom-right-radius: 3px; } .pagination-centered { text-align: center; @@ -3847,9 +3847,9 @@ input[type="submit"].btn.btn-mini { text-align: center; text-decoration: none; background-color: #000000; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .tooltip-arrow { position: absolute; @@ -4038,9 +4038,9 @@ input[type="submit"].btn.btn-mini { padding: 4px; line-height: 18px; border: 1px solid #ddd; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); @@ -4236,9 +4236,9 @@ a.badge:focus { -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .progress .bar { width: 0%; @@ -4377,9 +4377,9 @@ a.badge:focus { .accordion-group { margin-bottom: 2px; border: 1px solid #e5e5e5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .accordion-heading { border-bottom: 0; @@ -5496,9 +5496,9 @@ a.badge:focus { .nav-collapse .btn { padding: 4px 10px 4px; font-weight: normal; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } .nav-collapse .dropdown-menu li + li a { margin-bottom: 2px; @@ -7377,7 +7377,7 @@ body .navbar-fixed-top { #toolbar .btn { line-height: 24px; margin-right: 4px; - padding: 0 10px 0 0; + padding: 0 10px; } #toolbar .btn-success { width: 148px; @@ -7393,7 +7393,9 @@ body .navbar-fixed-top { background-color: transparent; border-right: 0; border-left: 0; - width: 10px; + width: 16px; + margin-left: 0; + margin-right: 0; } #toolbar #toolbar-options, #toolbar #toolbar-help { @@ -7406,12 +7408,15 @@ body .navbar-fixed-top { border-right: 1px solid #b3b3b3; height: auto; line-height: inherit; - margin: 0 6px 0 0; + margin: 0 6px 0 -10px; opacity: 1; text-shadow: none; width: 28px; z-index: -1; } +#toolbar iframe .btn-group .btn { + margin-left: -1px !important; +} html[dir=rtl] #toolbar #toolbar-options, html[dir=rtl] #toolbar #toolbar-help { float: left; @@ -8087,7 +8092,7 @@ input.input-large-text { [class^="chzn-color"].chzn-single .chzn-single-with-drop div, [class*=" chzn-color"].chzn-single .chzn-single-with-drop div { background-color: transparent; - border: none !important; + border: none; } .chzn-color.chzn-single[rel="value_1"], .chzn-color-reverse.chzn-single[rel="value_0"], @@ -8219,7 +8224,7 @@ input.input-large-text { } .chzn-color[rel="value_"] div { background-color: #f3f3f3; - border-left: 1px solid #b3b3b3; + border-left: 1px solid #cccccc; } /* Widen the drop downs for the Permissions Field */ #permissions-sliders .input-small { @@ -8258,9 +8263,9 @@ a.grid_true { background-color: #f0f0f0; border-bottom: 1px solid #dedede; border-right: 1px solid #dedede; - -webkit-border-radius: 0 0 4px 0; - -moz-border-radius: 0 0 4px 0; - border-radius: 0 0 4px 0; + -webkit-border-radius: 0 0 3px 0; + -moz-border-radius: 0 0 3px 0; + border-radius: 0 0 3px 0; } .j-sidebar-container.j-sidebar-hidden { left: -16.5%; diff --git a/administrator/templates/isis/less/template-rtl.less b/administrator/templates/isis/less/template-rtl.less index 73d7f8209f6a4..20b18fe91119f 100644 --- a/administrator/templates/isis/less/template-rtl.less +++ b/administrator/templates/isis/less/template-rtl.less @@ -48,15 +48,13 @@ #toolbar { .btn { - margin-right: 0px; - margin-left: 4px; - padding: 0 0 0 10px; + padding: 0 10px; } [class^="icon-"], [class*=" icon-"] { border-radius: 0 3px 3px 0; border-right: 0; border-left: 1px solid #b3b3b3; - margin: 0 0 0 6px; + margin: 0 -10px 0 6px; } } .chzn-container-single .chzn-single { @@ -69,6 +67,17 @@ left: 36px; } } +.chzn-container-multi .chzn-choices .search-choice { + padding-left: 7px; + .search-choice-close { + margin-left: 0; + margin-right: 3px; + } +} +.chzn-container .chzn-single.chzn-color[rel="value_0"] div, +.chzn-container .chzn-single.chzn-color[rel="value_1"] div { + border-right: none; +} .container-logo { padding-top: 0; diff --git a/administrator/templates/isis/less/template.less b/administrator/templates/isis/less/template.less index 8e3033651010e..f8ce4d7f89717 100644 --- a/administrator/templates/isis/less/template.less +++ b/administrator/templates/isis/less/template.less @@ -443,7 +443,7 @@ body .navbar-fixed-top { .btn { line-height: 24px; margin-right: 4px; - padding: 0 10px 0 0; + padding: 0 10px; } .btn-success { width: 148px; @@ -457,7 +457,9 @@ body .navbar-fixed-top { background-color: transparent; border-right: 0; border-left: 0; - width: 10px; + width: 16px; + margin-left: 0; + margin-right: 0; } } #toolbar-options, #toolbar-help { @@ -469,12 +471,15 @@ body .navbar-fixed-top { border-right: 1px solid @btnBorder; height: auto; line-height: inherit; - margin: 0 6px 0 0; + margin: 0 6px 0 -10px; opacity: 1; text-shadow: none; width: 28px; z-index: -1; } + iframe .btn-group .btn { + margin-left: -1px !important; + } } html[dir=rtl] #toolbar #toolbar-options, html[dir=rtl] #toolbar #toolbar-help { @@ -1233,7 +1238,7 @@ input.input-large-text { .box-shadow(none); div { background-color: transparent; - border: none !important; + border: none; } } @@ -1266,7 +1271,7 @@ input.input-large-text { .chzn-color[rel="value_"] { div { background-color: #f3f3f3; - border-left: 1px solid @btnBorder; + border-left: 1px solid #cccccc; } } /* Widen the drop downs for the Permissions Field */ diff --git a/administrator/templates/isis/less/variables.less b/administrator/templates/isis/less/variables.less index 9b761352aaa3e..6706d11f3686d 100644 --- a/administrator/templates/isis/less/variables.less +++ b/administrator/templates/isis/less/variables.less @@ -75,7 +75,7 @@ @paddingSmall: 2px 10px; // 26px @paddingMini: 0 6px; // 22px -@baseBorderRadius: 4px; +@baseBorderRadius: 3px; @borderRadiusLarge: 6px; @borderRadiusSmall: 3px;