Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
This commit is contained in:
Jerome Nadaud committed
commit
5ce139e7f1
4 files changed
+22
-19
No files matched your search
@@ -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,.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,.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{line-height:.9em}.btn [class^="icon-"].icon-spin,.nav [class^="icon-"].icon-spin,#header_notifs_icon_wrapper [class^="icon-"].icon-spin,#header_employee_box [class^="icon-"].icon-spin,#header_quick [class^="icon-"].icon-spin,.btn [class*=" icon-"].icon-spin,.nav [class*=" icon-"].icon-spin,#header_notifs_icon_wrapper [class*=" icon-"].icon-spin,#header_employee_box [class*=" icon-"].icon-spin,#header_quick [class*=" icon-"].icon-spin{display:inline-blockLine 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,.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,.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,.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{line-height:.9em}.btn [class^="icon-"].icon-spin,.nav [class^="icon-"].icon-spin,#header_notifs_icon_wrapper [class^="icon-"].icon-spin,#header_employee_box [class^="icon-"].icon-spin,#header_quick [class^="icon-"].icon-spin,.btn [class*=" icon-"].icon-spin,.nav [class*=" icon-"].icon-spin,#header_notifs_icon_wrapper [class*=" icon-"].icon-spin,#header_employee_box [class*=" icon-"].icon-spin,#header_quick [class*=" icon-"].icon-spin{display:inline-blockLine truncated
|
||||||
@@ -84,9 +84,7 @@ html, body
|
|||||||
background-color: $bg-header-color
|
background-color: $bg-header-color
|
||||||
#header_shopname
|
#header_shopname
|
||||||
@extend .navbar-brand
|
@extend .navbar-brand
|
||||||
font-size: 1.3em
|
font: 300 1.3em/100% $headings-font-family
|
||||||
font-family: "ubuntu"
|
|
||||||
font-weight: 300
|
|
||||||
#header_notifs_icon_wrapper
|
#header_notifs_icon_wrapper
|
||||||
@extend .hidden-xs
|
@extend .hidden-xs
|
||||||
@extend .nav
|
@extend .nav
|
||||||
@@ -169,7 +167,7 @@ html, body
|
|||||||
color: contrasted($bg-panel-heading-color)
|
color: contrasted($bg-panel-heading-color)
|
||||||
.badge
|
.badge
|
||||||
background-color: lighten($bg-panel-heading-color,20%)
|
background-color: lighten($bg-panel-heading-color,20%)
|
||||||
border-radius: 0
|
@include border-radius(none)
|
||||||
height: 29px
|
height: 29px
|
||||||
line-height: 25px
|
line-height: 25px
|
||||||
font-size: 1.3em
|
font-size: 1.3em
|
||||||
@@ -239,7 +237,7 @@ html, body
|
|||||||
border-top: 1px black solid
|
border-top: 1px black solid
|
||||||
.maintab > a [class^="icon-"], .menu .maintab > a [class*=" icon-"]
|
.maintab > a [class^="icon-"], .menu .maintab > a [class*=" icon-"]
|
||||||
font-size: 20px
|
font-size: 20px
|
||||||
border-radius: 40px
|
@include border-radius(40px)
|
||||||
height: 30px
|
height: 30px
|
||||||
width: 30px
|
width: 30px
|
||||||
color: white
|
color: white
|
||||||
@@ -260,6 +258,7 @@ html, body
|
|||||||
background-color: white
|
background-color: white
|
||||||
> ul
|
> ul
|
||||||
> li
|
> li
|
||||||
|
position: relative
|
||||||
&.active > a
|
&.active > a
|
||||||
color: contrast-color($main-color, white, #333, 10%)
|
color: contrast-color($main-color, white, #333, 10%)
|
||||||
background-color: $secondary-color
|
background-color: $secondary-color
|
||||||
@@ -299,9 +298,8 @@ html, body
|
|||||||
@include transition-property(color)
|
@include transition-property(color)
|
||||||
@include transition-duration(0.4s)
|
@include transition-duration(0.4s)
|
||||||
@include transition-timing-function(ease-out)
|
@include transition-timing-function(ease-out)
|
||||||
img
|
|
||||||
margin-right: 10px
|
|
||||||
ul.submenu
|
ul.submenu
|
||||||
|
@include box-shadow(rgba(black,0.3) 2px 2px 4px)
|
||||||
a
|
a
|
||||||
display: block
|
display: block
|
||||||
padding: 2px 5px 2px 10px
|
padding: 2px 5px 2px 10px
|
||||||
@@ -337,6 +335,9 @@ html, body
|
|||||||
span.title
|
span.title
|
||||||
display: none
|
display: none
|
||||||
ul.submenu
|
ul.submenu
|
||||||
|
padding-top: 38px
|
||||||
|
position: relative
|
||||||
|
top: 0
|
||||||
display: none!important
|
display: none!important
|
||||||
> ul > li:hover
|
> ul > li:hover
|
||||||
width: 250px!important
|
width: 250px!important
|
||||||
@@ -863,15 +864,15 @@ fieldset > .row
|
|||||||
@include border-radius(3px)
|
@include border-radius(3px)
|
||||||
.module_col_select
|
.module_col_select
|
||||||
display: table-cell
|
display: table-cell
|
||||||
vertical-align: middle
|
|
||||||
text-align: center
|
|
||||||
width: 22px
|
width: 22px
|
||||||
min-height: 35px
|
min-height: 35px
|
||||||
|
vertical-align: middle
|
||||||
|
text-align: center
|
||||||
border-right: 1px solid #ddd
|
border-right: 1px solid #ddd
|
||||||
.module_col_position
|
.module_col_position
|
||||||
display: table-cell
|
display: table-cell
|
||||||
vertical-align: middle
|
|
||||||
width: 60px
|
width: 60px
|
||||||
|
vertical-align: middle
|
||||||
text-align: right
|
text-align: right
|
||||||
.positions
|
.positions
|
||||||
font-family: $headings-font-family
|
font-family: $headings-font-family
|
||||||
@@ -886,19 +887,21 @@ fieldset > .row
|
|||||||
background-color: #eee
|
background-color: #eee
|
||||||
.module_col_icon
|
.module_col_icon
|
||||||
display: table-cell
|
display: table-cell
|
||||||
|
width: 50px
|
||||||
text-align: center
|
text-align: center
|
||||||
vertical-align: middle
|
vertical-align: middle
|
||||||
width: 50px
|
|
||||||
.module_col_infos
|
.module_col_infos
|
||||||
display: table-cell
|
display: table-cell
|
||||||
vertical-align: middle
|
|
||||||
height: 50px
|
height: 50px
|
||||||
|
vertical-align: middle
|
||||||
|
|
||||||
.module_col_actions
|
.module_col_actions
|
||||||
width: 160px
|
|
||||||
display: table-cell
|
display: table-cell
|
||||||
|
width: 160px
|
||||||
|
padding: 0 10px
|
||||||
vertical-align: middle
|
vertical-align: middle
|
||||||
text-align: right
|
text-align: right
|
||||||
padding: 0 10px
|
|
||||||
.btn-group
|
.btn-group
|
||||||
text-align: left
|
text-align: left
|
||||||
|
|
||||||
@@ -1055,8 +1058,8 @@ fieldset > .row
|
|||||||
text-align: center
|
text-align: center
|
||||||
height: 37px
|
height: 37px
|
||||||
line-height: 1em
|
line-height: 1em
|
||||||
font-size: 1.1em
|
font: 300 1.1em/120% $headings-font-family
|
||||||
font-weight: 300
|
|
||||||
svg
|
svg
|
||||||
height: 350px
|
height: 350px
|
||||||
|
|
||||||
|
|||||||
@@ -59,7 +59,7 @@
|
|||||||
{if isset($input.label)}
|
{if isset($input.label)}
|
||||||
<label for="{if isset($input.id)}{$input.id}{if isset($input.lang) AND $input.lang}_{$current_id_lang}{/if}{else}{$input.name}{if isset($input.lang) AND $input.lang}_{$current_id_lang}{/if}{/if}" class="control-label col-lg-3 {if isset($input.required) && $input.required && $input.type != 'radio'}required{/if}">
|
<label for="{if isset($input.id)}{$input.id}{if isset($input.lang) AND $input.lang}_{$current_id_lang}{/if}{else}{$input.name}{if isset($input.lang) AND $input.lang}_{$current_id_lang}{/if}{/if}" class="control-label col-lg-3 {if isset($input.required) && $input.required && $input.type != 'radio'}required{/if}">
|
||||||
{if isset($input.hint)}
|
{if isset($input.hint)}
|
||||||
<span class="label-tooltip" data-toggle="tooltip"
|
<span class="label-tooltip" data-toggle="tooltip" data-html="true"
|
||||||
title="
|
title="
|
||||||
{if is_array($input.hint)}
|
{if is_array($input.hint)}
|
||||||
{foreach $input.hint as $hint}
|
{foreach $input.hint as $hint}
|
||||||
|
|||||||
@@ -76,7 +76,7 @@
|
|||||||
{block name="label"}
|
{block name="label"}
|
||||||
{if isset($field['title']) && isset($field['hint'])}
|
{if isset($field['title']) && isset($field['hint'])}
|
||||||
<label class="control-label col-lg-3 {if isset($field['required']) && $field['required'] && $field['type'] != 'radio'}required{/if}">
|
<label class="control-label col-lg-3 {if isset($field['required']) && $field['required'] && $field['type'] != 'radio'}required{/if}">
|
||||||
<span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{$field['hint']}">
|
<span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{$field['hint']}" data-html="true">
|
||||||
{$field['title']}
|
{$field['title']}
|
||||||
</span>
|
</span>
|
||||||
</label>
|
</label>
|
||||||
|
|||||||
Reference in new issue
Block a user