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

// update bower with latest bootstrap 3.0.0 + fix layout

Browse Source
This commit is contained in:
Kevin Granger
2013-08-21 17:17:24 +02:00
parent d6b50a7f0c
commit 93e03a3c3b
224 changed files with 3413 additions and 33945 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/_bootstrap.scss
+40 -44
View File
@@ -9,55 +9,51 @@
*/
// Core variables and mixins
@import "../components/sass-twitter-bootstrap/lib/variables";
@import "../components/sass-twitter-bootstrap/lib/mixins";
@import "../bower_components/sass-bootstrap/lib/variables";
@import "../bower_components/sass-bootstrap/lib/mixins";
// Reset
@import "../components/sass-twitter-bootstrap/lib/normalize";
@import "../components/sass-twitter-bootstrap/lib/print";
@import "../bower_components/sass-bootstrap/lib/normalize";
@import "../bower_components/sass-bootstrap/lib/print";
// Core CSS
@import "../components/sass-twitter-bootstrap/lib/scaffolding";
@import "../components/sass-twitter-bootstrap/lib/type";
@import "../components/sass-twitter-bootstrap/lib/code";
@import "../components/sass-twitter-bootstrap/lib/grid";
@import "../bower_components/sass-bootstrap/lib/scaffolding";
@import "../bower_components/sass-bootstrap/lib/type";
@import "../bower_components/sass-bootstrap/lib/code";
@import "../bower_components/sass-bootstrap/lib/grid";
@import "../bower_components/sass-bootstrap/lib/tables";
@import "../bower_components/sass-bootstrap/lib/forms";
@import "../bower_components/sass-bootstrap/lib/buttons";
@import "../components/sass-twitter-bootstrap/lib/tables";
@import "../components/sass-twitter-bootstrap/lib/forms";
@import "../components/sass-twitter-bootstrap/lib/buttons";
// Components
@import "../bower_components/sass-bootstrap/lib/component-animations";
@import "../bower_components/sass-bootstrap/lib/glyphicons";
@import "../bower_components/sass-bootstrap/lib/dropdowns";
@import "../bower_components/sass-bootstrap/lib/button-groups";
@import "../bower_components/sass-bootstrap/lib/input-groups";
@import "../bower_components/sass-bootstrap/lib/navs";
@import "../bower_components/sass-bootstrap/lib/navbar";
@import "../bower_components/sass-bootstrap/lib/breadcrumbs";
@import "../bower_components/sass-bootstrap/lib/pagination";
@import "../bower_components/sass-bootstrap/lib/pager";
@import "../bower_components/sass-bootstrap/lib/labels";
@import "../bower_components/sass-bootstrap/lib/badges";
@import "../bower_components/sass-bootstrap/lib/jumbotron";
@import "../bower_components/sass-bootstrap/lib/thumbnails";
@import "../bower_components/sass-bootstrap/lib/alerts";
@import "../bower_components/sass-bootstrap/lib/progress-bars";
@import "../bower_components/sass-bootstrap/lib/media";
@import "../bower_components/sass-bootstrap/lib/list-group";
@import "../bower_components/sass-bootstrap/lib/panels";
@import "../bower_components/sass-bootstrap/lib/wells";
@import "../bower_components/sass-bootstrap/lib/close";
// Components: common
@import "../components/sass-twitter-bootstrap/lib/component-animations";
@import "../components/sass-twitter-bootstrap/lib/dropdowns";
@import "../components/sass-twitter-bootstrap/lib/list-group";
@import "../components/sass-twitter-bootstrap/lib/panels";
@import "../components/sass-twitter-bootstrap/lib/wells";
@import "../components/sass-twitter-bootstrap/lib/close";
// Components: Nav
@import "../components/sass-twitter-bootstrap/lib/navs";
@import "../components/sass-twitter-bootstrap/lib/navbar";
@import "../components/sass-twitter-bootstrap/lib/button-groups";
@import "../components/sass-twitter-bootstrap/lib/breadcrumbs";
@import "../components/sass-twitter-bootstrap/lib/pagination";
@import "../components/sass-twitter-bootstrap/lib/pager";
// Components: Popovers
@import "../components/sass-twitter-bootstrap/lib/modals";
@import "../components/sass-twitter-bootstrap/lib/tooltip";
@import "../components/sass-twitter-bootstrap/lib/popovers";
// Components: Misc
@import "../components/sass-twitter-bootstrap/lib/alerts";
@import "../components/sass-twitter-bootstrap/lib/thumbnails";
@import "../components/sass-twitter-bootstrap/lib/media";
@import "../components/sass-twitter-bootstrap/lib/labels";
@import "../components/sass-twitter-bootstrap/lib/badges";
@import "../components/sass-twitter-bootstrap/lib/progress-bars";
@import "../components/sass-twitter-bootstrap/lib/accordion";
//@import "../components/sass-twitter-bootstrap/lib/carousel";
//@import "../components/sass-twitter-bootstrap/lib/jumbotron";
// Components w/ JavaScript
@import "../bower_components/sass-bootstrap/lib/modals";
@import "../bower_components/sass-bootstrap/lib/tooltip";
@import "../bower_components/sass-bootstrap/lib/popovers";
@import "../bower_components/sass-bootstrap/lib/carousel";
// Utility classes
@import "../components/sass-twitter-bootstrap/lib/utilities"; // Has to be last to override when necessary
@import "../components/sass-twitter-bootstrap/lib/responsive-utilities";
@import "../bower_components/sass-bootstrap/lib/utilities";
@import "../bower_components/sass-bootstrap/lib/responsive-utilities";
admin-dev/themes/default/css/admin-theme.css
+2857 -1184
View File
File diff suppressed because it is too large Load Diff
admin-dev/themes/default/css/admin-theme.sass
+71 -53
View File
@@ -1,4 +1,5 @@
//light #F7F7F7
//light
//$main-color: #F7F7F7
//$main-color: #DBD8CF //sable
//$main-color: #CFD7DD //bleu
//$main-color: #E0E0E0
@@ -70,50 +71,84 @@ $icon-color: #87C795
@import "compass"
@import "bootstrap/variables"
//@import "bootstrap.min.css"
@import "bootstrap"
@import "font-awesome"
@import "toggle-switch"
html, body
height: 100%
//min-height: 700px
body.fixed-top
//position: relative
#header_infos
@extend .navbar
//@extend .navbar-default
@extend .navbar-inverse
@extend .navbar-fixed-top
background-color: $bg-header-color
z-index: 9999
#header_shopname
font-size: 1.6em
font-family: "ubuntu"
font-weight: 300
#notifs_icon_wrapper
i
font-size: 1.5em
.badge
background-color: $badge-notif-color
#header_shopname
@extend .navbar-brand
font-size: 1.3em
font-family: "ubuntu"
font-weight: 300
#header_notifs_icon_wrapper
@extend .hidden-xs
@extend .nav
@extend .navbar-nav
> li > a > i
font-size: 1.2em
color: white
.notifs_badge
@extend .badge
background-color: $badge-notif-color
.notifs_dropdown
background-color: transparent
border: none
box-shadow: none
.notifs_panel
@extend .panel
@extend .panel-default
width: 300px
@include box-shadow(rgba(black,0.5) 2px 2px 8px)
.notifs_panel_header
@extend .panel-heading
h3
padding: 0
font-size: 1.3em
margin: 0
.notifs_panel_footer
@extend .panel-footer
#header_nav_toggle
background-color: black
border: none
color: white
#header_employee_box
@extend .nav
@extend .navbar-nav
@extend .navbar-right
#header_search
@extend .navbar-form
@extend .navbar-left
#header_quick
@extend .nav
@extend .navbar-nav
@extend .navbar-left
#main
min-height: 100%
height: auto!important
padding: 38px 0 60px
//height: auto!important
padding: 36px 0 60px
margin: 0 0 -60px 0
background-color: $bg-content-color
//background-image: url('../img/patterns/bedge_grunge.png') // texture
.container-fluid, .row-fluid
width: 100%
#content
padding: 90px 20px 100px
padding: 90px 20px 0
margin-left: 240px
@include transition-property(margin)
@include transition-duration(0.4s)
@include transition-timing-function(ease-out)
//overflow-x: scroll
//background-image: url('../img/patterns/bedge_grunge.png') // texture
fieldset, .panel
padding: 20px
margin-bottom: 20px
@@ -174,7 +209,7 @@ body.fixed-top
margin: 0
border-bottom: 4px solid darken($secondary-color,10%)
position: fixed
top: 38px
top: 36px
left: 0px
z-index: 499
background-color: $secondary-color
@@ -182,13 +217,14 @@ body.fixed-top
h2.page-title
@extend .pull-left
padding: 0 0 0 260px
font-size: 20px
font-size: 18px
color: white
text-transform: uppercase
@media (max-width: $screen-tablet)
padding: 0 0 0 20px
.btn-toolbar
margin: 0
padding: 3px 0 0 0
.nav-tabs
margin: 0
.nav-tabs > li > a
@@ -197,7 +233,7 @@ body.fixed-top
//color: #3399ff
//background: #f5f5f5
#sidebar
#nav-sidebar
height: 100%!important
z-index: 500
float: left
@@ -286,7 +322,6 @@ body.fixed-top
border: none
border-bottom: solid 1px #eee
background-color: white
//@include box-shadow($main-color -4px 0 0 inset)
i
margin-top: 3px
color: $secondary-color
@@ -294,7 +329,6 @@ body.fixed-top
color: $brand-primary
background-color: mix(white, $main-color, 90%)
text-decoration: none
//@include box-shadow($brand-primary -4px 0 0 inset)
i
color: $main-color
&.active
@@ -303,9 +337,11 @@ body.fixed-top
background-color: $brand-primary
i
color: $main-color
@media (max-width: $screen-tablet)
display: none
.page-sidebar-closed
#sidebar
#nav-sidebar
width: 50px
@include transition-property(width)
@include transition-duration(0.4s)
@@ -335,14 +371,14 @@ body.fixed-top
width: 100%
.menu-collapse
height: 55px
height: 54px
width: 100%
font-size: 2em
text-align: center
line-height: 55px
display: block
background-color: darken($secondary-color,10%)
border-bottom: 4px solid darken($secondary-color,20%)
border-bottom: 3px solid darken($secondary-color,20%)
i
color: lighten($secondary-color,10%)
@@ -531,17 +567,9 @@ input[type="password"].input-tiny
.btn-default
@include box-shadow(darken($btn-default-bg,10%) 0 -2px 0 inset)
&:hover, &:focus
background-color: $gray
border-color: $gray-darker
@include box-shadow($gray-darker 0 -2px 0 inset)
.btn-primary
@include box-shadow(lighten($brand-success,30%) 0 -2px 0 inset)
&:hover, &:focus
background-color: $gray
border-color: $gray-darker
@include box-shadow($gray-darker 0 -2px 0 inset)
.btn-default[disabled]
border-color: $gray-light
@@ -635,7 +663,6 @@ tr.filter
font-size: 4em
color: darken($bg-content-color,20%)
#module-list
h3
position: relative
@@ -701,6 +728,9 @@ tr.filter
#nobootstrap
float: left
//WIP
.box-stats
padding: 10px
margin-bottom: 20px
@@ -765,25 +795,13 @@ tr.filter
fill: rgba(white,0.30)
stroke-width: 0
.highlighted
background-color: blue
.notification-panel
@extend .panel
padding: 15px
margin: 0
width: 300px
@include box-shadow(rgba(black,0.50) 2px 2px 10px)
.notification-dropdown
background-color: transparent
border: none
box-shadow: none
.list-toolbar-btn
//WIP
#topbar
position: fixed
left: 80