Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By franck (9) and others # Via franck (3) and Etienne Roudeix (1) * 'master' of https://github.com/thelia/thelia: Added get/setLangId() method in session Refactored VariableXxxxx.php as ConfigXxxx.php Added name duplication check when creating a variable Completed the backoffice variable management update propel version and dependencies add some phpdoc Fixed getUrl() Typo :( Intriducec BaseI18nLoop, started variable config management Fixed URL::absoluteUrl() Fixed customer front controller, events, addec admion config. rewriting specific rewrittend url retrievement product page url global substitution sid : rewriting rewriting tables start rewriting Conflicts: core/lib/Thelia/Config/Resources/routing/admin.xml core/lib/Thelia/Core/Event/TheliaEvents.php
This commit is contained in:
@@ -216,6 +216,10 @@ hr {
|
||||
width: 23px;
|
||||
height: @top-bar-height;
|
||||
}
|
||||
|
||||
a.profile {
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
|
||||
.view-shop {
|
||||
@@ -233,10 +237,6 @@ hr {
|
||||
|
||||
.loginpage {
|
||||
|
||||
.brandbar {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.hero-unit {
|
||||
background-color: transparent !important;
|
||||
|
||||
@@ -316,6 +316,10 @@ hr {
|
||||
}
|
||||
}
|
||||
|
||||
.brandbar-wide {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
// -- Navigation bar ----------------------------------------------------------
|
||||
|
||||
.navbar {
|
||||
@@ -571,6 +575,11 @@ form .info .input-append .add-on {
|
||||
line-height: 30px;
|
||||
}
|
||||
|
||||
.title-without-tabs {
|
||||
border-bottom: 2px solid #A5CED8;
|
||||
margin-bottom: 0.5em;
|
||||
}
|
||||
|
||||
// The action bar on the right
|
||||
.actions {
|
||||
text-align: right;
|
||||
@@ -590,6 +599,8 @@ form .info .input-append .add-on {
|
||||
|
||||
line-height: 30px;
|
||||
margin-bottom: 1em;
|
||||
border-bottom: 1px dotted #A5CED8;
|
||||
padding-bottom: 0.5em;
|
||||
|
||||
.inner-actions {
|
||||
text-align: right;
|
||||
@@ -629,7 +640,7 @@ label {
|
||||
}
|
||||
|
||||
.input-append.input-block-level .add-on img {
|
||||
max-height: 18px;
|
||||
max-height: 16px;
|
||||
}
|
||||
|
||||
// Information in field label
|
||||
@@ -699,9 +710,12 @@ label {
|
||||
|
||||
line-height: 30px;
|
||||
|
||||
.btn-add-item {
|
||||
.action-btn {
|
||||
display: block;
|
||||
float: right;
|
||||
margin-left: 10px;
|
||||
|
||||
text-transform: none;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -717,4 +731,59 @@ label {
|
||||
// Center the alert box (20px bottom margin) in the table cell
|
||||
padding: 20px 20px 0 20px;
|
||||
}
|
||||
|
||||
th {
|
||||
a {
|
||||
color: inherit;
|
||||
}
|
||||
}
|
||||
|
||||
td {
|
||||
vertical-align: middle;
|
||||
|
||||
img {
|
||||
border: 2px solid white;
|
||||
border-radius: 4px 4px 4px 4px;
|
||||
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
&.actions {
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.menu-list-table .table-striped {
|
||||
td, th {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
td:nth-child(2) {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
caption {
|
||||
background-color: #FFFFFF;
|
||||
border-bottom: 2px solid #A5CED8;
|
||||
color: #5A6876;
|
||||
font-weight: bold;
|
||||
line-height: 30px;
|
||||
text-align: left;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
}
|
||||
|
||||
.table-left-aligned {
|
||||
th, td {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
// Modal is no longer limited
|
||||
.modal-body {
|
||||
max-height: none;
|
||||
}
|
||||
Reference in New Issue
Block a user