// Organize css/sass + backward compatibility WIP

This commit is contained in:
Kevin Granger committed 2013-11-05 12:32:41 +01:00
1 parent 1a7aa020f6
commit eb383e580e
37 files changed
+240 -121

No files matched your search

+1 -1
View File
@@ -1,7 +1,7 @@
# Require any additional compass plugins here. # Require any additional compass plugins here.
http_path = "/" http_path = "/"
css_dir = "css" css_dir = "css"
sass_dir = "css" sass_dir = "scss"
images_dir = "img" images_dir = "img"
javascripts_dir = "js" javascripts_dir = "js"
fonts_dir = "font" fonts_dir = "font"
+1 -1
View File
@@ -30,7 +30,7 @@
* Email: dave@fontawesome.io * Email: dave@fontawesome.io
* Twitter: http://twitter.com/byscuits * Twitter: http://twitter.com/byscuits
* Work: Lead Product Designer @ Kyruus - http://kyruus.com * Work: Lead Product Designer @ Kyruus - http://kyruus.com
*/@font-face{font-family:'FontAwesome';src:url("../font/fontawesome-webfont.eot?v=3.2.1");src:url("../font/fontawesome-webfont.eot?#iefix&v=3.2.1") format("embedded-opentype"),url("../font/fontawesome-webfont.woff?v=3.2.1") format("woff"),url("../font/fontawesome-webfont.ttf?v=3.2.1") format("truetype"),url("../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1") format("svg");font-weight:normal;font-style:normal}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em}[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none}.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em}a [class^="icon-"],a [class*=" icon-"]{display:inline}[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.1428571428571428em;text-align:right;padding-right:0.2857142857142857em}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em}.icons-ul{margin-left:2.142857142857143em;list-style-type:none}.icons-ul>li{position:relative}.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;text-align:center;line-height:inherit}[class^="icon-"].hide,[class*=" icon-"].hide{display:none}.icon-muted{color:#eeeeee}.icon-light{color:#ffffff}.icon-dark{color:#333333}.icon-border{border:solid 1px #eeeeee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.icon-2x{font-size:2em}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.icon-3x{font-size:3em}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.icon-4x{font-size:4em}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.icon-5x{font-size:5em}.icon-5x.icon-border{border-width:5px;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.pull-right,#content h3:not(.modal-title) .panel-heading-action,#content .panel-heading:not(.modal-title) .panel-heading-action,#content .panel-heading .panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header .panel-heading-action{float:right}.pull-left,.page-head h2.page-title{float:left}[class^="icon-"].pull-left,.page-head h2[class^="icon-"].page-title,[class*=" icon-"].pull-left,.page-head h2[class*=" icon-"].page-title{margin-right:.3em}[class^="icon-"].pull-right,#content h3:not(.modal-title) [class^="icon-"].panel-heading-action,#content .panel-heading [class^="icon-"].panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header [class^="icon-"].panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header [class^="icon-"].panel-heading-action,[class*=" icon-"].pull-right,#content h3:not(.modal-title) [class*=" icon-"].panel-heading-action,#content .panel-heading [class*=" icon-"].panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header [class*=" icon-"].panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header [class*=" icon-"].panel-heading-action{margin-left:.3em}[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],#header_infos .nav>.active>a>[class^="icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class^="icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class^="icon-"],.navbar-inverse #header_employee_box>.active>a>[class^="icon-"],#header_infos #header_employee_box>.active>a>[class^="icon-"],.navbar-inverse #header_quick>.active>a>[class^="icon-"],#header_infos #header_quick>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],#header_infos .nav>.active>a>[class*=" icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],.navbar-inverse #header_employee_box>.active>a>[class*=" icon-"],#header_infos #header_employee_box>.active>a>[class*=" icon-"],.navbar-inverse #header_quick>.active>a>[class*=" icon-"],#header_infos #header_quick>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],Line truncated */@font-face{font-family:'FontAwesome';src:url("../font/fontawesome-webfont.eot?v=3.2.1");src:url("../font/fontawesome-webfont.eot?#iefix&v=3.2.1") format("embedded-opentype"),url("../font/fontawesome-webfont.woff?v=3.2.1") format("woff"),url("../font/fontawesome-webfont.ttf?v=3.2.1") format("truetype"),url("../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1") format("svg");font-weight:normal;font-style:normal}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em}[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none}.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em}a [class^="icon-"],a [class*=" icon-"]{display:inline}[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.1428571428571428em;text-align:right;padding-right:0.2857142857142857em}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em}.icons-ul{margin-left:2.142857142857143em;list-style-type:none}.icons-ul>li{position:relative}.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;text-align:center;line-height:inherit}[class^="icon-"].hide,[class*=" icon-"].hide{display:none}.icon-muted{color:#eeeeee}.icon-light{color:#ffffff}.icon-dark{color:#333333}.icon-border{border:solid 1px #eeeeee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.icon-2x{font-size:2em}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.icon-3x{font-size:3em}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.icon-4x{font-size:4em}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.icon-5x{font-size:5em}.icon-5x.icon-border{border-width:5px;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.pull-right,#content h3:not(.modal-title) .panel-heading-action,#content .panel-heading:not(.modal-title) .panel-heading-action,#content .panel-heading .panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header .panel-heading-action{float:right}.pull-left,.page-head h2.page-title{float:left}[class^="icon-"].pull-left,.page-head h2[class^="icon-"].page-title,[class*=" icon-"].pull-left,.page-head h2[class*=" icon-"].page-title{margin-right:.3em}[class^="icon-"].pull-right,#content h3:not(.modal-title) [class^="icon-"].panel-heading-action,#content .panel-heading [class^="icon-"].panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header [class^="icon-"].panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header [class^="icon-"].panel-heading-action,[class*=" icon-"].pull-right,#content h3:not(.modal-title) [class*=" icon-"].panel-heading-action,#content .panel-heading [class*=" icon-"].panel-heading-action,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header [class*=" icon-"].panel-heading-action,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header [class*=" icon-"].panel-heading-action{margin-left:.3em}[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],#header_infos .nav>.active>a>[class^="icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class^="icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class^="icon-"],.navbar-inverse #header_employee_box>.active>a>[class^="icon-"],#header_infos #header_employee_box>.active>a>[class^="icon-"],.navbar-inverse #header_quick>.active>a>[class^="icon-"],#header_infos #header_quick>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],#header_infos .nav>.active>a>[class*=" icon-"],.navbar-inverse #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],#header_infos #header_notifs_icon_wrapper>.active>a>[class*=" icon-"],.navbar-inverse #header_employee_box>.active>a>[class*=" icon-"],#header_infos #header_employee_box>.active>a>[class*=" icon-"],.navbar-inverse #header_quick>.active>a>[class*=" icon-"],#header_infos #header_quick>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],Line truncated
* Ladda * Ladda
* http://lab.hakim.se/ladda * http://lab.hakim.se/ladda
* MIT licensed * MIT licensed
@@ -0,0 +1 @@
#nobootstrap *,#nobootstrap *:before,#nobootstrap *:after{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}#nobootstrap a{line-height:normal}#nobootstrap .categorieList a{line-height:20px}#nobootstrap p{line-height:normal}#nobootstrap legend{font-size:13px;line-height:20px;width:auto}#nobootstrap label{font-size:13px;display:inline;line-height:normal}#nobootstrap fieldset{clear:both}#nobootstrap .breadcrumb{padding:0}#nobootstrap li{line-height:normal}#nobootstrap select,#nobootstrap textarea,#nobootstrap input{height:inherit}#nobootstrap label,#nobootstrap input,#nobootstrap button,#nobootstrap select,#nobootstrap textarea{font-size:12px;line-height:13px}#nobootstrap input[type="radio"],#nobootstrap input[type="checkbox"]{margin:0}#nobootstrap input[type="text"]{height:14px !important}#nobootstrap table.table{margin:0;padding:0;width:100%;border-collapse:collapse}#nobootstrap table.widthfull{width:100%}#nobootstrap .table thead th{vertical-align:top}#nobootstrap .table th,#nobootstrap .table td{line-height:normal;vertical-align:middle;border-top:none}#nobootstrap #header #header_search #bo_search_submit{height:25px !important}#nobootstrap [class^="icon-"],#nobootstrap [class*=" icon-"]{width:auto}#nobootstrap .toolbarBox [class^="process-icon-"],#nobootstrap .toolbarBox [class*=" process-icon-"]{text-indent:-9000px;overflow:hidden}
@@ -1 +1 @@
#nobootstrap body{font-family:Arial, Helvetica, sans-serif}#nobootstrap h1,#nobootstrap h2,#nobootstrap h3,#nobootstrap h4{font-family:Arial, Helvetica, sans-serif;line-height:1.4em;margin-bottom:.5em}#nobootstrap h2{font-size:1.7em}#nobootstrap h3{font-size:1.25em}#nobootstrap h4{font-size:1.05em}#nobootstrap h6{font-size:1em}#nobootstrap ul,#nobootstrap ol{list-style:none;margin:0;padding:0}#nobootstrap ul li{color:#585A69}#nobootstrap label{color:#585a69}#nobootstrap fieldset{background-color:#EBEDF4;border:1px solid #CCCED7;color:#585A69;font-size:1.1em;margin:0;padding:1em}#nobootstrap .Bloc{background:none repeat scroll 0 0 #EBEDF4;background-color:#EBEDF4;border:1px solid #CCCED7;font-size:1.1em;margin:0;padding:1em}#nobootstrap legend{background:#EBEDF4;border:1px solid #CCCED7;font-weight:700;margin:0;padding:.2em .5em;text-align:left}#nobootstrap input[type=text],#nobootstrap input[type=password],#nobootstrap input[type=file],#nobootstrap textarea{background-color:#fff;border:1px solid #ccc}#nobootstrap input[type=text]:disabled,#nobootstrap input[type=password]:disabled,#nobootstrap input[type=file]:disabled,#nobootstrap textarea:disabled{background-color:#dedede;border:1px solid #ccc;color:#444}#nobootstrap select{border:1px solid #ccc;font-size:12px}#nobootstrap select[disabled=disabled],#nobootstrap input[disabled=disabled],#nobootstrap textarea[disabled=disabled],#nobootstrap option[disabled=disabled]{border:1px solid #CCC;color:#AAA}#nobootstrap .header_module{background:url(../img/header_module.png);border:solid 1px #CCC;color:#812143;height:20px;padding-left:.5em;padding-top:.8em}#nobootstrap .double_select select{height:160px;width:300px}#nobootstrap .double_select a{background-color:#fafafa;border:1px solid #aaa;color:#123456;display:block;margin:2px;padding:2px;text-align:center;text-decoration:none}#nobootstrap .icon{vertical-align:middle}#nobootstrap .icon-top{vertical-align:top}#nobootstrap .button{background:#E3E3E3 repeat scroll 0 0 transparent;border-color:#CCC #BBB #A0A0A0;border-left:1px solid #BBB;border-right:1px solid #BBB;border-style:solid;border-width:1px;color:#000;cursor:pointer;margin:0;outline:medium none;padding:3px 8px;text-align:center;vertical-align:middle;white-space:nowrap}#nobootstrap .button[disabled=disabled]{color:#8C8C8C}#nobootstrap .button.bt-icon{display:inline-block;margin-bottom:7px}#nobootstrap .button.bt-icon span{padding-left:5px}#nobootstrap input.button[disabled=disabled]:hover{background-color:#FFF6D3}#nobootstrap .button.export-csv span{background:transparent url(../img/export-csv.png) no-repeat scroll left top;padding:1px 0 1px 20px}#nobootstrap #top_container{margin:0;padding:0}#nobootstrap #header{background-color:#394049;height:90px}#nobootstrap #header #header_infos{height:60px;margin:0;padding:0;position:relative}#nobootstrap #header #header_shopname{float:left;margin:10px 15px 0 10px}#nobootstrap #header #employee_box{display:block;float:right}#nobootstrap #header #employee_infos{display:block;margin:5px 15px 0 10px}#nobootstrap #header #employee_infos a{color:#BABABA;margin-right:5px;text-transform:capitalize}#nobootstrap #header #employee_infos .employee_name{color:#fff;float:left;padding:0 20px 0 0}#nobootstrap #header .separator{background:transparent url(../img/separator.png) no-repeat scroll center top;height:19px;margin-right:5px;width:16px}#nobootstrap #header ul#employee_links{display:block;list-style:none;text-align:left}#nobootstrap #header ul#employee_links li{display:inline;line-height:20px}#nobootstrap #header #header_infos #header_shopname span{color:#fff;display:block;font-size:24px;height:28px;margin:0;overflow:hidden}#nobootstrap #header #header_infos a#header_logout{background:transparent url(../img/logout.png) no-repeat scroll left top;color:#bababa;padding-left:20px}#nobootstrap #header #header_infos #header_logout a span{color:#bababa}#nobootstrap #header #header_infos #header_foaccess{color:#bababa;text-decoration:none}#nobootstrap #header #header_infos #header_foaccess a{color:#bababa !important}#nobootstrap #header #header_search{background-color:#fff;border:2px solid #000;float:left;height:25px;margin-top:15px;position:relative}#nobootstrap #header #header_search #bo_query{background:none repeat scroll 0 0 transparent;border:none;float:left;font:13px Arial,sans-serif;padding:5px 0 5px 4px;width:160px}#nobootstrap #header #header_search #bo_search_type_chzn{border:none;float:left;font-size:13px;height:27px;margin:0 23px 0 0;padding:0 4px;vertical-align:middle;width:80px !important}#nobootstrap #header #header_search #bo_search_type_chzn.chzn-container-single .chzn-single{border:none;border-left:1px dotted #ccc}#nobootstrap #header #header_search #bo_search_submit{background:url(../img/icon-search2.png) no-repeat scroll center;border:none;border-left:1px solid #3079ED;color:transparent;cursor:pointer;display:block;float:left;font-weight:400;height:25px;margin:0;padding:0;position:absolute;right:0;text-indent:-9999eLine truncated #nobootstrap h1,#nobootstrap h2,#nobootstrap h3,#nobootstrap h4{font-family:Arial, Helvetica, sans-serif;line-height:1.4em;margin-bottom:.5em}#nobootstrap h2{font-size:1.7em}#nobootstrap h3{font-size:1.25em}#nobootstrap h4{font-size:1.05em}#nobootstrap h6{font-size:1em}#nobootstrap ul,#nobootstrap ol{list-style:none;margin:0;padding:0}#nobootstrap ul li{color:#585A69}#nobootstrap label{color:#585a69}#nobootstrap fieldset{background-color:#EBEDF4;border:1px solid #CCCED7;color:#585A69;font-size:1.1em;margin:0;padding:1em}#nobootstrap .Bloc{background:none repeat scroll 0 0 #EBEDF4;background-color:#EBEDF4;border:1px solid #CCCED7;font-size:1.1em;margin:0;padding:1em}#nobootstrap legend{background:#EBEDF4;border:1px solid #CCCED7;font-weight:700;margin:0;padding:.2em .5em;text-align:left}#nobootstrap input[type=text],#nobootstrap input[type=password],#nobootstrap input[type=file],#nobootstrap textarea{background-color:#fff;border:1px solid #ccc}#nobootstrap input[type=text]:disabled,#nobootstrap input[type=password]:disabled,#nobootstrap input[type=file]:disabled,#nobootstrap textarea:disabled{background-color:#dedede;border:1px solid #ccc;color:#444}#nobootstrap select{border:1px solid #ccc;font-size:12px}#nobootstrap select[disabled=disabled],#nobootstrap input[disabled=disabled],#nobootstrap textarea[disabled=disabled],#nobootstrap option[disabled=disabled]{border:1px solid #CCC;color:#AAA}#nobootstrap .header_module{background:url(../img/header_module.png);border:solid 1px #CCC;color:#812143;height:20px;padding-left:.5em;padding-top:.8em}#nobootstrap .double_select select{height:160px;width:300px}#nobootstrap .double_select a{background-color:#fafafa;border:1px solid #aaa;color:#123456;display:block;margin:2px;padding:2px;text-align:center;text-decoration:none}#nobootstrap .icon{vertical-align:middle}#nobootstrap .icon-top{vertical-align:top}#nobootstrap .button{background:#E3E3E3 repeat scroll 0 0 transparent;border-color:#CCC #BBB #A0A0A0;border-left:1px solid #BBB;border-right:1px solid #BBB;border-style:solid;border-width:1px;color:#000;cursor:pointer;margin:0;outline:medium none;padding:3px 8px;text-align:center;vertical-align:middle;white-space:nowrap}#nobootstrap .button[disabled=disabled]{color:#8C8C8C}#nobootstrap .button.bt-icon{display:inline-block;margin-bottom:7px}#nobootstrap .button.bt-icon span{padding-left:5px}#nobootstrap input.button[disabled=disabled]:hover{background-color:#FFF6D3}#nobootstrap .button.export-csv span{background:transparent url(../img/export-csv.png) no-repeat scroll left top;padding:1px 0 1px 20px}#nobootstrap #top_container{margin:0;padding:0}#nobootstrap #header{background-color:#394049;height:90px}#nobootstrap #header #header_infos{height:60px;margin:0;padding:0;position:relative}#nobootstrap #header #header_shopname{float:left;margin:10px 15px 0 10px}#nobootstrap #header #employee_box{display:block;float:right}#nobootstrap #header #employee_infos{display:block;margin:5px 15px 0 10px}#nobootstrap #header #employee_infos a{color:#BABABA;margin-right:5px;text-transform:capitalize}#nobootstrap #header #employee_infos .employee_name{color:#fff;float:left;padding:0 20px 0 0}#nobootstrap #header .separator{background:transparent url(../img/separator.png) no-repeat scroll center top;height:19px;margin-right:5px;width:16px}#nobootstrap #header ul#employee_links{display:block;list-style:none;text-align:left}#nobootstrap #header ul#employee_links li{display:inline;line-height:20px}#nobootstrap #header #header_infos #header_shopname span{color:#fff;display:block;font-size:24px;height:28px;margin:0;overflow:hidden}#nobootstrap #header #header_infos a#header_logout{background:transparent url(../img/logout.png) no-repeat scroll left top;color:#bababa;padding-left:20px}#nobootstrap #header #header_infos #header_logout a span{color:#bababa}#nobootstrap #header #header_infos #header_foaccess{color:#bababa;text-decoration:none}#nobootstrap #header #header_infos #header_foaccess a{color:#bababa !important}#nobootstrap #header #header_search{background-color:#fff;border:2px solid #000;float:left;height:25px;margin-top:15px;position:relative}#nobootstrap #header #header_search #bo_query{background:none repeat scroll 0 0 transparent;border:none;float:left;font:13px Arial,sans-serif;padding:5px 0 5px 4px;width:160px}#nobootstrap #header #header_search #bo_search_type_chzn{border:none;float:left;font-size:13px;height:27px;margin:0 23px 0 0;padding:0 4px;vertical-align:middle;width:80px !important}#nobootstrap #header #header_search #bo_search_type_chzn.chzn-container-single .chzn-single{border:none;border-left:1px dotted #ccc}#nobootstrap #header #header_search #bo_search_submit{background:url(../img/icon-search2.png) no-repeat scroll center;border:none;border-left:1px solid #3079ED;color:transparent;cursor:pointer;display:block;float:left;font-weight:400;height:25px;margin:0;padding:0;position:absolute;right:0;text-indent:-9999em;width:27px}#nobootstrap #header #header_quick{display:bloLine truncated
@@ -1,49 +0,0 @@
#nobootstrap a {
line-height: normal; }
#nobootstrap .categorieList a {
line-height: 20px; }
#nobootstrap p {
line-height: normal; }
#nobootstrap legend {
font-size: 13px;
line-height: 20px;
width: auto !important; }
#nobootstrap label {
font-size: 13px;
display: inline;
line-height: normal; }
#nobootstrap .breadcrumb {
padding: 0; }
#nobootstrap select, #nobootstrap textarea, #nobootstrap input {
height: auto !important;
font-size: 12px !important;
line-height: normal;
margin-bottom: auto;
font-family: Arial, Verdana, Helvetica, sans-serif;
margin-bottom: 0 !important;
width: auto; }
#nobootstrap label, #nobootstrap input, #nobootstrap button, #nobootstrap select, #nobootstrap textarea {
font-size: 12px;
line-height: 13px; }
#nobootstrap input[type="radio"], #nobootstrap input[type="checkbox"] {
margin: 0; }
#nobootstrap input[type="text"] {
height: 14px !important; }
#nobootstrap table.table {
margin: 0;
padding: 0;
width: 100%;
border-collapse: collapse; }
#nobootstrap table.widthfull {
width: 100%; }
#nobootstrap .table th, #nobootstrap .table td {
line-height: normal;
vertical-align: middle;
border-top: none; }
#nobootstrap #header #header_search #bo_search_submit {
height: 25px !important; }
#nobootstrap [class^="icon-"], #nobootstrap [class*=" icon-"] {
width: auto; }
#nobootstrap .toolbarBox [class^="process-icon-"], #nobootstrap .toolbarBox [class*=" process-icon-"] {
text-indent: -9000px;
overflow: hidden; }
@@ -21,7 +21,7 @@ html, body
@include transition-property(margin) @include transition-property(margin)
@include transition-duration(0.4s) @include transition-duration(0.4s)
@include transition-timing-function(ease-out) @include transition-timing-function(ease-out)
fieldset, .panel .panel
padding: 20px padding: 20px
margin-bottom: 20px margin-bottom: 20px
border: solid 1px darken($bg-content-color,10%) border: solid 1px darken($bg-content-color,10%)
+35
View File
@@ -0,0 +1,35 @@
<?php
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;
+35
View File
@@ -0,0 +1,35 @@
<?php
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;
@@ -0,0 +1,35 @@
<?php
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;
@@ -0,0 +1,35 @@
<?php
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;
+35
View File
@@ -0,0 +1,35 @@
<?php
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;
@@ -1,4 +1,7 @@
@import compass
#nobootstrap #nobootstrap
*, *:before, *:after
@include box-sizing(content-box)
a a
line-height: normal line-height: normal
.categorieList a .categorieList a
@@ -8,26 +11,25 @@
legend legend
font-size: 13px font-size: 13px
line-height: 20px line-height: 20px
width: auto!important width: auto
label label
font-size: 13px font-size: 13px
display: inline display: inline
line-height: normal line-height: normal
fieldset
clear: both
.breadcrumb .breadcrumb
padding: 0 padding: 0
li li
line-height:normal
select, textarea, input
height: auto!important
font-size: 12px!important
line-height: normal line-height: normal
margin-bottom: auto select, textarea, input
font-family: Arial,Verdana,Helvetica,sans-serif height: inherit
margin-bottom: 0!important
width: auto
label, input, button, select, textarea label, input, button, select, textarea
font-size: 12px font-size: 12px
line-height: 13px line-height: 13px
input[type="radio"], input[type="checkbox"] input[type="radio"], input[type="checkbox"]
margin: 0 margin: 0
input[type="text"] input[type="text"]
@@ -40,7 +42,7 @@
table.widthfull table.widthfull
width: 100% width: 100%
.table thead th .table thead th
vertical-align:top vertical-align: top
.table th, .table td .table th, .table td
line-height: normal line-height: normal
vertical-align: middle vertical-align: middle
@@ -1,6 +1,5 @@
#nobootstrap { #nobootstrap {
//old admin theme //old admin theme
body{font-family:Arial, Helvetica, sans-serif}
h1,h2,h3,h4{font-family:Arial, Helvetica, sans-serif;line-height:1.4em;margin-bottom:.5em} h1,h2,h3,h4{font-family:Arial, Helvetica, sans-serif;line-height:1.4em;margin-bottom:.5em}
h2{font-size:1.7em} h2{font-size:1.7em}
h3{font-size:1.25em} h3{font-size:1.25em}
@@ -121,14 +120,8 @@
.multishop_toolbar .chzn-container .chzn-results .first{background-color:#408BD5;color:#fff;font-weight:700} .multishop_toolbar .chzn-container .chzn-results .first{background-color:#408BD5;color:#fff;font-weight:700}
.multishop_toolbar .chzn-container .chzn-results .group{background-color:#C6DEFC;font-style:italic;font-weight:700;padding-left:15px} .multishop_toolbar .chzn-container .chzn-results .group{background-color:#C6DEFC;font-style:italic;font-weight:700;padding-left:15px}
.multishop_toolbar .chzn-container .chzn-results .shop{background-color:#EAF2FC;padding-left:30px} .multishop_toolbar .chzn-container .chzn-results .shop{background-color:#EAF2FC;padding-left:30px}
.toolbarBox{background-color:#F8F8F8;border:1px solid #CCC;margin-bottom:10px;padding:10px 0;position:relative}
.toolbarBox .pageTitle{line-height:48px;margin-left:10px}
.toolbarBox .pageTitle h3{font-size:2em;font-weight:700;line-height:48px;margin:0;padding:0}
.toolbarBox ul.cc_button{float:right;margin:0;padding:0}
.toolbarBox ul.cc_button li{color:#666;float:left;height:48px;list-style:none outside none;padding:1px 1px 3px 4px;text-align:center}
.toolbarBox a.toolbar_btn{border:1px solid #f8f8f8;border-width:1px;cursor:pointer;display:block;float:left;font-size:11px;min-width:50px;padding:1px 5px;white-space:nowrap}
.toolbarBox a.toolbar_btn:hover{background-color:#fff;border:1px inset #ccc}
.toolbarBox .toolbar_btn span{display:block;float:none;height:32px;margin:0 auto;position:relative}
.toolbarBox .process-icon-delete{background-image:url(../img/process-icon-delete.png)} .toolbarBox .process-icon-delete{background-image:url(../img/process-icon-delete.png)}
.toolbarBox .process-icon-duplicate{background-image:url(../img/process-icon-duplicate.png)} .toolbarBox .process-icon-duplicate{background-image:url(../img/process-icon-duplicate.png)}
.toolbarBox .process-icon-stats{background-image:url(../img/process-icon-stats.png)} .toolbarBox .process-icon-stats{background-image:url(../img/process-icon-stats.png)}
@@ -147,6 +140,7 @@
.toolbarBox .process-icon-help{background-image:url(../img/process-icon-help.png)} .toolbarBox .process-icon-help{background-image:url(../img/process-icon-help.png)}
.toolbarBox .process-icon-help-new{background-image:url(../img/process-icon-help-new.png)} .toolbarBox .process-icon-help-new{background-image:url(../img/process-icon-help-new.png)}
.toolbarBox .process-icon-modules-list{background-image:url(../img/process-icon-modules-list.png)} .toolbarBox .process-icon-modules-list{background-image:url(../img/process-icon-modules-list.png)}
.toolbarReduced{margin-right:221px} .toolbarReduced{margin-right:221px}
#modules_list_button{background-image:url(../img/modules_list_button.png);border:none;cursor:pointer;font-size:1.6em;height:63px;padding-left:45px;position:absolute;right:0;top:0;width:211px} #modules_list_button{background-image:url(../img/modules_list_button.png);border:none;cursor:pointer;font-size:1.6em;height:63px;padding-left:45px;position:absolute;right:0;top:0;width:211px}
.toolbarBox #modules_list_container{background:none repeat scroll 0 0 #FFF;border:solid 1px #CCC;display:block;float:right;height:auto;position:absolute;right:13px;top:63px;width:500px;z-index:100} .toolbarBox #modules_list_container{background:none repeat scroll 0 0 #FFF;border:solid 1px #CCC;display:block;float:right;height:auto;position:absolute;right:13px;top:63px;width:500px;z-index:100}
@@ -340,7 +334,7 @@
#moduleContainer .moduleGridDesc,#modules_list_container_tab .moduleGridDesc{display:block;height:30px;position:relative} #moduleContainer .moduleGridDesc,#modules_list_container_tab .moduleGridDesc{display:block;height:30px;position:relative}
#moduleContainer ul.listing-grid-module li select,#modules_list_container_tab ul.listing-grid-module li select{position:absolute;right:0;top:0} #moduleContainer ul.listing-grid-module li select,#modules_list_container_tab ul.listing-grid-module li select{position:absolute;right:0;top:0}
//root css //root css
*{font-family:Arial,Verdana,Helvetica,sans-serif}
body{color:#000;font-size:12px;margin:0;padding:0} body{color:#000;font-size:12px;margin:0;padding:0}
a img{border:0} a img{border:0}
a{color:#000;outline:0;text-decoration:none} a{color:#000;outline:0;text-decoration:none}
@@ -353,7 +347,7 @@
h3{font-size:1.1em} h3{font-size:1.1em}
h5{font-size:.83em} h5{font-size:.83em}
h6{font-size:.67em} h6{font-size:.67em}
h3.blue{color:#268CCD} .blue{color:#268CCD}
.red{color:red} .red{color:red}
form p{margin:.5em 0 0;padding:0 0 .5em} form p{margin:.5em 0 0;padding:0 0 .5em}
form sup{color:#C00;font-weight:700;vertical-align:text-top} form sup{color:#C00;font-weight:700;vertical-align:text-top}
@@ -696,45 +690,6 @@
#BoxUseSpecialSyntax .warn{margin:0 auto;width:500px} #BoxUseSpecialSyntax .warn{margin:0 auto;width:500px}
#BoxUseSpecialSyntax ul{list-style-type:disc;margin-left:30px} #BoxUseSpecialSyntax ul{list-style-type:disc;margin-left:30px}
.id_customization .customization_field{min-width:205px;width:205px} .id_customization .customization_field{min-width:205px;width:205px}
#carrier_wizard.swMain{display:block;float:left;margin:0;min-width:980px;padding:0;position:relative;width:100%}
#carrier_wizard.swMain .stepContainer{clear:both;display:block;margin:0;overflow:hidden;padding:0;position:relative}
#carrier_wizard.swMain .stepContainer div.content{clear:both;display:block;float:left;margin:0;overflow:visible;padding:0;position:absolute;text-align:left;width:100%;z-index:88}
#carrier_wizard.swMain div.actionBar{background-color:#f7f8f7;border:1px solid #caccca;clear:both;display:block;height:37px;margin-bottom:20px;overflow:auto;padding:0;position:relative;text-align:left;z-index:88}
#carrier_wizard.swMain .stepContainer .StepTitle{clear:both;display:block;margin:0;padding:5px;position:relative;text-align:left;z-index:88}
#carrier_wizard.swMain ul.anchor{clear:both;display:block;float:left;list-style:none;margin:0 0 10px;padding:0;position:relative;width:100%}
#carrier_wizard.swMain ul.anchor li{display:block;float:left;margin:0;padding:0;position:relative}
#carrier_wizard.swMain ul.nbr_steps_4.anchor li{width:25%}
#carrier_wizard.swMain ul.nbr_steps_5.anchor li{width:20%}
#carrier_wizard.swMain ul.anchor li a{display:block;height:32px;margin:0;outline-style:none;overflow:hidden;padding-right:25px;position:relative;text-decoration:none;z-index:99}
#carrier_wizard.swMain ul.anchor li a .stepNumber{color:#fffffe;float:left;font-size:30px;font-style:normal;font-weight:400;height:32px;line-height:32px;padding:0 5px;position:relative;text-align:center;width:24px}
#carrier_wizard.swMain ul.anchor li a .stepDesc{display:table-cell;font-size:15px;height:32px;line-height:13px;position:relative;text-align:left;vertical-align:middle}
#carrier_wizard.swMain ul.anchor li a.selected{background:#404956 url(../img/admin/steps-carrierwizard.png) no-repeat right -32px;color:#F8F8F8;cursor:text}
#carrier_wizard.swMain ul.anchor li a.done,#carrier_wizard.swMain ul.anchor li.done.selected a.selected{background:url(../img/admin/steps-carrierwizard.png) right 0 no-repeat #3f4856;color:#FFF;position:relative;z-index:99}
#carrier_wizard.swMain ul.anchor li a.disabled{background:url(../img/admin/steps-carrierwizard.png) right -64px no-repeat #cbcccb;color:#878787;cursor:text}
#carrier_wizard.swMain .buttonDisabled{background-color:#CCC!important;border:1px solid #CCC!important;color:#F8F8F8!important;cursor:text}
#carrier_wizard.swMain .buttonFinish{background-color:#5A5655;border:1px solid #5A5655;color:#FFF;display:block;float:right;margin:5px 10px 0 3px;outline-style:none;padding:5px;text-align:center;text-decoration:none;width:100px}
#carrier_logo_block{margin:0;padding:0;position:absolute;right:10px}
#carrier_wizard.swMain .msgBox{background-color:#FFD;border:1px solid #FFD700;color:#5A5655;display:none;float:left;margin:4px 0 0 5px;min-width:200px;padding:5px;position:relative;z-index:999}
#carrier_wizard.swMain .msgBox .content{float:left;padding:0}
#carrier_wizard.swMain .msgBox .close{border:1px solid #CCC;color:#CCC;display:block;float:right;margin:0 0 0 5px;outline-style:none;padding:0 2px;position:relative;text-align:center;text-decoration:none}
#carrier_wizard.swMain .msgBox .close:hover{border:1px solid #EA8511;color:#EA8511}
#carrier_wizard .border_top{border-top:solid 1px silver}
#carrier_wizard .border_bottom{border-bottom:solid 1px silver}
#carrier_wizard .border_left{border-left:solid 1px silver}
#carrier_wizard .border_right{border-right:solid 1px silver}
#carrier_wizard .border_all{border:solid 1px silver}
#carrier_wizard input.field_error{background-color:#FCC;border:solid 1px red}
#carrier_wizard .new_range,#carrier_wizard .validate_range{float:left;margin:35px 0 0 10px;width:130px}
#carrier_wizard tr.fees_all{background:#CCC}
#carrier_wizard #zones_table input[type=text]{width:45px}
#carrier_wizard #fieldset_form{min-height:190px}
#carrier_wizard #zone_ranges label{float:none;width:inherit}
#carrier_wizard #step_carrier_summary label{width:40px}
#carrier_wizard #step_carrier_summary .margin-form{padding-left:60px}
#carrier_wizard #summary_zones,#carrier_wizard #summary_groups,#carrier_wizard #summary_shops{list-style:disc;margin-left:20px;margin-top:10px}
#carrier_wizard .ranges_not_follow label{float:none;width:inherit}
#carrier_wizard .ranges_not_follow{margin-bottom:0;width:300px}
#carrier_wizard .assoShop{min-height:inherit}
.float,span.defaultSkin table.mceLayout tr.mceFirst td,#customer_part #customers ul,#MeaningStatus,#CustomerThreadContacts div#MeaningStatus,#conditions #condition_list a{float:left} .float,span.defaultSkin table.mceLayout tr.mceFirst td,#customer_part #customers ul,#MeaningStatus,#CustomerThreadContacts div#MeaningStatus,#conditions #condition_list a{float:left}
.floatr,#customer_part #customers ul li a.id_customer.button{float:right} .floatr,#customer_part #customers ul li a.id_customer.button{float:right}
a.link,.warn a,#content .conf a:hover,#content .warn a:hover,#content .error a:hover{text-decoration:underline} a.link,.warn a,#content .conf a:hover,#content .warn a:hover,#content .error a:hover{text-decoration:underline}
@@ -762,6 +717,4 @@
#conditions .condition_group h3,#conditions #condition_list h4{margin:0 0 10px} #conditions .condition_group h3,#conditions #condition_list h4{margin:0 0 10px}
#container-customer,#container-multishop{background-color:#EBEDF4;border:1px solid #CCCED7;color:#585A69;padding:10px} #container-customer,#container-multishop{background-color:#EBEDF4;border:1px solid #CCCED7;color:#585A69;padding:10px}
#block_tips,#block_partner_tips{float:right;width:48.1%} #block_tips,#block_partner_tips{float:right;width:48.1%}
#carrier_wizard.swMain .buttonNext,#carrier_wizard.swMain .buttonPrevious{background-color:#5A5655;border:1px solid #5A5655;color:#FFF;display:block;float:right;margin:5px 3px 0;outline-style:none;padding:5px;text-align:center;text-decoration:none;width:100px}
#carrier_wizard.swMain ul.anchor li a.done .stepNumber,#carrier_wizard.swMain ul.anchor li a.done .stepDesc{color:#A9B6C8}
} }
+35
View File
@@ -0,0 +1,35 @@
<?php
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;
+8 -6
View File
@@ -1927,12 +1927,13 @@ class AdminControllerCore extends Controller
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/admin-theme.css', 'all'); $this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/admin-theme.css', 'all');
// Deprecated stylesheets + reset bootstrap style for the #nobootstrap field - Backward compatibility // Deprecated stylesheets + reset bootstrap style for the #nobootstrap field - Backward compatibility
if (!$this->bootstrap) //if (!$this->bootstrap)
{ //{
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward/admin.css', 'all'); $this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-old.css', 'all');
$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward/bootstrap_admin_reset.css', 'all'); $this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-bootstrap-reset.css', 'all');
} //}
//todo csss for rtl support
if ($this->context->language->is_rtl) if ($this->context->language->is_rtl)
$this->addCSS(_THEME_CSS_DIR_.'rtl.css'); $this->addCSS(_THEME_CSS_DIR_.'rtl.css');
@@ -1944,8 +1945,9 @@ class AdminControllerCore extends Controller
_PS_JS_DIR_.'toggle.js', _PS_JS_DIR_.'toggle.js',
_PS_JS_DIR_.'tools.js', _PS_JS_DIR_.'tools.js',
_PS_JS_DIR_.'ajax.js', _PS_JS_DIR_.'ajax.js',
_PS_JS_DIR_.'toolbar.js', //_PS_JS_DIR_.'toolbar.js',
)); ));
//loads specific javascripts for the admin theme, bootstrap.js should be moved into /js root directory //loads specific javascripts for the admin theme, bootstrap.js should be moved into /js root directory
$this->addJS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/js/vendor/bootstrap.js'); $this->addJS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/js/vendor/bootstrap.js');
$this->addJS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/js/admin-theme.js'); $this->addJS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/js/admin-theme.js');