diff --git a/admin-dev/themes/default/css/admin.scss b/admin-dev/themes/default/css/admin.scss index 102537792..d1ca052ff 100644 --- a/admin-dev/themes/default/css/admin.scss +++ b/admin-dev/themes/default/css/admin.scss @@ -588,5 +588,5 @@ /************** SCENE *****************/ - #large_scene_image{clear:both;border:1px solid transparent;} + #large_scene_image{clear:both;border:1px solid transparent;} } \ No newline at end of file diff --git a/admin-dev/themes/default/css/ps-admin-bootstrap-responsive.css b/admin-dev/themes/default/css/ps-admin-bootstrap-responsive.css new file mode 100644 index 000000000..e6d64e618 --- /dev/null +++ b/admin-dev/themes/default/css/ps-admin-bootstrap-responsive.css @@ -0,0 +1,981 @@ +/* + * Bootstrap Responsive v2.3.2 + * + * Copyright 2012 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + */ +@-ms-viewport { + width: device-width; } + +.hidden { + display: none; + visibility: hidden; } + +.visible-phone { + display: none !important; } + +.visible-tablet { + display: none !important; } + +.hidden-desktop { + display: none !important; } + +.visible-desktop { + display: inherit !important; } + +@media (min-width: 768px) and (max-width: 979px) { + .hidden-desktop { + display: inherit !important; } + + .visible-desktop { + display: none !important; } + + .visible-tablet { + display: inherit !important; } + + .hidden-tablet { + display: none !important; } } +@media (max-width: 767px) { + .hidden-desktop { + display: inherit !important; } + + .visible-desktop { + display: none !important; } + + .visible-phone { + display: inherit !important; } + + .hidden-phone { + display: none !important; } } +.visible-print { + display: none !important; } + +@media print { + .visible-print { + display: inherit !important; } + + .hidden-print { + display: none !important; } } +.clearfix { + *zoom: 1; } + .clearfix:before, .clearfix:after { + display: table; + content: ""; + line-height: 0; } + .clearfix:after { + clear: both; } + +.hide-text { + font: 0/0 a; + color: transparent; + text-shadow: none; + background-color: transparent; + border: 0; } + +.input-block-level { + display: block; + width: 100%; + min-height: 30px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } + +@media (min-width: 1200px) { + .row { + margin-left: -30px; + *zoom: 1; } + .row:before, .row:after { + display: table; + content: ""; + line-height: 0; } + .row:after { + clear: both; } + + [class*="span"] { + float: left; + min-height: 1px; + margin-left: 30px; } + + .container, + .navbar-static-top .container, + .navbar-fixed-top .container, + .navbar-fixed-bottom .container { + width: 1170px; } + + .span1 { + width: 70px; } + + .span2 { + width: 170px; } + + .span3 { + width: 270px; } + + .span4 { + width: 370px; } + + .span5 { + width: 470px; } + + .span6 { + width: 570px; } + + .span7 { + width: 670px; } + + .span8 { + width: 770px; } + + .span9 { + width: 870px; } + + .span10 { + width: 970px; } + + .span11 { + width: 1070px; } + + .span12 { + width: 1170px; } + + .offset1 { + margin-left: 130px; } + + .offset2 { + margin-left: 230px; } + + .offset3 { + margin-left: 330px; } + + .offset4 { + margin-left: 430px; } + + .offset5 { + margin-left: 530px; } + + .offset6 { + margin-left: 630px; } + + .offset7 { + margin-left: 730px; } + + .offset8 { + margin-left: 830px; } + + .offset9 { + margin-left: 930px; } + + .offset10 { + margin-left: 1030px; } + + .offset11 { + margin-left: 1130px; } + + .offset12 { + margin-left: 1230px; } + + .row-fluid { + width: 100%; + *zoom: 1; } + .row-fluid:before, .row-fluid:after { + display: table; + content: ""; + line-height: 0; } + .row-fluid:after { + clear: both; } + .row-fluid [class*="span"] { + display: block; + width: 100%; + min-height: 30px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + float: left; + margin-left: 2.5641%; + *margin-left: 2.51091%; } + .row-fluid [class*="span"]:first-child { + margin-left: 0; } + .row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.5641%; } + .row-fluid .span1 { + width: 5.98291%; + *width: 5.92971%; } + .row-fluid .span2 { + width: 14.52991%; + *width: 14.47672%; } + .row-fluid .span3 { + width: 23.07692%; + *width: 23.02373%; } + .row-fluid .span4 { + width: 31.62393%; + *width: 31.57074%; } + .row-fluid .span5 { + width: 40.17094%; + *width: 40.11775%; } + .row-fluid .span6 { + width: 48.71795%; + *width: 48.66476%; } + .row-fluid .span7 { + width: 57.26496%; + *width: 57.21177%; } + .row-fluid .span8 { + width: 65.81197%; + *width: 65.75877%; } + .row-fluid .span9 { + width: 74.35897%; + *width: 74.30578%; } + .row-fluid .span10 { + width: 82.90598%; + *width: 82.85279%; } + .row-fluid .span11 { + width: 91.45299%; + *width: 91.3998%; } + .row-fluid .span12 { + width: 100%; + *width: 99.94681%; } + .row-fluid .offset1 { + margin-left: 11.11111%; + *margin-left: 11.00473%; } + .row-fluid .offset1:first-child { + margin-left: 8.54701%; + *margin-left: 8.44063%; } + .row-fluid .offset2 { + margin-left: 19.65812%; + *margin-left: 19.55174%; } + .row-fluid .offset2:first-child { + margin-left: 17.09402%; + *margin-left: 16.98763%; } + .row-fluid .offset3 { + margin-left: 28.20513%; + *margin-left: 28.09875%; } + .row-fluid .offset3:first-child { + margin-left: 25.64103%; + *margin-left: 25.53464%; } + .row-fluid .offset4 { + margin-left: 36.75214%; + *margin-left: 36.64575%; } + .row-fluid .offset4:first-child { + margin-left: 34.18803%; + *margin-left: 34.08165%; } + .row-fluid .offset5 { + margin-left: 45.29915%; + *margin-left: 45.19276%; } + .row-fluid .offset5:first-child { + margin-left: 42.73504%; + *margin-left: 42.62866%; } + .row-fluid .offset6 { + margin-left: 53.84615%; + *margin-left: 53.73977%; } + .row-fluid .offset6:first-child { + margin-left: 51.28205%; + *margin-left: 51.17567%; } + .row-fluid .offset7 { + margin-left: 62.39316%; + *margin-left: 62.28678%; } + .row-fluid .offset7:first-child { + margin-left: 59.82906%; + *margin-left: 59.72268%; } + .row-fluid .offset8 { + margin-left: 70.94017%; + *margin-left: 70.83379%; } + .row-fluid .offset8:first-child { + margin-left: 68.37607%; + *margin-left: 68.26969%; } + .row-fluid .offset9 { + margin-left: 79.48718%; + *margin-left: 79.3808%; } + .row-fluid .offset9:first-child { + margin-left: 76.92308%; + *margin-left: 76.81669%; } + .row-fluid .offset10 { + margin-left: 88.03419%; + *margin-left: 87.92781%; } + .row-fluid .offset10:first-child { + margin-left: 85.47009%; + *margin-left: 85.3637%; } + .row-fluid .offset11 { + margin-left: 96.5812%; + *margin-left: 96.47481%; } + .row-fluid .offset11:first-child { + margin-left: 94.01709%; + *margin-left: 93.91071%; } + .row-fluid .offset12 { + margin-left: 105.12821%; + *margin-left: 105.02182%; } + .row-fluid .offset12:first-child { + margin-left: 102.5641%; + *margin-left: 102.45772%; } + + input, + textarea, + .uneditable-input { + margin-left: 0; } + + .controls-row [class*="span"] + [class*="span"] { + margin-left: 30px; } + + input.span1, + textarea.span1, + .uneditable-input.span1 { + width: 56px; } + + input.span2, + textarea.span2, + .uneditable-input.span2 { + width: 156px; } + + input.span3, + textarea.span3, + .uneditable-input.span3 { + width: 256px; } + + input.span4, + textarea.span4, + .uneditable-input.span4 { + width: 356px; } + + input.span5, + textarea.span5, + .uneditable-input.span5 { + width: 456px; } + + input.span6, + textarea.span6, + .uneditable-input.span6 { + width: 556px; } + + input.span7, + textarea.span7, + .uneditable-input.span7 { + width: 656px; } + + input.span8, + textarea.span8, + .uneditable-input.span8 { + width: 756px; } + + input.span9, + textarea.span9, + .uneditable-input.span9 { + width: 856px; } + + input.span10, + textarea.span10, + .uneditable-input.span10 { + width: 956px; } + + input.span11, + textarea.span11, + .uneditable-input.span11 { + width: 1056px; } + + input.span12, + textarea.span12, + .uneditable-input.span12 { + width: 1156px; } + + .thumbnails { + margin-left: -30px; } + + .thumbnails > li { + margin-left: 30px; } + + .row-fluid .thumbnails { + margin-left: 0; } } +@media (min-width: 768px) and (max-width: 979px) { + .row { + margin-left: -20px; + *zoom: 1; } + .row:before, .row:after { + display: table; + content: ""; + line-height: 0; } + .row:after { + clear: both; } + + [class*="span"] { + float: left; + min-height: 1px; + margin-left: 20px; } + + .container, + .navbar-static-top .container, + .navbar-fixed-top .container, + .navbar-fixed-bottom .container { + width: 724px; } + + .span1 { + width: 42px; } + + .span2 { + width: 104px; } + + .span3 { + width: 166px; } + + .span4 { + width: 228px; } + + .span5 { + width: 290px; } + + .span6 { + width: 352px; } + + .span7 { + width: 414px; } + + .span8 { + width: 476px; } + + .span9 { + width: 538px; } + + .span10 { + width: 600px; } + + .span11 { + width: 662px; } + + .span12 { + width: 724px; } + + .offset1 { + margin-left: 82px; } + + .offset2 { + margin-left: 144px; } + + .offset3 { + margin-left: 206px; } + + .offset4 { + margin-left: 268px; } + + .offset5 { + margin-left: 330px; } + + .offset6 { + margin-left: 392px; } + + .offset7 { + margin-left: 454px; } + + .offset8 { + margin-left: 516px; } + + .offset9 { + margin-left: 578px; } + + .offset10 { + margin-left: 640px; } + + .offset11 { + margin-left: 702px; } + + .offset12 { + margin-left: 764px; } + + .row-fluid { + width: 100%; + *zoom: 1; } + .row-fluid:before, .row-fluid:after { + display: table; + content: ""; + line-height: 0; } + .row-fluid:after { + clear: both; } + .row-fluid [class*="span"] { + display: block; + width: 100%; + min-height: 30px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + float: left; + margin-left: 2.76243%; + *margin-left: 2.70924%; } + .row-fluid [class*="span"]:first-child { + margin-left: 0; } + .row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.76243%; } + .row-fluid .span1 { + width: 5.8011%; + *width: 5.74791%; } + .row-fluid .span2 { + width: 14.36464%; + *width: 14.31145%; } + .row-fluid .span3 { + width: 22.92818%; + *width: 22.87499%; } + .row-fluid .span4 { + width: 31.49171%; + *width: 31.43852%; } + .row-fluid .span5 { + width: 40.05525%; + *width: 40.00206%; } + .row-fluid .span6 { + width: 48.61878%; + *width: 48.56559%; } + .row-fluid .span7 { + width: 57.18232%; + *width: 57.12913%; } + .row-fluid .span8 { + width: 65.74586%; + *width: 65.69266%; } + .row-fluid .span9 { + width: 74.30939%; + *width: 74.2562%; } + .row-fluid .span10 { + width: 82.87293%; + *width: 82.81974%; } + .row-fluid .span11 { + width: 91.43646%; + *width: 91.38327%; } + .row-fluid .span12 { + width: 100%; + *width: 99.94681%; } + .row-fluid .offset1 { + margin-left: 11.32597%; + *margin-left: 11.21958%; } + .row-fluid .offset1:first-child { + margin-left: 8.56354%; + *margin-left: 8.45715%; } + .row-fluid .offset2 { + margin-left: 19.8895%; + *margin-left: 19.78312%; } + .row-fluid .offset2:first-child { + margin-left: 17.12707%; + *margin-left: 17.02069%; } + .row-fluid .offset3 { + margin-left: 28.45304%; + *margin-left: 28.34666%; } + .row-fluid .offset3:first-child { + margin-left: 25.69061%; + *margin-left: 25.58422%; } + .row-fluid .offset4 { + margin-left: 37.01657%; + *margin-left: 36.91019%; } + .row-fluid .offset4:first-child { + margin-left: 34.25414%; + *margin-left: 34.14776%; } + .row-fluid .offset5 { + margin-left: 45.58011%; + *margin-left: 45.47373%; } + .row-fluid .offset5:first-child { + margin-left: 42.81768%; + *margin-left: 42.7113%; } + .row-fluid .offset6 { + margin-left: 54.14365%; + *margin-left: 54.03726%; } + .row-fluid .offset6:first-child { + margin-left: 51.38122%; + *margin-left: 51.27483%; } + .row-fluid .offset7 { + margin-left: 62.70718%; + *margin-left: 62.6008%; } + .row-fluid .offset7:first-child { + margin-left: 59.94475%; + *margin-left: 59.83837%; } + .row-fluid .offset8 { + margin-left: 71.27072%; + *margin-left: 71.16434%; } + .row-fluid .offset8:first-child { + margin-left: 68.50829%; + *margin-left: 68.4019%; } + .row-fluid .offset9 { + margin-left: 79.83425%; + *margin-left: 79.72787%; } + .row-fluid .offset9:first-child { + margin-left: 77.07182%; + *margin-left: 76.96544%; } + .row-fluid .offset10 { + margin-left: 88.39779%; + *margin-left: 88.29141%; } + .row-fluid .offset10:first-child { + margin-left: 85.63536%; + *margin-left: 85.52898%; } + .row-fluid .offset11 { + margin-left: 96.96133%; + *margin-left: 96.85494%; } + .row-fluid .offset11:first-child { + margin-left: 94.1989%; + *margin-left: 94.09251%; } + .row-fluid .offset12 { + margin-left: 105.52486%; + *margin-left: 105.41848%; } + .row-fluid .offset12:first-child { + margin-left: 102.76243%; + *margin-left: 102.65605%; } + + input, + textarea, + .uneditable-input { + margin-left: 0; } + + .controls-row [class*="span"] + [class*="span"] { + margin-left: 20px; } + + input.span1, + textarea.span1, + .uneditable-input.span1 { + width: 28px; } + + input.span2, + textarea.span2, + .uneditable-input.span2 { + width: 90px; } + + input.span3, + textarea.span3, + .uneditable-input.span3 { + width: 152px; } + + input.span4, + textarea.span4, + .uneditable-input.span4 { + width: 214px; } + + input.span5, + textarea.span5, + .uneditable-input.span5 { + width: 276px; } + + input.span6, + textarea.span6, + .uneditable-input.span6 { + width: 338px; } + + input.span7, + textarea.span7, + .uneditable-input.span7 { + width: 400px; } + + input.span8, + textarea.span8, + .uneditable-input.span8 { + width: 462px; } + + input.span9, + textarea.span9, + .uneditable-input.span9 { + width: 524px; } + + input.span10, + textarea.span10, + .uneditable-input.span10 { + width: 586px; } + + input.span11, + textarea.span11, + .uneditable-input.span11 { + width: 648px; } + + input.span12, + textarea.span12, + .uneditable-input.span12 { + width: 710px; } } +@media (max-width: 767px) { + body { + padding-left: 20px; + padding-right: 20px; } + + .navbar-fixed-top, + .navbar-fixed-bottom, + .navbar-static-top { + margin-left: -20px; + margin-right: -20px; } + + .container-fluid { + padding: 0; } + + .dl-horizontal dt { + float: none; + clear: none; + width: auto; + text-align: left; } + .dl-horizontal dd { + margin-left: 0; } + + .container { + width: auto; } + + .row-fluid { + width: 100%; } + + .row, + .thumbnails { + margin-left: 0; } + + .thumbnails > li { + float: none; + margin-left: 0; } + + [class*="span"], + .uneditable-input[class*="span"], + .row-fluid [class*="span"] { + float: none; + display: block; + width: 100%; + margin-left: 0; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } + + .span12, + .row-fluid .span12 { + width: 100%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } + + .row-fluid [class*="offset"]:first-child { + margin-left: 0; } + + .input-large, + .input-xlarge, + .input-xxlarge, + input[class*="span"], + select[class*="span"], + textarea[class*="span"], + .uneditable-input { + display: block; + width: 100%; + min-height: 30px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } + + .input-prepend input, + .input-append input, + .input-prepend input[class*="span"], + .input-append input[class*="span"] { + display: inline-block; + width: auto; } + + .controls-row [class*="span"] + [class*="span"] { + margin-left: 0; } + + .modal { + position: fixed; + top: 20px; + left: 20px; + right: 20px; + width: auto; + margin: 0; } + .modal.fade { + top: -100px; } + .modal.fade.in { + top: 20px; } } +@media (max-width: 480px) { + .nav-collapse { + -webkit-transform: translate3d(0, 0, 0); } + + .page-header h1 small { + display: block; + line-height: 20px; } + + input[type="checkbox"], + input[type="radio"] { + border: 1px solid #ccc; } + + .form-horizontal .control-label { + float: none; + width: auto; + padding-top: 0; + text-align: left; } + .form-horizontal .controls { + margin-left: 0; } + .form-horizontal .control-list { + padding-top: 0; } + .form-horizontal .form-actions { + padding-left: 10px; + padding-right: 10px; } + + .media .pull-left, + .media .pull-right { + float: none; + display: block; + margin-bottom: 10px; } + + .media-object { + margin-right: 0; + margin-left: 0; } + + .modal { + top: 10px; + left: 10px; + right: 10px; } + + .modal-header .close { + padding: 10px; + margin: -10px; } + + .carousel-caption { + position: static; } } +@media (max-width: 979px) { + body { + padding-top: 0; } + + .navbar-fixed-top, + .navbar-fixed-bottom { + position: static; } + + .navbar-fixed-top { + margin-bottom: 20px; } + + .navbar-fixed-bottom { + margin-top: 20px; } + + .navbar-fixed-top .navbar-inner, + .navbar-fixed-bottom .navbar-inner { + padding: 5px; } + + .navbar .container { + width: auto; + padding: 0; } + + .navbar .brand { + padding-left: 10px; + padding-right: 10px; + margin: 0 0 0 -5px; } + + .nav-collapse { + clear: both; } + + .nav-collapse .nav { + float: none; + margin: 0 0 10px; } + + .nav-collapse .nav > li { + float: none; } + + .nav-collapse .nav > li > a { + margin-bottom: 2px; } + + .nav-collapse .nav > .divider-vertical { + display: none; } + + .nav-collapse .nav .nav-header { + color: #777777; + text-shadow: none; } + + .nav-collapse .nav > li > a, + .nav-collapse .dropdown-menu a { + padding: 9px 15px; + font-weight: bold; + color: #777777; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; } + + .nav-collapse .btn { + padding: 4px 10px 4px; + font-weight: normal; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } + + .nav-collapse .dropdown-menu li + li a { + margin-bottom: 2px; } + + .nav-collapse .nav > li > a:hover, + .nav-collapse .nav > li > a:focus, + .nav-collapse .dropdown-menu a:hover, + .nav-collapse .dropdown-menu a:focus { + background-color: #f2f2f2; } + + .navbar-inverse .nav-collapse .nav > li > a, + .navbar-inverse .nav-collapse .dropdown-menu a { + color: #999999; } + + .navbar-inverse .nav-collapse .nav > li > a:hover, + .navbar-inverse .nav-collapse .nav > li > a:focus, + .navbar-inverse .nav-collapse .dropdown-menu a:hover, + .navbar-inverse .nav-collapse .dropdown-menu a:focus { + background-color: #111111; } + + .nav-collapse.in .btn-group { + margin-top: 5px; + padding: 0; } + + .nav-collapse .dropdown-menu { + position: static; + top: auto; + left: auto; + float: none; + display: none; + max-width: none; + margin: 0 15px; + padding: 0; + background-color: transparent; + border: none; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } + + .nav-collapse .open > .dropdown-menu { + display: block; } + + .nav-collapse .dropdown-menu:before, + .nav-collapse .dropdown-menu:after { + display: none; } + + .nav-collapse .dropdown-menu .divider { + display: none; } + + .nav-collapse .nav > li > .dropdown-menu:before, .nav-collapse .nav > li > .dropdown-menu:after { + display: none; } + + .nav-collapse .navbar-form, + .nav-collapse .navbar-search { + float: none; + padding: 10px 15px; + margin: 10px 0; + border-top: 1px solid #f2f2f2; + border-bottom: 1px solid #f2f2f2; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); } + + .navbar-inverse .nav-collapse .navbar-form, + .navbar-inverse .nav-collapse .navbar-search { + border-top-color: #111111; + border-bottom-color: #111111; } + + .navbar .nav-collapse .nav.pull-right { + float: none; + margin-left: 0; } + + .nav-collapse, + .nav-collapse.collapse { + overflow: hidden; + height: 0; } + + .navbar .btn-navbar { + display: block; } + + .navbar-static .navbar-inner { + padding-left: 10px; + padding-right: 10px; } } +@media (min-width: 980px) { + .nav-collapse.collapse { + height: auto !important; + overflow: visible !important; } } +@media (max-width: 1300px) { + body.fixed-top { + top: 0; } + + #content { + background-color: white; + width: 100%; + margin-left: 0; } + + .page-sidebar { + display: none; } } diff --git a/admin-dev/themes/default/css/ps-admin-bootstrap.css b/admin-dev/themes/default/css/ps-admin-bootstrap.css index 20860e2e1..0e6c2bef0 100644 --- a/admin-dev/themes/default/css/ps-admin-bootstrap.css +++ b/admin-dev/themes/default/css/ps-admin-bootstrap.css @@ -1326,9 +1326,11 @@ select:focus:invalid { border: 1px solid #ccc; } .input-append .add-on, .input-append .btn, + .input-append .toolbar_btn, .input-append .btn-group > .dropdown-toggle, .input-prepend .add-on, .input-prepend .btn, + .input-prepend .toolbar_btn, .input-prepend .btn-group > .dropdown-toggle { vertical-align: top; -webkit-border-radius: 0; @@ -1340,10 +1342,12 @@ select:focus:invalid { border-color: #46a546; } .input-prepend .add-on, -.input-prepend .btn { +.input-prepend .btn, +.input-prepend .toolbar_btn { margin-right: -1px; } .input-prepend .add-on:first-child, -.input-prepend .btn:first-child { +.input-prepend .btn:first-child, +.input-prepend .toolbar_btn:first-child { -webkit-border-radius: 4px 0 0 4px; -moz-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; } @@ -1354,18 +1358,22 @@ select:focus:invalid { -webkit-border-radius: 4px 0 0 4px; -moz-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; } - .input-append input + .btn-group .btn:last-child, + .input-append input + .btn-group .btn:last-child, .input-append input + .btn-group .toolbar_btn:last-child, .input-append select + .btn-group .btn:last-child, - .input-append .uneditable-input + .btn-group .btn:last-child { + .input-append select + .btn-group .toolbar_btn:last-child, + .input-append .uneditable-input + .btn-group .btn:last-child, + .input-append .uneditable-input + .btn-group .toolbar_btn:last-child { -webkit-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; } .input-append .add-on, .input-append .btn, +.input-append .toolbar_btn, .input-append .btn-group { margin-left: -1px; } .input-append .add-on:last-child, .input-append .btn:last-child, +.input-append .toolbar_btn:last-child, .input-append .btn-group:last-child > .dropdown-toggle { -webkit-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; @@ -1377,20 +1385,24 @@ select:focus:invalid { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } - .input-prepend.input-append input + .btn-group .btn, + .input-prepend.input-append input + .btn-group .btn, .input-prepend.input-append input + .btn-group .toolbar_btn, .input-prepend.input-append select + .btn-group .btn, - .input-prepend.input-append .uneditable-input + .btn-group .btn { + .input-prepend.input-append select + .btn-group .toolbar_btn, + .input-prepend.input-append .uneditable-input + .btn-group .btn, + .input-prepend.input-append .uneditable-input + .btn-group .toolbar_btn { -webkit-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; } .input-prepend.input-append .add-on:first-child, -.input-prepend.input-append .btn:first-child { +.input-prepend.input-append .btn:first-child, +.input-prepend.input-append .toolbar_btn:first-child { margin-right: -1px; -webkit-border-radius: 4px 0 0 4px; -moz-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; } .input-prepend.input-append .add-on:last-child, -.input-prepend.input-append .btn:last-child { +.input-prepend.input-append .btn:last-child, +.input-prepend.input-append .toolbar_btn:last-child { margin-left: -1px; -webkit-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; @@ -1421,7 +1433,7 @@ input.search-query { -moz-border-radius: 14px 0 0 14px; border-radius: 14px 0 0 14px; } -.form-search .input-append .btn { +.form-search .input-append .btn, .form-search .input-append .toolbar_btn { -webkit-border-radius: 0 14px 14px 0; -moz-border-radius: 0 14px 14px 0; border-radius: 0 14px 14px 0; } @@ -1431,7 +1443,7 @@ input.search-query { -moz-border-radius: 0 14px 14px 0; border-radius: 0 14px 14px 0; } -.form-search .input-prepend .btn { +.form-search .input-prepend .btn, .form-search .input-prepend .toolbar_btn { -webkit-border-radius: 14px 0 0 14px; -moz-border-radius: 14px 0 0 14px; border-radius: 14px 0 0 14px; } @@ -1921,12 +1933,14 @@ a [class*=" icon-"] { background-image: none; } /* keeps Bootstrap styles with and without icons the same */ -.btn [class^="icon-"].icon-large, -.btn [class*=" icon-"].icon-large, .nav [class^="icon-"].icon-large, +.btn [class^="icon-"].icon-large, .toolbar_btn [class^="icon-"].icon-large, +.btn [class*=" icon-"].icon-large, +.toolbar_btn [class*=" icon-"].icon-large, .nav [class^="icon-"].icon-large, .nav [class*=" icon-"].icon-large { line-height: .9em; } -.btn [class^="icon-"].icon-spin, -.btn [class*=" icon-"].icon-spin, .nav [class^="icon-"].icon-spin, +.btn [class^="icon-"].icon-spin, .toolbar_btn [class^="icon-"].icon-spin, +.btn [class*=" icon-"].icon-spin, +.toolbar_btn [class*=" icon-"].icon-spin, .nav [class^="icon-"].icon-spin, .nav [class*=" icon-"].icon-spin { display: inline-block; } @@ -1937,31 +1951,41 @@ a [class*=" icon-"] { .nav-pills [class*=" icon-"].icon-large { line-height: .9em; } -.btn [class^="icon-"].pull-left.icon-2x, .btn [class^="icon-"].pull-right.icon-2x, +.btn [class^="icon-"].pull-left.icon-2x, .toolbar_btn [class^="icon-"].pull-left.icon-2x, .btn [class^="icon-"].pull-right.icon-2x, .toolbar_btn [class^="icon-"].pull-right.icon-2x, .btn [class*=" icon-"].pull-left.icon-2x, -.btn [class*=" icon-"].pull-right.icon-2x { +.toolbar_btn [class*=" icon-"].pull-left.icon-2x, +.btn [class*=" icon-"].pull-right.icon-2x, +.toolbar_btn [class*=" icon-"].pull-right.icon-2x { margin-top: .18em; } -.btn [class^="icon-"].icon-spin.icon-large, -.btn [class*=" icon-"].icon-spin.icon-large { +.btn [class^="icon-"].icon-spin.icon-large, .toolbar_btn [class^="icon-"].icon-spin.icon-large, +.btn [class*=" icon-"].icon-spin.icon-large, +.toolbar_btn [class*=" icon-"].icon-spin.icon-large { line-height: .8em; } -.btn.btn-small [class^="icon-"].pull-left.icon-2x, .btn.btn-small [class^="icon-"].pull-right.icon-2x, +.btn.btn-small [class^="icon-"].pull-left.icon-2x, .btn-small.toolbar_btn [class^="icon-"].pull-left.icon-2x, .btn.btn-small [class^="icon-"].pull-right.icon-2x, .btn-small.toolbar_btn [class^="icon-"].pull-right.icon-2x, .btn.btn-small [class*=" icon-"].pull-left.icon-2x, -.btn.btn-small [class*=" icon-"].pull-right.icon-2x { +.btn-small.toolbar_btn [class*=" icon-"].pull-left.icon-2x, +.btn.btn-small [class*=" icon-"].pull-right.icon-2x, +.btn-small.toolbar_btn [class*=" icon-"].pull-right.icon-2x { margin-top: .25em; } -.btn.btn-large [class^="icon-"], -.btn.btn-large [class*=" icon-"] { +.btn.btn-large [class^="icon-"], .btn-large.toolbar_btn [class^="icon-"], +.btn.btn-large [class*=" icon-"], +.btn-large.toolbar_btn [class*=" icon-"] { margin-top: 0; } - .btn.btn-large [class^="icon-"].pull-left.icon-2x, .btn.btn-large [class^="icon-"].pull-right.icon-2x, + .btn.btn-large [class^="icon-"].pull-left.icon-2x, .btn-large.toolbar_btn [class^="icon-"].pull-left.icon-2x, .btn.btn-large [class^="icon-"].pull-right.icon-2x, .btn-large.toolbar_btn [class^="icon-"].pull-right.icon-2x, .btn.btn-large [class*=" icon-"].pull-left.icon-2x, - .btn.btn-large [class*=" icon-"].pull-right.icon-2x { + .btn-large.toolbar_btn [class*=" icon-"].pull-left.icon-2x, + .btn.btn-large [class*=" icon-"].pull-right.icon-2x, + .btn-large.toolbar_btn [class*=" icon-"].pull-right.icon-2x { margin-top: .05em; } - .btn.btn-large [class^="icon-"].pull-left.icon-2x, - .btn.btn-large [class*=" icon-"].pull-left.icon-2x { + .btn.btn-large [class^="icon-"].pull-left.icon-2x, .btn-large.toolbar_btn [class^="icon-"].pull-left.icon-2x, + .btn.btn-large [class*=" icon-"].pull-left.icon-2x, + .btn-large.toolbar_btn [class*=" icon-"].pull-left.icon-2x { margin-right: .2em; } - .btn.btn-large [class^="icon-"].pull-right.icon-2x, - .btn.btn-large [class*=" icon-"].pull-right.icon-2x { + .btn.btn-large [class^="icon-"].pull-right.icon-2x, .btn-large.toolbar_btn [class^="icon-"].pull-right.icon-2x, + .btn.btn-large [class*=" icon-"].pull-right.icon-2x, + .btn-large.toolbar_btn [class*=" icon-"].pull-right.icon-2x { margin-left: .2em; } /* Fixes alignment in nav lists */ @@ -2165,7 +2189,7 @@ a .icon-rotate-90:before, a .icon-rotate-180:before, a .icon-rotate-270:before, .icon-download-alt:before { content: "\f019"; } -.icon-download:before { +.icon-download:before, .process-icon-save-date:before, .process-icon-save-status:before { content: "\f01a"; } .icon-upload:before { @@ -2283,7 +2307,7 @@ a .icon-rotate-90:before, a .icon-rotate-180:before, a .icon-rotate-270:before, .icon-tint:before { content: "\f043"; } -.icon-edit:before { +.icon-edit:before, .process-icon-edit:before { content: "\f044"; } .icon-share:before { @@ -2343,7 +2367,7 @@ a .icon-rotate-90:before, a .icon-rotate-180:before, a .icon-rotate-270:before, .icon-ok-sign:before { content: "\f058"; } -.icon-question-sign:before { +.icon-question-sign:before, .process-icon-help:before, .process-icon-help-new:before { content: "\f059"; } .icon-info-sign:before { @@ -2361,7 +2385,7 @@ a .icon-rotate-90:before, a .icon-rotate-180:before, a .icon-rotate-270:before, .icon-ban-circle:before { content: "\f05e"; } -.icon-arrow-left:before { +.icon-arrow-left:before, .process-icon-back:before { content: "\f060"; } .icon-arrow-right:before { @@ -2383,7 +2407,7 @@ a .icon-rotate-90:before, a .icon-rotate-180:before, a .icon-rotate-270:before, .icon-resize-small:before { content: "\f066"; } -.icon-plus:before { +.icon-plus:before, .process-icon-new-module:before { content: "\f067"; } .icon-minus:before { @@ -2621,7 +2645,7 @@ a .icon-rotate-90:before, a .icon-rotate-180:before, a .icon-rotate-270:before, .icon-paper-clip:before { content: "\f0c6"; } -.icon-save:before { +.icon-save:before, .process-icon-save:before, .process-icon-save-and-stay:before { content: "\f0c7"; } .icon-sign-blank:before { @@ -2730,10 +2754,10 @@ a .icon-rotate-90:before, a .icon-rotate-180:before, a .icon-rotate-270:before, .icon-exchange:before { content: "\f0ec"; } -.icon-cloud-download:before { +.icon-cloud-download:before, .process-icon-export:before { content: "\f0ed"; } -.icon-cloud-upload:before { +.icon-cloud-upload:before, .process-icon-import:before { content: "\f0ee"; } .icon-user-md:before { @@ -2778,7 +2802,7 @@ a .icon-rotate-90:before, a .icon-rotate-180:before, a .icon-rotate-270:before, .icon-h-sign:before { content: "\f0fd"; } -.icon-plus-sign-alt:before { +.icon-plus-sign-alt:before, .process-icon-new:before, .process-icon-newAttributes:before { content: "\f0fe"; } .icon-double-angle-left:before { @@ -2918,7 +2942,7 @@ a .icon-rotate-90:before, a .icon-rotate-180:before, a .icon-rotate-270:before, .icon-eraser:before { content: "\f12d"; } -.icon-puzzle-piece:before, .icon-AdminParentModules:before { +.icon-puzzle-piece:before, .icon-AdminParentModules:before, .process-icon-modules-list:before { content: "\f12e"; } .icon-microphone:before { @@ -3461,7 +3485,7 @@ button.close { border: 0; -webkit-appearance: none; } -.btn { +.btn, .toolbar_btn { display: inline-block; *display: inline; /* IE7 inline-block hack */ @@ -3498,15 +3522,15 @@ button.close { -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } - .btn:hover, .btn:focus, .btn:active, .btn.active, .btn.disabled, .btn[disabled] { + .btn:hover, .toolbar_btn:hover, .btn:focus, .toolbar_btn:focus, .btn:active, .toolbar_btn:active, .btn.active, .active.toolbar_btn, .btn.disabled, .disabled.toolbar_btn, .btn[disabled], [disabled].toolbar_btn { color: #333333; background-color: #e6e6e6; *background-color: #d9d9d9; } - .btn:active, .btn.active { + .btn:active, .toolbar_btn:active, .btn.active, .active.toolbar_btn { background-color: #cccccc \9; } - .btn:first-child { + .btn:first-child, .toolbar_btn:first-child { *margin-left: 0; } - .btn:hover, .btn:focus { + .btn:hover, .toolbar_btn:hover, .btn:focus, .toolbar_btn:focus { color: #333333; text-decoration: none; background-position: 0 -15px; @@ -3514,17 +3538,17 @@ button.close { -moz-transition: background-position 0.1s linear; -o-transition: background-position 0.1s linear; transition: background-position 0.1s linear; } - .btn:focus { + .btn:focus, .toolbar_btn:focus { outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } - .btn.active, .btn:active { + .btn.active, .active.toolbar_btn, .btn:active, .toolbar_btn:active { background-image: none; outline: 0; -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); } - .btn.disabled, .btn[disabled] { + .btn.disabled, .disabled.toolbar_btn, .btn[disabled], [disabled].toolbar_btn { cursor: default; background-image: none; opacity: 0.65; @@ -3729,24 +3753,29 @@ input[type="button"].btn-block { .btn-inverse:active, .btn-inverse.active { background-color: #090909 \9; } -button.btn, -input[type="submit"].btn { +button.btn, button.toolbar_btn, +input[type="submit"].btn, +input[type="submit"].toolbar_btn { *padding-top: 3px; *padding-bottom: 3px; } - button.btn::-moz-focus-inner, - input[type="submit"].btn::-moz-focus-inner { + button.btn::-moz-focus-inner, button.toolbar_btn::-moz-focus-inner, + input[type="submit"].btn::-moz-focus-inner, + input[type="submit"].toolbar_btn::-moz-focus-inner { padding: 0; border: 0; } - button.btn.btn-large, - input[type="submit"].btn.btn-large { + button.btn.btn-large, button.btn-large.toolbar_btn, + input[type="submit"].btn.btn-large, + input[type="submit"].btn-large.toolbar_btn { *padding-top: 7px; *padding-bottom: 7px; } - button.btn.btn-small, - input[type="submit"].btn.btn-small { + button.btn.btn-small, button.btn-small.toolbar_btn, + input[type="submit"].btn.btn-small, + input[type="submit"].btn-small.toolbar_btn { *padding-top: 3px; *padding-bottom: 3px; } - button.btn.btn-mini, - input[type="submit"].btn.btn-mini { + button.btn.btn-mini, button.btn-mini.toolbar_btn, + input[type="submit"].btn.btn-mini, + input[type="submit"].btn-mini.toolbar_btn { *padding-top: 1px; *padding-bottom: 1px; } @@ -3798,21 +3827,23 @@ input[type="submit"].btn { font-size: 0; margin-top: 10px; margin-bottom: 10px; } - .btn-toolbar > .btn + .btn, + .btn-toolbar > .btn + .btn, .btn-toolbar > .toolbar_btn + .btn, .btn-toolbar > .btn + .toolbar_btn, .btn-toolbar > .toolbar_btn + .toolbar_btn, .btn-toolbar > .btn-group + .btn, - .btn-toolbar > .btn + .btn-group { + .btn-toolbar > .btn-group + .toolbar_btn, + .btn-toolbar > .btn + .btn-group, + .btn-toolbar > .toolbar_btn + .btn-group { margin-left: 5px; } -.btn-group > .btn { +.btn-group > .btn, .btn-group > .toolbar_btn { position: relative; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } -.btn-group > .btn + .btn { +.btn-group > .btn + .btn, .btn-group > .toolbar_btn + .btn, .btn-group > .btn + .toolbar_btn, .btn-group > .toolbar_btn + .toolbar_btn { margin-left: -1px; } -.btn-group > .btn, +.btn-group > .btn, .btn-group > .toolbar_btn, .btn-group > .dropdown-menu, .btn-group > .popover { font-size: 14px; } @@ -3826,7 +3857,7 @@ input[type="submit"].btn { .btn-group > .btn-large { font-size: 17.5px; } -.btn-group > .btn:first-child { +.btn-group > .btn:first-child, .btn-group > .toolbar_btn:first-child { margin-left: 0; -webkit-border-top-left-radius: 4px; -moz-border-radius-topleft: 4px; @@ -3835,7 +3866,7 @@ input[type="submit"].btn { -moz-border-radius-bottomleft: 4px; border-bottom-left-radius: 4px; } -.btn-group > .btn:last-child, +.btn-group > .btn:last-child, .btn-group > .toolbar_btn:last-child, .btn-group > .dropdown-toggle { -webkit-border-top-right-radius: 4px; -moz-border-radius-topright: 4px; @@ -3844,7 +3875,7 @@ input[type="submit"].btn { -moz-border-radius-bottomright: 4px; border-bottom-right-radius: 4px; } -.btn-group > .btn.large:first-child { +.btn-group > .btn.large:first-child, .btn-group > .large.toolbar_btn:first-child { margin-left: 0; -webkit-border-top-left-radius: 6px; -moz-border-radius-topleft: 6px; @@ -3853,7 +3884,7 @@ input[type="submit"].btn { -moz-border-radius-bottomleft: 6px; border-bottom-left-radius: 6px; } -.btn-group > .btn.large:last-child, +.btn-group > .btn.large:last-child, .btn-group > .large.toolbar_btn:last-child, .btn-group > .large.dropdown-toggle { -webkit-border-top-right-radius: 6px; -moz-border-radius-topright: 6px; @@ -3862,17 +3893,20 @@ input[type="submit"].btn { -moz-border-radius-bottomright: 6px; border-bottom-right-radius: 6px; } -.btn-group > .btn:hover, +.btn-group > .btn:hover, .btn-group > .toolbar_btn:hover, .btn-group > .btn:focus, +.btn-group > .toolbar_btn:focus, .btn-group > .btn:active, -.btn-group > .btn.active { +.btn-group > .toolbar_btn:active, +.btn-group > .btn.active, +.btn-group > .active.toolbar_btn { z-index: 2; } .btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { outline: 0; } -.btn-group > .btn + .dropdown-toggle { +.btn-group > .btn + .dropdown-toggle, .btn-group > .toolbar_btn + .dropdown-toggle { padding-left: 8px; padding-right: 8px; -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); @@ -3902,7 +3936,7 @@ input[type="submit"].btn { -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); } -.btn-group.open .btn.dropdown-toggle { +.btn-group.open .btn.dropdown-toggle, .btn-group.open .dropdown-toggle.toolbar_btn { background-color: #e6e6e6; } .btn-group.open .btn-primary.dropdown-toggle { background-color: #0044cc; } @@ -3917,7 +3951,7 @@ input[type="submit"].btn { .btn-group.open .btn-inverse.dropdown-toggle { background-color: #222222; } -.btn .caret { +.btn .caret, .toolbar_btn .caret { margin-top: 8px; margin-left: 0; } @@ -3951,7 +3985,7 @@ input[type="submit"].btn { /* IE7 inline-block hack */ *zoom: 1; } -.btn-group-vertical > .btn { +.btn-group-vertical > .btn, .btn-group-vertical > .toolbar_btn { display: block; float: none; max-width: 100%; @@ -3959,16 +3993,16 @@ input[type="submit"].btn { -moz-border-radius: 0; border-radius: 0; } -.btn-group-vertical > .btn + .btn { +.btn-group-vertical > .btn + .btn, .btn-group-vertical > .toolbar_btn + .btn, .btn-group-vertical > .btn + .toolbar_btn, .btn-group-vertical > .toolbar_btn + .toolbar_btn { margin-left: 0; margin-top: -1px; } -.btn-group-vertical > .btn:first-child { +.btn-group-vertical > .btn:first-child, .btn-group-vertical > .toolbar_btn:first-child { -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; } -.btn-group-vertical > .btn:last-child { +.btn-group-vertical > .btn:last-child, .btn-group-vertical > .toolbar_btn:last-child { -webkit-border-radius: 0 0 4px 4px; -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } @@ -4447,13 +4481,15 @@ input[type="submit"].btn { border-left: 1px solid #f2f2f2; border-right: 1px solid white; } -.navbar .btn, +.navbar .btn, .navbar .toolbar_btn, .navbar .btn-group { margin-top: 5px; } -.navbar .btn-group .btn, +.navbar .btn-group .btn, .navbar .btn-group .toolbar_btn, .navbar .input-prepend .btn, +.navbar .input-prepend .toolbar_btn, .navbar .input-append .btn, +.navbar .input-append .toolbar_btn, .navbar .input-prepend .btn-group, .navbar .input-append .btn-group { margin-top: 0; } @@ -4474,7 +4510,8 @@ input[type="submit"].btn { margin-top: 5px; } .navbar-form input, .navbar-form select, - .navbar-form .btn { + .navbar-form .btn, + .navbar-form .toolbar_btn { display: inline-block; margin-bottom: 0; } .navbar-form input[type="image"], @@ -5099,10 +5136,10 @@ input[type="submit"].btn { line-height: 0; } .modal-footer:after { clear: both; } - .modal-footer .btn + .btn { + .modal-footer .btn + .btn, .modal-footer .toolbar_btn + .btn, .modal-footer .btn + .toolbar_btn, .modal-footer .toolbar_btn + .toolbar_btn { margin-left: 5px; margin-bottom: 0; } - .modal-footer .btn-group .btn + .btn { + .modal-footer .btn-group .btn + .btn, .modal-footer .btn-group .toolbar_btn + .btn, .modal-footer .btn-group .btn + .toolbar_btn, .modal-footer .btn-group .toolbar_btn + .toolbar_btn { margin-left: -1px; } .modal-footer .btn-block + .btn-block { margin-left: 0; } @@ -5463,8 +5500,9 @@ a.label:hover, a.label:focus, a.badge:hover, a.badge:focus { .badge-inverse[href] { background-color: #1a1a1a; } -.btn .label, -.btn .badge { +.btn .label, .toolbar_btn .label, +.btn .badge, +.toolbar_btn .badge { position: relative; top: -1px; } @@ -5848,17 +5886,31 @@ a.label:hover, a.label:focus, a.badge:hover, a.badge:focus { box-sizing: border-box; } html, body { - height: 100%; } + height: 100%; + background: #ebeff8; } body.fixed-top { position: relative; - top: 42px; - margin-bottom: 42px; } + top: 41px; + margin-bottom: 50px; } + +#main { + position: relative; + min-height: 100%; + height: 100%; } + +#content { + background-color: white; + margin-left: 240px; + margin-top: 0px; + height: 100%; + margin-bottom: 90px; + border-left: 1px solid black; } .page-sidebar { + top: 52px; position: fixed; - top: 82px; - width: 225px; } + width: 240px; } .page-sidebar > ul { margin: 0; padding: 0; } @@ -5866,14 +5918,14 @@ body.fixed-top { list-style: none; } .page-sidebar > ul > li.active > a { color: white; - background-color: #2d94c9; } + background-color: #1a1a1a; } .page-sidebar > ul > li > a { text-transform: uppercase; font-size: 12px; color: #777777; display: block; padding: 8px 0 8px 15px; - border-bottom: 1px solid #cccccc; } + border-bottom: 1px solid #cecece; } .page-sidebar > ul > li > a:hover { text-decoration: none; } .page-sidebar > ul > li img { @@ -5881,35 +5933,38 @@ body.fixed-top { .page-sidebar > ul > li ul { margin: 0; padding: 0; - border-bottom: 1px solid #cccccc; } + border-bottom: 1px solid #cecece; + background-color: white; } .page-sidebar > ul > li ul li a { font-size: 12px; display: block; - padding: 3px 5px 3px 20px; + padding: 3px 15px 3px 20px; border: none; - border-bottom: 1px solid #f6f6f6; } + border-bottom: 1px solid whitesmoke; } + .page-sidebar > ul > li ul li a i { + margin-top: 4px; + color: #cecece; } .page-sidebar > ul > li ul li a:hover { - background-color: #d7e9f2; + background-color: whitesmoke; text-decoration: none; } + .page-sidebar > ul > li ul li a:hover i { + color: #004d7b; } .page-sidebar > ul > li ul li.active a { - background-color: #d7e9f2; } + color: #1a1a1a; + background-color: #adb0b8; } + .page-sidebar > ul > li ul li.active a i { + color: black; } .page-sidebar > ul li:not(.active) ul { display: none; } .page-sidebar > ul li.expanded ul { - display: block !important; } + display: block; + background-color: white; } .page-sidebar > ul > li > ul.sub-menu { display: none; list-style: none; clear: both; margin: 8px 0px 8px 0px; } -.page-content { - margin-left: 225px; - margin-top: 0px; - min-height: 860px; - padding-top: 20px; - margin-bottom: 90px; } - #footer { width: 100%; position: fixed; @@ -5940,6 +5995,8 @@ body.fixed-top { margin: 0; } .table td.center, .table th.center { text-align: center; } + .table tr:hover { + background-color: #777777; } #menu .maintab > a [class^="icon-"], #menu .maintab > a [class*=" icon-"] { font-size: 18px; @@ -5962,34 +6019,85 @@ label.required:before { font-size: 14px; } .icon-AdminCatalog { - background-color: #7a0928; } - -.icon-AdminParentCustomer { - background-color: #c4004e; } - -.icon-AdminParentLocalization { - background-color: #1c6dee; } - -.icon-AdminParentModules { - background-color: #00c337; } + background-color: #7a1009; } .icon-AdminParentOrders { - background-color: #004888; } + background-color: #7a3509; } -.icon-AdminParentPreferences { - background-color: #009a00; } - -.icon-AdminParentShipping { - background-color: #4ec3ff; } - -.icon-AdminParentStats { - background-color: #00a5a6; } +.icon-AdminParentCustomer { + background-color: #7a5b09; } .icon-AdminPriceRule { - background-color: #7400af; } + background-color: #737a09; } + +.icon-AdminParentShipping { + background-color: #4e7a09; } + +.icon-AdminParentLocalization { + background-color: #287a09; } + +.icon-AdminParentModules { + background-color: #097a10; } + +.icon-AdminParentPreferences { + background-color: #097a35; } .icon-AdminTools { - background-color: #af0d3a; } + background-color: #097a5b; } .icon-AdminAdmin { - background-color: #1c6dee; } + background-color: #09737a; } + +.icon-AdminParentStats { + background-color: #094e7a; } + +.navbar-inner { + box-shadow: none !important; } + .navbar-inner .input-append { + margin-bottom: 0; } + +[class^="process-icon-"], [class*=" process-icon-"] { + height: 32px; + min-width: 32px; + background-position: center; + background-repeat: no-repeat; + display: block; + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + font-size: 30px; + line-height: 32px; + text-decoration: inherit; + -webkit-font-smoothing: antialiased; + *margin-right: 0.3em; } + +.page-head { + position: relative; + margin: 0 -20px 20px -20px; + padding: 0 20px; + min-height: 68px; + border-bottom: 1px solid black; + background: #adb0b8; } + .page-head .page-title { + margin: 0; + float: left; + padding: 0; + line-height: 68px; + color: #272822; + font-weight: normal; + text-transform: uppercase; } + +.page-bar { + float: right; + padding: 0; + height: 68px; } + +.btn-toolbar { + margin: 0; } + .btn-toolbar .nav-tabs { + margin: 0; } + .btn-toolbar .nav-tabs > li > a { + color: #333333; } + .btn-toolbar .nav-tabs > li > a > .active > a, .btn-toolbar .nav-tabs > li > a > .active > a:hover { + color: #3399ff; + background: whitesmoke; } diff --git a/admin-dev/themes/default/sass/bootstrap/responsive.scss b/admin-dev/themes/default/sass/bootstrap/responsive.scss index 755d29fb5..8eda8fe74 100755 --- a/admin-dev/themes/default/sass/bootstrap/responsive.scss +++ b/admin-dev/themes/default/sass/bootstrap/responsive.scss @@ -18,31 +18,31 @@ // ------------------------- // Required since we compile the responsive stuff separately -@import "bootstrap/variables"; // Modify this for custom colors, font-sizes, etc -@import "bootstrap/mixins"; +@import "variables"; // Modify this for custom colors, font-sizes, etc +@import "mixins"; // RESPONSIVE CLASSES // ------------------ -@import "bootstrap/responsive-utilities"; +@import "responsive-utilities"; // MEDIA QUERIES // ------------------ // Large desktops -@import "bootstrap/responsive-1200px-min"; +@import "responsive-1200px-min"; // Tablets to regular desktops -@import "bootstrap/responsive-768px-979px"; +@import "responsive-768px-979px"; // Phones to portrait tablets and narrow desktops -@import "bootstrap/responsive-767px-max"; +@import "responsive-767px-max"; // RESPONSIVE NAVBAR // ------------------ // From 979px and below, show a button to toggle navbar contents -@import "bootstrap/responsive-navbar"; +@import "responsive-navbar"; diff --git a/admin-dev/themes/default/sass/ps-admin-bootstrap-responsive.sass b/admin-dev/themes/default/sass/ps-admin-bootstrap-responsive.sass index f6f449306..f88461741 100755 --- a/admin-dev/themes/default/sass/ps-admin-bootstrap-responsive.sass +++ b/admin-dev/themes/default/sass/ps-admin-bootstrap-responsive.sass @@ -1 +1,14 @@ -@import "bootstrap/responsive" \ No newline at end of file +@import "bootstrap/responsive" + +@media (max-width: 1300px) + + body.fixed-top + top: 0 + + #content + background-color: white + width: 100% + margin-left: 0 + + .page-sidebar + display: none \ No newline at end of file diff --git a/admin-dev/themes/default/sass/ps-admin-bootstrap.sass b/admin-dev/themes/default/sass/ps-admin-bootstrap.sass index d535fa081..d8c37c556 100755 --- a/admin-dev/themes/default/sass/ps-admin-bootstrap.sass +++ b/admin-dev/themes/default/sass/ps-admin-bootstrap.sass @@ -3,16 +3,31 @@ html, body height: 100% + background: #EBEFF8 body.fixed-top position: relative - top: 42px - margin-bottom: 42px + top: 41px + margin-bottom: 50px + +#main + position: relative + min-height: 100% + height: 100% + +#content + background-color: white + //width: 1060px + margin-left: 240px + margin-top: 0px + height: 100% + margin-bottom: 90px + border-left: 1px solid black .page-sidebar + top: 52px position: fixed - top: 82px - width: 225px + width: 240px > ul margin: 0 padding: 0 @@ -22,14 +37,14 @@ body.fixed-top &.active > a color: white - background-color: #2D94C9 + background-color: #1A1A1A > a text-transform: uppercase font-size: 12px color: #777 display: block padding: 8px 0 8px 15px - border-bottom: 1px solid #ccc + border-bottom: 1px solid #CECECE &:hover text-decoration: none img @@ -37,25 +52,35 @@ body.fixed-top ul margin: 0 padding: 0 - border-bottom: 1px solid #ccc + border-bottom: 1px solid #CECECE + background-color: white li a font-size: 12px display: block - padding: 3px 5px 3px 20px + padding: 3px 15px 3px 20px border: none - border-bottom: 1px solid #F6F6F6 + border-bottom: 1px solid #F5F5F5 + i + margin-top: 4px + color: #CECECE &:hover - background-color: #D7E9F2 + background-color: #F5F5F5 text-decoration: none + i + color: #004D7B &.active a - background-color: #D7E9F2 + color: #1A1A1A + background-color: #ADB0B8 + i + color: black li:not(.active) ul display: none li.expanded ul - display: block !important + display: block + background-color: white > ul > li > ul.sub-menu display: none @@ -63,14 +88,6 @@ body.fixed-top clear: both margin: 8px 0px 8px 0px - -.page-content - margin-left: 225px - margin-top: 0px - min-height: 860px - padding-top: 20px - margin-bottom: 90px - #footer width: 100% position: fixed @@ -102,7 +119,7 @@ body.fixed-top td.center, th.center text-align: center tr:hover - background-color + background-color: #777 #menu .maintab > a [class^="icon-"], #menu .maintab > a [class*=" icon-"] font-size: 18px @@ -124,48 +141,123 @@ label.required:before color: red font-size: 14px - +//variables +$icon-color: #7A0928 .icon-AdminCatalog @extend .icon-book - background-color: #7A0928 - -.icon-AdminParentCustomer - @extend .icon-group - background-color: #C4004E - -.icon-AdminParentLocalization - @extend .icon-globe - background-color: #1C6DEE - -.icon-AdminParentModules - @extend .icon-puzzle-piece - background-color: #00C337 - + background-color: adjust-hue($icon-color, 20) .icon-AdminParentOrders @extend .icon-credit-card - background-color: #004888 - -.icon-AdminParentPreferences - @extend .icon-wrench - background-color: #009A00 - -.icon-AdminParentShipping - @extend .icon-truck - background-color: #4EC3FF - -.icon-AdminParentStats - @extend .icon-bar-chart - background-color: #00A5A6 - + background-color: adjust-hue($icon-color, 40) +.icon-AdminParentCustomer + @extend .icon-group + background-color: adjust-hue($icon-color, 60) .icon-AdminPriceRule @extend .icon-tags - background-color: #7400AF - + background-color: adjust-hue($icon-color, 80) +.icon-AdminParentShipping + @extend .icon-truck + background-color: adjust-hue($icon-color, 100) +.icon-AdminParentLocalization + @extend .icon-globe + background-color: adjust-hue($icon-color, 120) +.icon-AdminParentModules + @extend .icon-puzzle-piece + background-color: adjust-hue($icon-color, 140) +.icon-AdminParentPreferences + @extend .icon-wrench + background-color: adjust-hue($icon-color, 160) .icon-AdminTools @extend .icon-cogs - background-color: #AF0D3A - + background-color: adjust-hue($icon-color, 180) .icon-AdminAdmin @extend .icon-cog - background-color: #1C6DEE + background-color: adjust-hue($icon-color, 200) +.icon-AdminParentStats + @extend .icon-bar-chart + background-color: adjust-hue($icon-color, 220) + +.navbar-inner + box-shadow: none!important + .input-append + margin-bottom: 0 + +// Tool bar +.toolbar_btn + @extend .btn + +[class^="process-icon-"], [class*=" process-icon-"] + height: 32px + min-width: 32px + background-position: center + background-repeat: no-repeat + display: block + font-family: FontAwesome + font-weight: normal + font-style: normal + font-size: 30px + line-height: 32px + text-decoration: inherit + -webkit-font-smoothing: antialiased + *margin-right: .3em + +.process-icon-new + @extend .icon-plus-sign-alt +.process-icon-save + @extend .icon-save +.process-icon-back + @extend .icon-arrow-left +.process-icon-save-and-stay + @extend .icon-save +.process-icon-help + @extend .icon-question-sign +.process-icon-export + @extend .icon-cloud-download +.process-icon-import + @extend .icon-cloud-upload +.process-icon-help-new + @extend .icon-question-sign +.process-icon-edit + @extend .icon-edit +.process-icon-newAttributes + @extend .icon-plus-sign-alt +.process-icon-modules-list + @extend .icon-puzzle-piece +.process-icon-save-date + @extend .icon-download +.process-icon-save-status + @extend .icon-download +.process-icon-new-module + @extend .icon-plus + +.page-head + position: relative + margin: 0 -20px 20px -20px + padding: 0 20px + min-height: 68px + border-bottom: 1px solid black + background: #ADB0B8 + .page-title + margin: 0 + float: left + padding: 0 + line-height: 68px + color: #272822 + font-weight: normal + text-transform: uppercase + +.page-bar + float: right + padding: 0 + height: 68px + +.btn-toolbar + margin: 0 + .nav-tabs + margin: 0 + .nav-tabs > li > a + color: #333 + > .active > a, > .active > a:hover + color: #3399ff + background: #f5f5f5 diff --git a/admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl index 530de78c6..1c5f42fb8 100644 --- a/admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl @@ -27,7 +27,7 @@ {block name="override_tpl"} -
{l s='Beginning the download ...'}
+
{l s='Beginning the download ...'}

{l s='Backup files should automatically download.'}

diff --git a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl index 1b23a1d3d..743d76b29 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl @@ -1,14 +1,23 @@
- +
- - {l s='Optional: The cart rule will be available to everyone if you leave this field blank.'} +
- +
{l s='From'} @@ -20,12 +29,16 @@
- {l s='The default period is one month.'}
- +
- @@ -48,29 +61,35 @@ - {l s='You can choose a minimum amount for the cart either with or without the taxes and shipping.'}
- +
- {l s='The cart rule will be applied to the first "X" customers only.'}
- +
- {l s='A customer will only be able to use the cart rule "X" time(s).'}
- {if $countries.unselected|@count + $countries.selected|@count > 1}
- - {l s='Generate random code'} +
+ + {l s='Generate'} +
diff --git a/admin-dev/themes/default/template/controllers/customer_threads/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/customer_threads/helpers/options/options.tpl index 2c25963bd..32307e2e9 100644 --- a/admin-dev/themes/default/template/controllers/customer_threads/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/controllers/customer_threads/helpers/options/options.tpl @@ -32,7 +32,7 @@

{l s='Click to synchronize mail automatically'}

- +

diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl index 0c954a5a8..332d47152 100644 --- a/admin-dev/themes/default/template/header.tpl +++ b/admin-dev/themes/default/template/header.tpl @@ -101,14 +101,18 @@ {if $display_header} -
{l s='Loading...'}
{* begin HEADER *} -