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

// Cleaned CSS files

Browse Source
This commit is contained in:
Kevin Granger
2013-11-04 18:31:59 +01:00
parent 2a9ebaa6ed
commit 8aedd4eb04
8 changed files with 54 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-mail.css
-9
View File
File diff suppressed because one or more lines are too long
admin-dev/themes/default/css/admin-mail.sass
-5
View File
@@ -1,5 +0,0 @@
@import "compass"
@import "admin-theme/admin-email-colors"
@import "admin-theme/_bootstrap-variables"
@import "admin-theme/_bootstrap-email-init"
@import "admin-theme/_email"
admin-dev/themes/default/css/admin-theme/_admin-email-colors.sass
-76
View File
@@ -1,76 +0,0 @@
//light
//$main-color: #F7F7F7
//$main-color: #DBD8CF //sable
//$main-color: #CFD7DD //bleu
//$main-color: #E0E0E0 //gris
//$main-color: #D7D6DE //violet
//$main-color: #F1F8FE //theme wordpress
//dark
//$main-color: #272A31 //bleu PrestaShop
//$main-color: #3D3D3D //gris
$main-color: #515561 //gris bleu clair
//$main-color: #4D4645 //taupe
//$main-color: #272822 //gris vert
//$main-color: #313A45 //gris bleu
//$main-color: #7B8676
//$main-color: #443A42 //violet
//$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: #8C8574
//$main-color: #3A3A4A
//$secondary-color: white //blanc
//$secondary-color: #F5792B //orange
//$secondary-color: #81A98C //vert d'eau
//$secondary-color: #1EAEC0 //bleu
//$secondary-color: #00C3C1 //turquoise
//$secondary-color: #97C885 //vert menthe
//$secondary-color: #4691D2 //bleu ciel
//$secondary-color: #814C76 //violet
//$secondary-color: #FE635F //saumon
//$secondary-color: #FFB4B8 //rose
//$secondary-color: #F2B100 //moutarde
//$secondary-color: #F6A88A //abricot
//$secondary-color: #937976 //taupe clair
//$secondary-color: #60C276 //vert
$secondary-color: #8FC04D //vert pomme
//$secondary-color: #6992AF //theme wordpress
//$secondary-color: #8BC954 //vert PrestaShop
//$secondary-color: #AB7073
//$secondary-color: black
$brand-primary: #1BA6E5
//$brand-primary: #1BA6E5
//some tests
//$secondary-color: #79C09D
//$secondary-color: invert($main-color)
//$secondary-color: lighten(invert($main-color),20%)
//$secondary-color: 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: #00A89C
//dark and light, love and war, fire and ice, etc...
$contrasted-dark-default: #333
$contrasted-light-default: white
$contrasted-lightness-threshold: 10% //30% default
//50 shades of gray
//$bg-content-color: #F8F9FB //bleu gris clair
//$bg-content-color: #F8FBF8 //vert gris clair
//$bg-content-color: #F8F4E3 //gris foncé
//$bg-content-color: #F6F6F6 //gris
$bg-content-color: #F8F8F8 //gris
//heading
//$bg-header-color: darken($secondary-color,20%)
$bg-header-color: #242424
$bg-footer-color: #242424
$bg-page-head-color : $secondary-color
$bg-panel-heading-color: hsl(hue($secondary-color), 10, 90)
//others
$badge-notif-color: #8BC954
$icon-color: #87C795
admin-dev/themes/default/css/admin-theme/_bootstrap-email-init.scss
-54
View File
@@ -1,54 +0,0 @@
/*!
* Bootstrap v3.0.0
*
* Copyright 2013 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
// Core variables and mixins
@import "../bower_components/sass-bootstrap/lib/variables";
@import "../bower_components/sass-bootstrap/lib/mixins";
// Reset
@import "../bower_components/sass-bootstrap/lib/normalize";
//@import "../bower_components/sass-bootstrap/lib/print";
// Core CSS
@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";
// 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";
// Utility classes
@import "../bower_components/sass-bootstrap/lib/utilities";
@import "../bower_components/sass-bootstrap/lib/responsive-utilities";
admin-dev/themes/default/css/admin-theme/_email.scss
-3
View File
@@ -1,3 +0,0 @@
#idtest{
background-color: red;
}
admin-dev/themes/default/css/admin-theme/email.css
-110
View File
@@ -1,110 +0,0 @@
body{
background-color: #ffffff;
width:650px;
margin:auto;
font-family: "Open-sans", sans-serif;
color: #555454;
font-size: 13px;
line-height: 18px
}
table{width:100%;}
.table tbody > tr > td {
border:none;
padding:7px 0
}
td.space {width:20px;}
td.space_footer {padding:0 !important;}
.table .table{background-color: #ffffff;}
table.table-mail{
margin-top:10px;
-moz-box-shadow: 0 0 5px #afafaf;
-webkit-box-shadow: 0 0 5px #afafaf;
-o-box-shadow: 0 0 5px #afafaf;
box-shadow: 0 0 5px #afafaf;
filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf, Direction=134, Strength=5);
}
table.table-recap tbody > tr > td, .table-recap thead > tr > th{
border: 1px solid #DDDDDD !important
}
table.table-recap td{
padding:10px !important;
color:#777777;
}
.table .table-recap thead > tr > th{
background-color: #fbfbfb;
padding:10px;
font-family: Arial;
color:#333333;
font-size: 13px
}
table.table-recap .conf_body td{color:#333333;}
table.table-recap .conf_body td.total{
color:#555454;
font-size:18px;
font-weight:500;
font-family: "Open-sans", sans-serif;
}
table.table-recap .conf_body td.total_amount{
color:#333333;
font-size: 21px;
font-weight:500;
font-family: "Open-sans", sans-serif;
}
a{color: #337ff1}
td.logo{
border-bottom: 4px solid #333333 !important;
}
p{margin:3px 0 7px 0;}
span.title{
font-weight: 500;
font-size: 28px;
text-transform: uppercase;
line-height: 33px;
}
span.subtitle{
font-weight: 500;
font-size: 16px;
text-transform: uppercase;
line-height: 25px;
}
td.box{
background-color: #fbfbfb;
padding: 10px !important;
border: 1px solid #d6d4d4 !important;
}
td.box p{
text-transform: uppercase;
font-weight: 500;
font-size: 18px;
border-bottom: 1px solid #d6d4d4 !important;
padding-bottom: 10px
}
td.box span{
color:#777777;
}
td.box span span{
color:#333333;
}
td.footer{
border-top: 4px solid #333333 !important
}
controllers/admin/AdminModulesController.php
-3
View File
@@ -1023,9 +1023,6 @@ class AdminModulesControllerCore extends AdminController
public function initContent()
{
// Adding Css
//$this->addCSS(__PS_BASE_URI__.str_replace(_PS_ROOT_DIR_.DIRECTORY_SEPARATOR, '', _PS_ADMIN_DIR_).'/themes/'.$this->bo_theme.'/css/modules.css', 'all');
// If we are on a module configuration, no need to load all modules
if (Tools::getValue('configure') != '')
return true;
css/bootstrap_admin_reset.sass
+54
View File
@@ -0,0 +1,54 @@
#nobootstrap
a
line-height: normal
.categorieList a
line-height: 20px
p
line-height: normal
legend
font-size: 13px
line-height: 20px
width: auto!important
label
font-size: 13px
display: inline
line-height: normal
.breadcrumb
padding:0
li
line-height:normal
select, textarea, 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
label, input, button, select, textarea
font-size: 12px
line-height: 13px
input[type="radio"], input[type="checkbox"]
margin: 0
input[type="text"]
height: 14px!important
table.table
margin: 0
padding: 0
width: 100%
border-collapse: collapse
table.widthfull
width: 100%
.table thead th
vertical-align:top
.table th, .table td
line-height: normal
vertical-align: middle
border-top: none
#header #header_search #bo_search_submit
height: 25px!important
[class^="icon-"], [class*=" icon-"]
width: auto
.toolbarBox [class^="process-icon-"], .toolbarBox [class*=" process-icon-"]
text-indent: -9000px
overflow: hidden