dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// fix menu, design, css

Browse Source
This commit is contained in:
Kevin Granger committed 2013-09-06 16:25:01 +02:00
1 parent 8e1250dad1
commit fa198aeabc
7 files changed
+78 -95
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/css/admin-theme.css
+2 -2
View File
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world by @mdo and @fat. * Designed and built with all the love in the world by @mdo and @fat.
*//* normalize.css v2.1.0 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:0.67em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace, serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}@media print{*{text-shadow:none !important;color:#000 !important;background:transparent !important;box-shadow:none !important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}@page{margin:2cm .5cm}p,h2,h3,#content .panel-heading,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header{orphans:3;widows:3}h2,h3,#content .panel-heading,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header{page-break-after:avoid}.navbar,#header_infos{display:none}.table td,.table th{background-color:#fff !important}.btn>.caret,#carrier_wizard.swMain .buttonNext>.caret,#carrier_wizard.swMain .buttonDisabled>.caret,#carrier_wizard.swMain .buttonPrevious>.caret,#carrier_wizard.swMain .buttonFinish>.caret,.dropup>.btn>.caret,#carrier_wizard.swMain .dropup>.buttonNext>.caret,#carrier_wizard.swMain .dropup>.buttonDisabled>.caret,#carrier_wizard.swMain .dropup>.buttonPrevious>.caret,#carrier_wizard.swMain .dropup>.buttonFinish>.caret{border-top-color:#000 !important}.label{border:1px solid #000}.table{border-collapse:collapse !important}.table-bordered th,.table-bordered td{border:1px solid #ddd !important}}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Open Sans",Helvetica,Arial,sans-serif;font-size:12px;line-height:1.42857;color:#555;background-color:#3a3a4a}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}button,input,select[multiple],textarea{background-image:none}a{color:#1d7878;text-decoration:none}a:hover,a:focus{color:#0e3a3a;text-decoration:underline}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}img{vertical-align:middle}.img-responsive{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail,.thumbnail{padding:4px;line-height:1.42857;background-color:#3a3a4a;border:1px solid #ddd;border-radius:3px;-webkit-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:17px;margin-bottom:17px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0 0 0 0);border:0}p{margin:0 0 8.5px}.lead{margin-bottom:17px;font-size:13.8px;font-weight:200;line-height:1.4}@media (min-width: 768px){.lead{font-size:18px}}small{font-size:85%}cite{font-style:normal}.text-muted,.module_description,.hook_panel_header .hook_description{color:#999}.text-primary{color:#1d7878}.text-warning{color:#c09853}.text-danger{color:#b94a48}.text-success{color:#4688Line truncated *//* normalize.css v2.1.0 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:0.67em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace, serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}@media print{*{text-shadow:none !important;color:#000 !important;background:transparent !important;box-shadow:none !important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}@page{margin:2cm .5cm}p,h2,h3,#content .panel-heading,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header{orphans:3;widows:3}h2,h3,#content .panel-heading,#content #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header,#header_notifs_icon_wrapper .notifs_panel #content .notifs_panel_header{page-break-after:avoid}.navbar,#header_infos{display:none}.table td,.table th{background-color:#fff !important}.btn>.caret,#carrier_wizard.swMain .buttonNext>.caret,#carrier_wizard.swMain .buttonDisabled>.caret,#carrier_wizard.swMain .buttonPrevious>.caret,#carrier_wizard.swMain .buttonFinish>.caret,.dropup>.btn>.caret,#carrier_wizard.swMain .dropup>.buttonNext>.caret,#carrier_wizard.swMain .dropup>.buttonDisabled>.caret,#carrier_wizard.swMain .dropup>.buttonPrevious>.caret,#carrier_wizard.swMain .dropup>.buttonFinish>.caret{border-top-color:#000 !important}.label{border:1px solid #000}.table{border-collapse:collapse !important}.table-bordered th,.table-bordered td{border:1px solid #ddd !important}}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Open Sans",Helvetica,Arial,sans-serif;font-size:12px;line-height:1.42857;color:#555;background-color:#313a45}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}button,input,select[multiple],textarea{background-image:none}a{color:#1ba6e5;text-decoration:none}a:hover,a:focus{color:#1275a1;text-decoration:underline}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}img{vertical-align:middle}.img-responsive{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail,.thumbnail{padding:4px;line-height:1.42857;background-color:#313a45;border:1px solid #ddd;border-radius:3px;-webkit-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:17px;margin-bottom:17px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0 0 0 0);border:0}p{margin:0 0 8.5px}.lead{margin-bottom:17px;font-size:13.8px;font-weight:200;line-height:1.4}@media (min-width: 768px){.lead{font-size:18px}}small{font-size:85%}cite{font-style:normal}.text-muted,.module_description,.hook_panel_header .hook_description{color:#999}.text-primary{color:#1ba6e5}.text-warning{color:#c09853}.text-danger{color:#b94a48}.text-success{color:#4688Line truncated
* Font Awesome 3.2.1 * Font Awesome 3.2.1
* the iconic font designed for Bootstrap * the iconic font designed for Bootstrap
* ------------------------------------------------------------------------------ * ------------------------------------------------------------------------------
@@ -30,4 +30,4 @@
* 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,.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,[class^="icon-"].panel-heading-action,[class*=" icon-"].pull-right,[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-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:none}.btn [class^="icon-"].icon-large,#carrier_wizard.swMain .buttonNext [class^="icon-"].icon-large,#carrier_wizard.swMain .buttonDisabled [class^="icon-"].icon-large,#carrier_wizard.swMain .buttonPrevious [class^="icon-"].icon-large,#carrier_wizard.swMain .buttonFinish [class^="icon-"].icon-large,.nav [class^="icon-"].icon-large,#header_notifs_icon_wrapper [class^="icon-"].icon-large,#header_employee_box [class^="icon-"].icon-large,#header_quick [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large,#carrier_wizard.swMain .buttonNext [class*=" icon-"].icon-large,#carrier_wizard.swMain .buttonDisabled [class*=" icon-"].icon-large,#carrier_wizard.swMain .buttonPrevious [class*=" icon-"].icon-large,#carrier_wizard.swMain .buttonFinish [class*=" icon-"].icon-large,.nav [class*=" icon-"].icon-large,#header_notifs_icon_wrapper [class*=" icon-"].icon-large,#header_employee_box [cLine 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 .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 [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 [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-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:none}.btn [class^="icon-"].icon-large,#carrier_wizard.swMLine truncated
admin-dev/themes/default/css/admin-theme.sass
+69 -81
View File
@@ -1,3 +1,6 @@
$brand-primary: #1BA6E5
//light //light
//$main-color: #F7F7F7 //$main-color: #F7F7F7
//$main-color: #DBD8CF //sable //$main-color: #DBD8CF //sable
@@ -11,12 +14,12 @@
//$main-color: #515561 //gris bleu clair //$main-color: #515561 //gris bleu clair
//$main-color: #4D4645 //taupe //$main-color: #4D4645 //taupe
//$main-color: #272822 //gris vert //$main-color: #272822 //gris vert
//$main-color: #313A45 //gris bleu $main-color: #313A45 //gris bleu
//$main-color: #443A42 //violet //$main-color: #443A42 //violet
//$main-color: #373E35 //vert camo //$main-color: #373E35 //vert camo
//$main-color: #262C3F //bleu nuit - pretty sure that a girl could do better naming the colors, sorry about that... //$main-color: #262C3F //bleu nuit - pretty sure that a girl could do better naming the colors, sorry about that...
//$main-color: #8C8574 //$main-color: #8C8574
$main-color: #3A3A4A //$main-color: #3A3A4A
//$secondary-color: white //blanc //$secondary-color: white //blanc
//$secondary-color: #F5792B //orange //$secondary-color: #F5792B //orange
@@ -34,7 +37,7 @@ $main-color: #3A3A4A
//$secondary-color: #60C276 //vert //$secondary-color: #60C276 //vert
//$secondary-color: #9DC44B //vert pomme //$secondary-color: #9DC44B //vert pomme
//$secondary-color: #6992AF //theme wordpress //$secondary-color: #6992AF //theme wordpress
//$secondary-color: #8BC954 //vert PrestaShop $secondary-color: #8BC954 //vert PrestaShop
//some tests //some tests
//$secondary-color: #79C09D //$secondary-color: #79C09D
@@ -43,7 +46,7 @@ $main-color: #3A3A4A
//$secondary-color: adjust-hue($main-color, 80%) //$secondary-color: adjust-hue($main-color, 80%)
//$hue: hue(adjust-hue($main-color, 80%)) //$hue: hue(adjust-hue($main-color, 80%))
//$secondary-color: hsl($hue, 50%, 50%) //Creates a Color from hue, saturation, and lightness values //$secondary-color: hsl($hue, 50%, 50%) //Creates a Color from hue, saturation, and lightness values
$secondary-color: #00A89C //$secondary-color: #00A89C
//dark and light, love and war, fire and ice, etc... //dark and light, love and war, fire and ice, etc...
$contrasted-dark-default: #333 $contrasted-dark-default: #333
@@ -136,7 +139,7 @@ html, body
padding: 36px 0 60px padding: 36px 0 60px
margin: 0 0 -60px 0 margin: 0 0 -60px 0
background-color: $bg-content-color background-color: $bg-content-color
background-image: url('../img/patterns/bedge_grunge.png') // texture //background-image: url('../img/patterns/bedge_grunge.png') // texture
#content #content
padding: 90px 20px 0 padding: 90px 20px 0
@@ -163,7 +166,8 @@ html, body
line-height: 30px line-height: 30px
font-weight: 300 font-weight: 300
text-transform: uppercase text-transform: uppercase
background-color: $bg-panel-heading-color background-color: white
border-bottom: solid 1px #ccc
i, a i, a
color: contrasted($bg-panel-heading-color) color: contrasted($bg-panel-heading-color)
.badge .badge
@@ -176,6 +180,23 @@ html, body
font-weight: 300 font-weight: 300
float: left float: left
margin-left: -5px margin-left: -5px
.panel-heading-action
@extend .pull-right
margin-right: -5px
a.list-tooolbar-btn
float: left
height: 30px
width: 30px
color: $brand-primary
border-left: solid 1px #ccc
&:hover
text-decoration: none
color: white
background-color: $brand-primary
i
text-align: center
font-size: 1.2em
line-height: 30px
.panel-danger .panel-heading .panel-danger .panel-heading
background-color: $badge-notif-color!important background-color: $badge-notif-color!important
.panel-heading-big .panel-heading-big
@@ -223,9 +244,6 @@ html, body
margin: 0 margin: 0
.nav-tabs > li > a .nav-tabs > li > a
color: #333 color: #333
> .active > a, > .active > a:hover
//color: #3399ff
//background: #f5f5f5
#nav-sidebar #nav-sidebar
height: 100%!important height: 100%!important
@@ -254,37 +272,31 @@ html, body
ul ul
display: none display: none
li.expanded li.expanded
.submenu_expand
@extend .icon-angle-up
ul ul
display: block display: block
background-color: white background-color: white
li.active li.active
.submenu_expand i .submenu_expand
display: none display: none
> ul > ul
> li > li
position: relative position: relative
&.active > a &.active > a
color: contrast-color($main-color, white, #333, 10%) color: contrast-color($brand-primary, white, #333, 10%)
background-color: $secondary-color background-color: $brand-primary
border-top: 1px solid lighten($secondary-color,5%)
border-bottom: 1px solid darken($secondary-color,20%)
@include box-shadow(darken($secondary-color,10%) -4px 0 0 inset)
i i
color: $brand-primary!important
background-color: white background-color: white
&.active:hover > a &.active:hover > a
color: contrast-color($main-color, white, #333, 10%) color: contrast-color($main-color, white, #333, 10%)
@include box-shadow(darken($secondary-color,10%) -4px 0 0 inset)
&:hover > a &:hover > a
@include box-shadow($brand-primary -4px 0 0 inset)
i i
color: $secondary-color!important
background-color: white background-color: white
> a > a
display: block display: block
position: relative position: relative
padding: 2px 0 2px 8px padding: 2px 0 2px 8px
border-top: 1px solid lighten($main-color,5%)
border-bottom: 1px solid darken($main-color,10%) border-bottom: 1px solid darken($main-color,10%)
font-size: 12px font-size: 12px
line-height: 28px line-height: 28px
@@ -296,7 +308,6 @@ html, body
@include transition-property(background-color, border, box-shadow) @include transition-property(background-color, border, box-shadow)
@include transition-duration(0.4s) @include transition-duration(0.4s)
@include transition-timing-function(ease-out) @include transition-timing-function(ease-out)
@include box-shadow(darken($main-color,15%) -4px 0 0 inset)
i i
color: lighten($main-color,25%) color: lighten($main-color,25%)
background-color: darken($main-color,25%) background-color: darken($main-color,25%)
@@ -308,19 +319,20 @@ html, body
.submenu_expand .submenu_expand
position: absolute position: absolute
right: 10px right: 10px
top: 11px top: 2px
cursor: pointer cursor: pointer
&:hover @extend .icon-angle-down
i font-family: FontAwesome
color: white font-size: 24px
i
font-size: 18px
font-weight: 100 font-weight: 100
color: black color: black
@include text-shadow(lighten($main-color,10%) 1px 1px 0) @include text-shadow(lighten($main-color,10%) 1px 1px 0)
background-color: transparent background-color: transparent
&:hover
color: white
@include text-shadow(darken($main-color,20%) -1px -1px 0)
ul.submenu ul.submenu
li
a a
display: block display: block
padding: 4px 5px 4px 10px padding: 4px 5px 4px 10px
@@ -328,21 +340,17 @@ html, body
border: none border: none
border-bottom: solid 1px #eee border-bottom: solid 1px #eee
background-color: white background-color: white
i
margin-top: 3px
color: $secondary-color
&:hover &:hover
color: $brand-primary color: $main-color
background-color: mix(white, $main-color, 90%) background-color: mix(white, $main-color, 90%)
text-decoration: none text-decoration: none
i &:last-child a
color: $main-color border-bottom: none
li.active &.active
a a
color: contrast-color($brand-primary, white, #333, 10%) color: contrast-color($secondary-color, white, #333, 10%)
background-color: $brand-primary background-color: $secondary-color
i border-bottom: solid 1px darken($secondary-color,10%)
color: contrast-color($brand-primary, white, #333, 10%)
@media (max-width: $screen-tablet) @media (max-width: $screen-tablet)
display: none display: none
@@ -357,10 +365,10 @@ html, body
display: none display: none
ul.submenu ul.submenu
display: none!important display: none!important
padding-top: 38px padding-top: 37px
position: relative position: relative
top: 0 top: 0
@include box-shadow(rgba(black,0.3) 2px 2px 4px) @include box-shadow(rgba(black,0.2) 1px 1px 0,rgba(black,0.3) 2px 2px 4px)
> ul > li:hover > ul > li:hover
width: 250px!important width: 250px!important
position: relative position: relative
@@ -391,10 +399,9 @@ html, body
text-align: center text-align: center
line-height: 55px line-height: 55px
display: block display: block
background-color: darken($secondary-color,10%) background-color: $main-color
border-bottom: 3px solid darken($secondary-color,20%) border-bottom: 3px solid darken($main-color,10%)
i color: darken($main-color,30%)
color: lighten($secondary-color,10%)
// Tool bar // Tool bar
@@ -570,18 +577,6 @@ input[type="password"].input-tiny
a a
text-decoration: none text-decoration: none
.btn-default
@include box-shadow(darken($btn-default-bg,10%) 0 -2px 0 inset)
.btn-primary
@include box-shadow(lighten($brand-success,30%) 0 -2px 0 inset)
.btn-default[disabled]
border-color: $gray-light
color: $gray-light
background-color: lighten($gray-light,35%)
@include box-shadow(lighten($gray-light,20%) 0 -2px 0 inset)
.btn .btn
text-transform: uppercase text-transform: uppercase
.caret .caret
@@ -589,6 +584,17 @@ input[type="password"].input-tiny
&:hover, &:focus &:hover, &:focus
.caret .caret
border-top-color: white!important border-top-color: white!important
&.btn-default
@include box-shadow(darken($btn-default-bg,10%) 0 -2px 0 inset)
&.btn-primary
@include box-shadow(lighten($brand-success,30%) 0 -2px 0 inset)
&.btn-default[disabled]
border-color: $gray-light
color: $gray-light
background-color: lighten($gray-light,35%)
@include box-shadow(lighten($gray-light,20%) 0 -2px 0 inset)
hr hr
border-color: darken($bg-content-color,10%) border-color: darken($bg-content-color,10%)
@@ -650,12 +656,10 @@ tr.filter
.badge .badge
background-color: $secondary-color background-color: $secondary-color
&.badge-success
.badge-success
@extend .badge @extend .badge
background-color: $brand-success background-color: $brand-success
&.badge-error
.badge-error
@extend .badge @extend .badge
background-color: $brand-danger background-color: $brand-danger
@@ -731,7 +735,7 @@ tr.filter
float: left float: left
//WIP //WIP (refacto, keep it simple, order ...)
//some helpers to get fixed width //some helpers to get fixed width
.fixed-width-XS .fixed-width-XS
@@ -817,8 +821,8 @@ fieldset > .row
fill: rgba(white,0.30) fill: rgba(white,0.30)
stroke-width: 0 stroke-width: 0
.highlighted .highlight
background-color: blue background-color: #FFFFC0
//.list-toolbar-btn //.list-toolbar-btn
#nav-topbar #nav-topbar
@@ -934,23 +938,7 @@ fieldset > .row
.btn-group .btn-group
text-align: left text-align: left
.panel-heading-action
@extend .pull-right
margin-right: -5px
a.list-tooolbar-btn
float: left
height: 30px
width: 30px
color: $brand-primary
border-left: solid 1px white
&:hover
text-decoration: none
color: white
background-color: $brand-primary
i
text-align: center
font-size: 1.2em
line-height: 30px
//DASHBOARD //DASHBOARD
admin-dev/themes/default/css/bootstrap/_variables.scss
+1 -6
View File
@@ -19,12 +19,7 @@ $gray-lighter: lighten(#000, 93.5%) ; //#eee
// Brand colors // Brand colors
// ------------------------- // -------------------------
//$brand-primary: #EF1778 ; //rose Prestashop //$brand-primary: #EF1778 ; //moved to admin-theme sass
//$brand-primary: #1EAEC0 ; //bleu turquoise
//$brand-primary: #33556E ;
//$brand-primary: #7F8AAE ;
$brand-primary: #1D7878 ;
$brand-success: #5cb85c ; $brand-success: #5cb85c ;
$brand-warning: #f0ad4e ; $brand-warning: #f0ad4e ;
admin-dev/themes/default/js/admin-theme.js
+1 -1
View File
@@ -23,7 +23,7 @@
*/ */
$( document ).ready(function() { $( document ).ready(function() {
$('#nav-sidebar li.maintab.has_submenu').append('<span class="submenu_expand"><i class="icon-collapse"></i></span>'); $('#nav-sidebar li.maintab.has_submenu').append('<span class="submenu_expand"></span>');
$('#nav-sidebar .submenu_expand').click(function(){ $('#nav-sidebar .submenu_expand').click(function(){
//var $tab = $(this).parent().data('submenu'); //var $tab = $(this).parent().data('submenu');
var $navId = $(this).parent(); var $navId = $(this).parent();
admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl
+2 -2
View File
@@ -63,7 +63,7 @@
<input type="checkbox" name="{$input.name}[]" id="{$id_checkbox}" value="{$value[$input.values.id]|intval}" {if isset($fields_value[$id_checkbox]) && $fields_value[$id_checkbox]}checked="checked"{/if} /> <input type="checkbox" name="{$input.name}[]" id="{$id_checkbox}" value="{$value[$input.values.id]|intval}" {if isset($fields_value[$id_checkbox]) && $fields_value[$id_checkbox]}checked="checked"{/if} />
{if $value['invoice']} {if $value['invoice']}
{$value[$input.values.name]} {$value[$input.values.name]}
<span class="badge-success"> <span class="badge badge-success">
{if isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']]} {if isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']]}
{$statusStats[$value['id_order_state']]} {$statusStats[$value['id_order_state']]}
{else} {else}
@@ -72,7 +72,7 @@
</span> </span>
{else} {else}
{$value[$input.values.name]} {$value[$input.values.name]}
<span class="badge-error"> <span class="badge badge-error">
{if isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']]} {if isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']]}
{$statusStats[$value['id_order_state']]} {$statusStats[$value['id_order_state']]}
{else} {else}
admin-dev/themes/default/template/layout-ajax.tpl
+1 -1
View File
@@ -34,7 +34,7 @@
{else} {else}
{if isset($conf)} {if isset($conf)}
<div class="alert"> <div class="alert alert-success">
{$conf} {$conf}
</div> </div>
{/if} {/if}
admin-dev/themes/default/template/layout.tpl
+2 -2
View File
@@ -58,9 +58,9 @@
</div> </div>
{/if} {/if}
{if isset($confirmations) && count($confirmations) && $confirmations} {if isset($confirmations) && count($confirmations) && $confirmations}
<div class="alert" style="display:block;"> <div class="alert alert-success" style="display:block;">
{foreach $confirmations as $conf} {foreach $confirmations as $conf}
{$conf}<br /> {$conf}
{/foreach} {/foreach}
</div> </div>
{/if} {/if}