From d0df86e4f126222fd47f854c78fb4abe2e371330 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Mon, 14 Sep 2015 14:53:34 +0200 Subject: [PATCH] Trinity updated --- .../Configuration/CrudConfiguration.php | 20 +- .../Controller/BaseAdminController.php | 6 +- .../Resources/public/css/accordion.less | 28 - .../Resources/public/css/alerts.less | 77 --- .../Resources/public/css/alerts_badges.less | 152 ----- .../Resources/public/css/bootstrap.less | 67 -- .../Resources/public/css/breadcrumbs.less | 22 - .../Resources/public/css/button-groups.less | 148 ----- .../Resources/public/css/buttons.less | 183 ------ .../Resources/public/css/carousel.less | 121 ---- .../Resources/public/css/close.less | 18 - .../Resources/public/css/code.less | 57 -- .../public/css/component-animations.less | 18 - .../Resources/public/css/dropdowns.less | 128 ---- .../Resources/public/css/fileupload.less | 132 ---- .../Resources/public/css/forms.less | 522 ---------------- .../Resources/public/css/grid.less | 8 - .../Resources/public/css/hero-unit.less | 20 - .../Resources/public/css/labels.less | 32 - .../Resources/public/css/layouts.less | 17 - .../Resources/public/css/mixins.less | 590 ------------------ .../Resources/public/css/modals.less | 87 --- .../Resources/public/css/navbar.less | 299 --------- .../Resources/public/css/navs.less | 353 ----------- .../Resources/public/css/pager.less | 30 - .../Resources/public/css/pagination.less | 55 -- .../Resources/public/css/popovers.less | 49 -- .../Resources/public/css/progress-bars.less | 95 --- .../Resources/public/css/reset.less | 126 ---- .../Resources/public/css/responsive.less | 327 ---------- .../Resources/public/css/scaffolding.less | 29 - .../Resources/public/css/sprites.less | 460 -------------- .../Resources/public/css/style.css | 6 +- .../Resources/public/css/tables.less | 150 ----- .../Resources/public/css/thumbnails.less | 35 -- .../Resources/public/css/tooltip.less | 35 -- .../Resources/public/css/type.less | 220 ------- .../Resources/public/css/utilities.less | 23 - .../Resources/public/css/variables.less | 108 ---- .../Resources/public/css/wells.less | 17 - .../AdminBundle/Resources/public/js/admin.js | 2 +- .../translations/TrinityAdminBundle.en.yml | 2 +- .../Resources/views/BaseAdmin/index.html.twig | 4 +- .../BaseAdmin/indexContextMenu.html.twig | 8 +- .../ContentManagerBundle/Model/PageQuery.php | 22 +- .../ContentManagerBundle/Page/PageManager.php | 9 + .../Routing/NodeLoader.php | 9 +- .../Twig/Extension/ZoneExtension.php | 12 +- .../TemplateCrudConfiguration.php | 2 +- .../Form/Type/TemplateFilterType.php | 32 +- .../Form/Type/TemplateType.php | 2 +- .../NotificationBundle/Model/Template.php | 7 + .../Notifier/BasicNotifier.php | 1 + .../translations/TrinityUserBundle.en.yml | 8 +- .../Controller/VarsAdminController.php | 58 +- .../Resources/views/VarsAdmin/index.html.twig | 23 +- .../Twig/Extension/GlobalVarsExtension.php | 4 +- .../translations/TrinityWidgetBundle.en.yml | 2 +- 58 files changed, 163 insertions(+), 4914 deletions(-) delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/accordion.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/alerts.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/alerts_badges.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/bootstrap.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/breadcrumbs.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/button-groups.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/buttons.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/carousel.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/close.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/code.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/component-animations.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/dropdowns.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/fileupload.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/forms.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/grid.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/hero-unit.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/labels.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/layouts.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/mixins.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/modals.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/navbar.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/navs.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/pager.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/pagination.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/popovers.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/progress-bars.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/reset.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/responsive.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/scaffolding.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/sprites.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/tables.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/thumbnails.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/tooltip.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/type.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/utilities.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/variables.less delete mode 100644 vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/wells.less diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Configuration/CrudConfiguration.php b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Configuration/CrudConfiguration.php index 0e0c6a0..c54acc8 100644 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Configuration/CrudConfiguration.php +++ b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Configuration/CrudConfiguration.php @@ -31,27 +31,27 @@ class CrudConfiguration protected $fieldsnames = array(); protected $filterDisplayFields = array(); - protected $filtersMethods = array(); - protected $filtersTemplates = array(); - protected $filterNamespace = null; - protected $filter = null; - protected $filterValue = null; + protected $filtersMethods = array(); + protected $filtersTemplates = array(); + protected $filterNamespace = null; + protected $filter = null; + protected $filterValue = null; protected $listTitle = null; protected $editTitle = null; protected $newTitle = null; protected $maxPerPage = 10; - protected $currentPage = 1; + protected $currentPage = 1; protected $sort = null; protected $sortOrder = \Criteria::ASC; - protected $highlighting = 'edit'; + protected $highlighting = 'edit'; protected $rankable = false; protected $i18nCultures = array(); - protected $i18n = false; + protected $i18n = false; protected $storageNamespace = null; @@ -418,12 +418,12 @@ class CrudConfiguration return $this->redirectIfOneResult; } - public function setFilterMethod($field, $method, $criteria = null, $value = null) + public function setFilterMethod($field, $method, $criteria = null, $params = array()) { $this->filtersMethods[$field] = array( 'method' => $method, 'criteria' => $criteria, - 'value' => $value, + 'params' => $params, ); return $this; diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Controller/BaseAdminController.php b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Controller/BaseAdminController.php index 735757a..e8ee4a7 100644 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Controller/BaseAdminController.php +++ b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Controller/BaseAdminController.php @@ -154,7 +154,7 @@ class BaseAdminController extends Controller foreach ($datas as $field => $value) { $method = isset($filtersMethods[$field]) ? $filtersMethods[$field]['method'] : 'filterBy'.Propel::camelCase($field); - $criteria = isset($filtersMethods[$field]) ? $filtersMethods[$field]['criteria'] : (is_numeric($value) && intval($value) == $value ? null : 'like'); + $criteria = isset($filtersMethods[$field]) ? $filtersMethods[$field]['criteria'] : (is_numeric($value) && intval($value) == $value ? null : (!is_array($value) ? 'like' : null)); $params = isset($filtersMethods[$field]) ? $filtersMethods[$field]['params'] : array(); if (!method_exists($this->getConfiguration()->getModelQuery(), $method)) { @@ -174,7 +174,7 @@ class BaseAdminController extends Controller '%bool.false%' => false, ); - if (isset($bools[$value])) { + if (!is_array($value) && isset($bools[$value])) { $value = $bools[$value]; } @@ -744,7 +744,7 @@ class BaseAdminController extends Controller protected function cleanFilterArray(array $array) { foreach ($array as $k => $v) { - if (trim($v) === '') { + if (!is_array($v) && trim($v) === '') { unset($array[$k]); } } diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/accordion.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/accordion.less deleted file mode 100644 index 11a36b5..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/accordion.less +++ /dev/null @@ -1,28 +0,0 @@ -// ACCORDION -// --------- - - -// Parent container -.accordion { - margin-bottom: @baseLineHeight; -} - -// Group == heading + body -.accordion-group { - margin-bottom: 2px; - border: 1px solid #e5e5e5; - .border-radius(4px); -} -.accordion-heading { - border-bottom: 0; -} -.accordion-heading .accordion-toggle { - display: block; - padding: 8px 15px; -} - -// Inner needs the styles because you can't animate properly with any styles on the element -.accordion-inner { - padding: 9px 15px; - border-top: 1px solid #e5e5e5; -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/alerts.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/alerts.less deleted file mode 100644 index 3773a48..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/alerts.less +++ /dev/null @@ -1,77 +0,0 @@ -// ALERT STYLES -// ------------ - -// Base alert styles -.alert { - padding: 8px 35px 8px 14px; - margin-bottom: @baseLineHeight; - text-shadow: 0 1px 0 rgba(255,255,255,.5); - background-color: @warningBackground; - border: 1px solid @warningBorder; - .border-radius(4px); -} -.alert, -.alert-heading { - color: @warningText; -} - -.message .alert { - .border-radius(0); - height: 24px; - font-size: 14px; - padding: 10px 35px 6px 14px; -} - -// Adjust close link position -.alert .close { - position: relative; - top: -2px; - right: -21px; - line-height: 18px; -} - -// Alternate styles -// ---------------- - -.alert-success { - background-color: @successBackground; - border-color: @successBorder; -} -.alert-success, -.alert-success .alert-heading { - color: @successText; -} -.alert-danger, -.alert-error { - background-color: @errorBackground; - border-color: @errorBorder; -} -.alert-danger, -.alert-error, -.alert-danger .alert-heading, -.alert-error .alert-heading { - color: @errorText; -} -.alert-info { - background-color: @infoBackground; - border-color: @infoBorder; -} -.alert-info, -.alert-info .alert-heading { - color: @infoText; -} - - -// Block alerts -// ------------------------ -.alert-block { - padding-top: 14px; - padding-bottom: 14px; -} -.alert-block > p, -.alert-block > ul { - margin-bottom: 0; -} -.alert-block p + p { - margin-top: 5px; -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/alerts_badges.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/alerts_badges.less deleted file mode 100644 index 59e8704..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/alerts_badges.less +++ /dev/null @@ -1,152 +0,0 @@ -// ALERT STYLES -// ------------ - -// Base alert styles -.alert, .badge { - padding: 8px 35px 8px 14px; - margin-bottom: @baseLineHeight; - text-shadow: 0 1px 0 rgba(255,255,255,.5); - background-color: @warningBackground; - border: 1px solid @warningBorder; - .border-radius(4px); - font-size:10px; -} - -.alert { - font-size: 13px; -} - -.badge { - padding: 1px 9px 2px; - .border-radius(9px); - border:none; - text-shadow:none; - color:@white; -} - -.alert, -.alert-heading { - color: @warningText; -} - -// Adjust close link position -.alert .close { - position: relative; - top: -2px; - right: -21px; - line-height: 18px; -} - -// Alternate styles -// ---------------- - -.alert-success { - background-color: @successBackground; - border-color: @successBorder; -} -.alert-success, -.alert-success .alert-heading { - color: @successText; -} -.alert-danger, -.alert-error { - background-color: @errorBackground; - border-color: @errorBorder; -} -.alert-danger, -.alert-error, -.alert-danger .alert-heading, -.alert-error .alert-heading { - color: @errorText; -} -.alert-info { - background-color: @infoBackground; - border-color: @infoBorder; -} -.alert-info, -.alert-info .alert-heading { - color: @infoText; -} - - -// Block alerts -// ------------------------ -.alert-block { - padding-top: 14px; - padding-bottom: 14px; -} -.alert-block > p, -.alert-block > ul { - margin-bottom: 0; -} -.alert-block p + p { - margin-top: 5px; -} - -a.label:hover, -a.badge:hover { - color: #ffffff; - text-decoration: none; - cursor: pointer; -} - -.label-important, -.badge-important { - background-color: #b94a48; -} - -.label-important[href], -.badge-important[href] { - background-color: #953b39; -} - -.label-warning, -.badge-warning { - background-color: #f89406; -} - -.label-warning[href], -.badge-warning[href] { - background-color: #c67605; -} - -.label-success, -.badge-success { - background-color: #468847; -} - -.label-success[href], -.badge-success[href] { - background-color: #356635; -} - -.label-info, -.badge-info { - background-color: #3a87ad; -} - -.label-info[href], -.badge-info[href] { - background-color: #2d6987; -} - -.label-inverse, -.badge-inverse { - background-color: #333333; -} - -.label-inverse[href], -.badge-inverse[href] { - background-color: #1a1a1a; -} - -.btn .label, -.btn .badge { - position: relative; - top: -1px; -} - -.btn-mini .label, -.btn-mini .badge { - top: 0; -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/bootstrap.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/bootstrap.less deleted file mode 100644 index 5603d70..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/bootstrap.less +++ /dev/null @@ -1,67 +0,0 @@ -/*! - * Bootstrap v2.0.1 - * - * Copyright 2012 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 @twitter by @mdo and @fat. - */ - -// CSS Reset -@import "reset.less"; - -// Core variables and mixins -@import "variables.less"; // Modify this for custom colors, font-sizes, etc -@import "mixins.less"; - -// Grid system and page structure -@import "scaffolding.less"; -@import "grid.less"; -@import "layouts.less"; - -// Base CSS -@import "type.less"; -@import "code.less"; -@import "forms.less"; -@import "tables.less"; - -@import "alerts.less"; - -// Upload -@import "fileupload.less"; - -// Components: common -@import "sprites.less"; -@import "dropdowns.less"; -@import "wells.less"; -@import "component-animations.less"; -@import "close.less"; - -// Components: Buttons & Alerts -@import "buttons.less"; -@import "button-groups.less"; -@import "alerts_badges.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less - -// Components: Nav -@import "navs.less"; -@import "navbar.less"; -@import "breadcrumbs.less"; -@import "pagination.less"; -@import "pager.less"; - -// Components: Popovers -@import "modals.less"; -@import "tooltip.less"; -@import "popovers.less"; - -// Components: Misc -@import "thumbnails.less"; -@import "labels.less"; -@import "progress-bars.less"; -@import "accordion.less"; -@import "carousel.less"; -@import "hero-unit.less"; - -// Utility classes -@import "utilities.less"; // Has to be last to override when necessary diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/breadcrumbs.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/breadcrumbs.less deleted file mode 100644 index 39060ba..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/breadcrumbs.less +++ /dev/null @@ -1,22 +0,0 @@ -// BREADCRUMBS -// ----------- - -.breadcrumb { - padding: 7px 14px; - margin: 0 0 @baseLineHeight; - #gradient > .vertical(@white, #f5f5f5); - border: 1px solid #ddd; - .border-radius(3px); - .box-shadow(inset 0 1px 0 @white); - li { - display: inline-block; - text-shadow: 0 1px 0 @white; - } - .divider { - padding: 0 5px; - color: @grayLight; - } - .active a { - color: @grayDark; - } -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/button-groups.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/button-groups.less deleted file mode 100644 index 819b9bc..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/button-groups.less +++ /dev/null @@ -1,148 +0,0 @@ -// BUTTON GROUPS -// ------------- - - -// Make the div behave like a button -.btn-group { - position: relative; - .clearfix(); // clears the floated buttons - .ie7-restore-left-whitespace(); -} - -// Space out series of button groups -.btn-group + .btn-group { - margin-left: 5px; -} - -// Optional: Group multiple button groups together for a toolbar -.btn-toolbar { - //margin-top: @baseLineHeight / 2; - //margin-bottom: @baseLineHeight / 2; - .btn-group { - display: inline-block; - .ie7-inline-block(); - } -} - -// Float them, remove border radius, then re-add to first and last elements -.btn-group .btn { - position: relative; - float: left; - margin-left: -1px; - .border-radius(0); -} -// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match -.btn-group .btn:first-child { - margin-left: 0; - -webkit-border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - border-top-left-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-left-radius: 4px; -} -.btn-group .btn:last-child, -.btn-group .dropdown-toggle { - -webkit-border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; -} -// Reset corners for large buttons -.btn-group .btn.large:first-child { - margin-left: 0; - -webkit-border-top-left-radius: 6px; - -moz-border-radius-topleft: 6px; - border-top-left-radius: 6px; - -webkit-border-bottom-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - border-bottom-left-radius: 6px; -} -.btn-group .btn.large:last-child, -.btn-group .large.dropdown-toggle { - -webkit-border-top-right-radius: 6px; - -moz-border-radius-topright: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - -moz-border-radius-bottomright: 6px; - border-bottom-right-radius: 6px; -} - -// On hover/focus/active, bring the proper btn to front -.btn-group .btn:hover, -.btn-group .btn:focus, -.btn-group .btn:active, -.btn-group .btn.active { - z-index: 2; -} - -// On active and open, don't show outline -.btn-group .dropdown-toggle:active, -.btn-group.open .dropdown-toggle { - outline: 0; -} - - - -// Split button dropdowns -// ---------------------- - -// Give the line between buttons some depth -.btn-group .dropdown-toggle { - padding-left: 8px; - padding-right: 8px; - @shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); - .box-shadow(@shadow); - *padding-top: 5px; - *padding-bottom: 5px; -} - -.btn-group.open { - // IE7's z-index only goes to the nearest positioned ancestor, which would - // make the menu appear below buttons that appeared later on the page - *z-index: @zindexDropdown; - - // Reposition menu on open and round all corners - .dropdown-menu { - display: block; - margin-top: 1px; - .border-radius(5px); - } - - .dropdown-toggle { - background-image: none; - @shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); - .box-shadow(@shadow); - } -} - -// Reposition the caret -.btn .caret { - margin-top: 7px; - margin-left: 0; -} -.btn:hover .caret, -.open.btn-group .caret { - .opacity(100); -} - - -// Account for other colors -.btn-primary, -.btn-danger, -.btn-info, -.btn-success, -.btn-inverse { - .caret { - border-top-color: @white; - .opacity(75); - } -} - -// Small button dropdowns -.btn-small .caret { - margin-top: 4px; -} - diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/buttons.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/buttons.less deleted file mode 100644 index ee7b963..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/buttons.less +++ /dev/null @@ -1,183 +0,0 @@ -// BUTTON STYLES -// ------------- - - -// Base styles -// -------------------------------------------------- - -// Core -.btn { - display: inline-block; - padding: 4px 10px 4px; - margin-bottom: 0; // For input.btn - font-size: @baseFontSize; - line-height: @baseLineHeight; - color: @grayDark; - text-align: center; - text-shadow: 0 1px 1px rgba(255,255,255,.75); - vertical-align: middle; - .buttonBackground(@white, darken(@white, 10%)); - border: 1px solid #ccc; - border-bottom-color: #bbb; - .border-radius(4px); - @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); - .box-shadow(@shadow); - cursor: pointer; - - // Give IE7 some love - .reset-filter(); - .ie7-restore-left-whitespace(); -} - -// Hover state -.btn:hover { - color: @grayDark; - text-decoration: none; - background-color: darken(@white, 10%); - background-position: 0 -15px; - - // transition is only when going to hover, otherwise the background - // behind the gradient (there for IE<=9 fallback) gets mismatched - .transition(background-position .1s linear); -} - -// Focus state for keyboard and accessibility -.btn:focus { - .tab-focus(); -} - -// Active state -.btn.active, -.btn:active { - background-image: none; - @shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); - .box-shadow(@shadow); - background-color: darken(@white, 10%); - background-color: darken(@white, 15%) e("\9"); - outline: 0; -} - -// Disabled state -.btn.disabled, -.btn[disabled] { - cursor: default; - background-image: none; - background-color: darken(@white, 10%); - .opacity(65); - .box-shadow(none); -} - - -// Button Sizes -// -------------------------------------------------- - -// Large -.btn-large { - padding: 9px 14px; - //font-size: @baseFontSize + 2px; - line-height: normal; - .border-radius(5px); -} -.btn-large [class^="icon-"] { - margin-top: 1px; -} - -// Small -.btn-small { - padding: 5px 9px; - //font-size: @baseFontSize - 2px; - //line-height: @baseLineHeight - 2px; -} -.btn-small [class^="icon-"] { - margin-top: -1px; -} - -// Mini -.btn-mini { - padding: 2px 6px; - //font-size: @baseFontSize - 2px; - //line-height: @baseLineHeight - 4px; -} - - -// Alternate buttons -// -------------------------------------------------- - -// Set text color -// ------------------------- -.btn-primary, -.btn-primary:hover, -.btn-warning, -.btn-warning:hover, -.btn-danger, -.btn-danger:hover, -.btn-success, -.btn-success:hover, -.btn-info, -.btn-info:hover, -.btn-inverse, -.btn-inverse:hover { - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - color: @white; -} -// Provide *some* extra contrast for those who can get it -.btn-primary.active, -.btn-warning.active, -.btn-danger.active, -.btn-success.active, -.btn-info.active, -.btn-dark.active { - color: rgba(255,255,255,.75); -} - -// Set the backgrounds -// ------------------------- -.btn-primary { - .buttonBackground(#00abdf, #2c6a99); /* #00b3cc, #0074cc */ -} -// Warning appears are orange -.btn-warning { - .buttonBackground(#ff7d48, #ff4a01); /* lighten(@orange, 15%), @orange */ -} -// Danger and error appear as red -.btn-danger { - .buttonBackground(#db4e53, #b1292c); /* #ee5f5b et #bd362f */ -} -// Success appears as green -.btn-success { - .buttonBackground(#61c2b5 ,#52a499); -} -// Info appears as a neutral blue -.btn-info { - .buttonBackground(#5bc0de, #2f96b4); /*5bc0de et 2f96b4 || 00abdf et 2986a2*/ -} -// Inverse appears as dark gray -.btn-inverse { - .buttonBackground(#454545, #262626); -} - - -// Cross-browser Jank -// -------------------------------------------------- - -button.btn, -input[type="submit"].btn { - - // Firefox 3.6 only I believe - &::-moz-focus-inner { - padding: 0; - border: 0; - } - - // IE7 has some default padding on button controls - *padding-top: 2px; - *padding-bottom: 2px; - &.large { - *padding-top: 7px; - *padding-bottom: 7px; - } - &.small { - *padding-top: 3px; - *padding-bottom: 3px; - } -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/carousel.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/carousel.less deleted file mode 100644 index 8fbd303..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/carousel.less +++ /dev/null @@ -1,121 +0,0 @@ -// CAROUSEL -// -------- - -.carousel { - position: relative; - margin-bottom: @baseLineHeight; - line-height: 1; -} - -.carousel-inner { - overflow: hidden; - width: 100%; - position: relative; -} - -.carousel { - - .item { - display: none; - position: relative; - .transition(.6s ease-in-out left); - } - - // Account for jankitude on images - .item > img { - display: block; - line-height: 1; - } - - .active, - .next, - .prev { display: block; } - - .active { - left: 0; - } - - .next, - .prev { - position: absolute; - top: 0; - width: 100%; - } - - .next { - left: 100%; - } - .prev { - left: -100%; - } - .next.left, - .prev.right { - left: 0; - } - - .active.left { - left: -100%; - } - .active.right { - left: 100%; - } - -} - -// Left/right controls for nav -// --------------------------- - -.carousel-control { - position: absolute; - top: 40%; - left: 15px; - width: 40px; - height: 40px; - margin-top: -20px; - font-size: 60px; - font-weight: 100; - line-height: 30px; - color: @white; - text-align: center; - background: @grayDarker; - border: 3px solid @white; - .border-radius(23px); - .opacity(50); - - // we can't have this transition here - // because webkit cancels the carousel - // animation if you trip this while - // in the middle of another animation - // ;_; - // .transition(opacity .2s linear); - - // Reposition the right one - &.right { - left: auto; - right: 15px; - } - - // Hover state - &:hover { - color: @white; - text-decoration: none; - .opacity(90); - } -} - -// Caption for text below images -// ----------------------------- - -.carousel-caption { - position: absolute; - left: 0; - right: 0; - bottom: 0; - padding: 10px 15px 5px; - background: @grayDark; - background: rgba(0,0,0,.75); -} -.carousel-caption h4, -.carousel-caption p { - color: @white; -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/close.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/close.less deleted file mode 100644 index a0e5edb..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/close.less +++ /dev/null @@ -1,18 +0,0 @@ -// CLOSE ICONS -// ----------- - -.close { - float: right; - font-size: 20px; - font-weight: bold; - line-height: @baseLineHeight; - color: @black; - text-shadow: 0 1px 0 rgba(255,255,255,1); - .opacity(20); - &:hover { - color: @black; - text-decoration: none; - .opacity(40); - cursor: pointer; - } -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/code.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/code.less deleted file mode 100644 index 3a157df..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/code.less +++ /dev/null @@ -1,57 +0,0 @@ -// Code.less -// Code typography styles for the and
 elements
-// --------------------------------------------------------
-
-// Inline and block code styles
-code,
-pre {
-  padding: 0 3px 2px;
-  #font > #family > .monospace;
-  //font-size: @baseFontSize - 1;
-  color: @grayDark;
-  .border-radius(3px);
-}
-
-// Inline code
-code {
-  padding: 3px 4px;
-  color: #d14;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
-}
-
-// Blocks of code
-pre {
-  display: block;
-  //padding: (@baseLineHeight - 1) / 2;
-  //margin: 0 0 @baseLineHeight / 2;
-  font-size: 12px;
-  line-height: @baseLineHeight;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc; // fallback for IE7-8
-  border: 1px solid rgba(0,0,0,.15);
-  .border-radius(4px);
-  white-space: pre;
-  white-space: pre-wrap;
-  word-break: break-all;
-  word-wrap: break-word;
-
-  // Make prettyprint styles more spaced out for readability
-  &.prettyprint {
-    margin-bottom: @baseLineHeight;
-  }
-
-  // Account for some code outputs that place code tags in pre tags
-  code {
-    padding: 0;
-    color: inherit;
-    background-color: transparent;
-    border: 0;
-  }
-}
-
-// Enable scrollable blocks of code
-.pre-scrollable {
-  max-height: 340px;
-  overflow-y: scroll;
-}
diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/component-animations.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/component-animations.less
deleted file mode 100644
index 4f2a4fd..0000000
--- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/component-animations.less
+++ /dev/null
@@ -1,18 +0,0 @@
-// COMPONENT ANIMATIONS
-// --------------------
-
-.fade {
-  .transition(opacity .15s linear);
-  opacity: 0;
-  &.in {
-    opacity: 1;
-  }
-}
-
-.collapse {
-  .transition(height .35s ease);
-  position:relative;
-  overflow:hidden;
-  height: 0;
-  &.in { height: auto; }
-}
diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/dropdowns.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/dropdowns.less
deleted file mode 100644
index 2f27e03..0000000
--- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/dropdowns.less
+++ /dev/null
@@ -1,128 +0,0 @@
-// DROPDOWN MENUS
-// --------------
-
-// Use the .menu class on any 
  • element within the topbar or ul.tabs and you'll get some superfancy dropdowns -.dropdown { - position: relative; -} -.dropdown-toggle { - // The caret makes the toggle a bit too tall in IE7 - *margin-bottom: -3px; -} -.dropdown-toggle:active, -.open .dropdown-toggle { - outline: 0; -} -// Dropdown arrow/caret -.caret { - display: inline-block; - width: 0; - height: 0; - text-indent: -99999px; - // IE7 won't do the border trick if there's a text indent, but it doesn't - // do the content that text-indent is hiding, either, so we're ok. - *text-indent: 0; - vertical-align: top; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid @black; - .opacity(30); - content: "\2193"; -} -.dropdown .caret { - margin-top: 8px; - margin-left: 2px; -} -.dropdown:hover .caret, -.open.dropdown .caret { - .opacity(100); -} -// The dropdown menu (ul) -.dropdown-menu { - position: absolute; - top: 100%; - left: 0; - z-index: @zindexDropdown; - float: left; - display: none; // none by default, but block on "open" of the menu - min-width: 160px; - _width: 160px; - padding: 4px 0; - margin: 0; // override default ul - list-style: none; - background-color: @white; - border-color: #ccc; - border-color: rgba(0,0,0,.2); - border-style: solid; - border-width: 1px; - .border-radius(0 0 5px 5px); - .box-shadow(0 5px 10px rgba(0,0,0,.2)); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; - *border-right-width: 2px; - *border-bottom-width: 2px; - - // Allow for dropdowns to go bottom up (aka, dropup-menu) - &.bottom-up { - top: auto; - bottom: 100%; - margin-bottom: 2px; - } - - // Dividers (basically an hr) within the dropdown - .divider { - height: 1px; - margin: 5px 1px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid @white; - - // IE7 needs a set width since we gave a height. Restricting just - // to IE7 to keep the 1px left/right space in other browsers. - // It is unclear where IE is getting the extra space that we need - // to negative-margin away, but so it goes. - *width: 100%; - *margin: -5px 0 5px; - } - - // Links within the dropdown menu - a { - display: block; - padding: 5px 25px; - clear: both; - font-weight: normal; - line-height: @baseLineHeight; - color: @gray; - white-space: nowrap; - } -} - -// Hover state -.dropdown-menu li > a:hover, -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { - color: @white; - text-decoration: none; - background-color: @linkColor; -} - -// Open state for the dropdown -.dropdown.open { - // IE7's z-index only goes to the nearest positioned ancestor, which would - // make the menu appear below buttons that appeared later on the page - *z-index: @zindexDropdown; - - .dropdown-toggle { - color: @gray; - } - .dropdown-menu { - display: block; - } -} - -// Typeahead -.typeahead { - margin-top: 2px; // give it some space to breathe - .border-radius(4px); -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/fileupload.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/fileupload.less deleted file mode 100644 index bc4832f..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/fileupload.less +++ /dev/null @@ -1,132 +0,0 @@ -/*! - * Bootstrap v2.3.0-j4 - * - * Copyright 2012 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, extended by @ArnoldDaniels. - */ -.clearfix { - *zoom: 1; -} -.clearfix:before, -.clearfix:after { - display: table; - content: ""; - line-height: 0; -} -.clearfix:after { - clear: both; -} -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} -.input-block-level { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.btn-file { - overflow: hidden; - position: relative; - vertical-align: middle; -} -.btn-file > input { - position: absolute; - top: 0; - right: 0; - margin: 0; - opacity: 0; - filter: alpha(opacity=0); - transform: translate(-300px, 0) scale(4); - font-size: 23px; - direction: ltr; - cursor: pointer; -} -.fileupload { - margin-bottom: 9px; -} -.fileupload .uneditable-input { - display: inline-block; - margin-bottom: 0px; - vertical-align: middle; - cursor: text; -} -.fileupload .thumbnail { - overflow: hidden; - display: inline-block; - margin-bottom: 5px; - vertical-align: middle; - text-align: center; -} -.fileupload .thumbnail > img { - display: inline-block; - vertical-align: middle; - max-height: 100%; -} -.fileupload .btn { - vertical-align: middle; -} -.fileupload-exists .fileupload-new, -.fileupload-new .fileupload-exists { - display: none; -} -.fileupload-inline .fileupload-controls { - display: inline; -} -.fileupload-new .input-append .btn-file { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.thumbnail-borderless .thumbnail { - border: none; - padding: 0; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.fileupload-new.thumbnail-borderless .thumbnail { - border: 1px solid #ddd; -} -.control-group.warning .fileupload .uneditable-input { - color: #a47e3c; - border-color: #a47e3c; -} -.control-group.warning .fileupload .fileupload-preview { - color: #a47e3c; -} -.control-group.warning .fileupload .thumbnail { - border-color: #a47e3c; -} -.control-group.error .fileupload .uneditable-input { - color: #b94a48; - border-color: #b94a48; -} -.control-group.error .fileupload .fileupload-preview { - color: #b94a48; -} -.control-group.error .fileupload .thumbnail { - border-color: #b94a48; -} -.control-group.success .fileupload .uneditable-input { - color: #468847; - border-color: #468847; -} -.control-group.success .fileupload .fileupload-preview { - color: #468847; -} -.control-group.success .fileupload .thumbnail { - border-color: #468847; -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/forms.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/forms.less deleted file mode 100644 index c3ccecd..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/forms.less +++ /dev/null @@ -1,522 +0,0 @@ -// Forms.less -// Base styles for various input types, form layouts, and states -// ------------------------------------------------------------- - - -// GENERAL STYLES -// -------------- - -// Make all forms have space below them -form { - margin: 0 0 @baseLineHeight; -} - -fieldset { - padding: 0; - margin: 0; - border: 0; -} - -// Groups of fields with labels on top (legends) -legend { - display: block; - width: 100%; - padding: 0; - //margin-bottom: @baseLineHeight * 1.5; - //font-size: @baseFontSize * 1.5; - //line-height: @baseLineHeight * 2; - color: @grayDark; - border: 0; - border-bottom: 1px solid #eee; - - // Small - small { - //font-size: @baseLineHeight * .75; - color: @grayLight; - } -} - -// Set font for forms -label, -input, -button, -select, -textarea { - #font > .shorthand(@baseFontSize,normal,@baseLineHeight); // Set size, weight, line-height here -} -input, -button, -select, -textarea { - #font > #family > .sans-serif(); // And only set font-family here for those that need it (note the missing label element) -} - -// Identify controls by their labels -label { - display: block; - margin-bottom: 5px; - color: @grayDark; -} - -// Inputs, Textareas, Selects -input, -textarea, -select, -.uneditable-input { - display: inline-block; - width: 210px; - height: @baseLineHeight; - padding: 4px; - margin-bottom: 9px; - font-size: @baseFontSize; - line-height: @baseLineHeight; - color: @gray; - border: 1px solid #ccc; - .border-radius(3px); -} -.uneditable-textarea { - width: auto; - height: auto; -} - -// Inputs within a label -label input, -label textarea, -label select { - display: block; -} - -// Mini reset for unique input types -input[type="image"], -input[type="checkbox"], -input[type="radio"] { - width: auto; - height: auto; - padding: 0; - margin: 3px 0; - *margin-top: 0; /* IE7 */ - line-height: normal; - cursor: pointer; - .border-radius(0); - border: 0 \9; /* IE9 and down */ -} -input[type="image"] { - border: 0; -} - -// Reset the file input to browser defaults -input[type="file"] { - width: auto; - padding: initial; - line-height: initial; - border: initial; - background-color: @white; - background-color: initial; - .box-shadow(none); -} - -// Help out input buttons -input[type="button"], -input[type="reset"], -input[type="submit"] { - width: auto; - height: auto; -} - -// Set the height of select and file controls to match text inputs -select, -input[type="file"] { - height: 28px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ - *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 28px; -} - -// Reset line-height for IE -input[type="file"] { - line-height: 18px \9; -} - -// Chrome on Linux and Mobile Safari need background-color -select { - width: 220px; // default input width + 10px of padding that doesn't get applied - background-color: @white; -} - -// Make multiple select elements height not fixed -select[multiple], -select[size] { - height: auto; -} - -// Remove shadow from image inputs -input[type="image"] { - .box-shadow(none); -} - -// Make textarea height behave -textarea { - height: auto; -} - -// Hidden inputs -input[type="hidden"] { - display: none; -} - - - -// CHECKBOXES & RADIOS -// ------------------- - -// Indent the labels to position radios/checkboxes as hanging -.radio, -.checkbox { - padding-left: 18px; -} -.radio input[type="radio"], -.checkbox input[type="checkbox"] { - float: left; - margin-left: -18px; -} - -// Move the options list down to align with labels -.controls > .radio:first-child, -.controls > .checkbox:first-child { - padding-top: 5px; // has to be padding because margin collaspes -} - -// Radios and checkboxes on same line -// TODO v3: Convert .inline to .control-inline -.radio.inline, -.checkbox.inline { - display: inline-block; - padding-top: 5px; - margin-bottom: 0; - vertical-align: middle; -} -.radio.inline + .radio.inline, -.checkbox.inline + .checkbox.inline { - margin-left: 10px; // space out consecutive inline controls -} - - - -// FOCUS STATE -// ----------- - -input, -textarea { - .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); - @transition: border linear .2s, box-shadow linear .2s; - .transition(@transition); -} -input:focus, -textarea:focus { - border-color: rgba(82,168,236,.8); - @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); - .box-shadow(@shadow); - outline: 0; - outline: thin dotted \9; /* IE6-9 */ -} -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus, -select:focus { - .box-shadow(none); // override for file inputs - .tab-focus(); -} - - - -// INPUT SIZES -// ----------- - -// General classes for quick sizes -.input-mini { width: 60px; } -.input-small { width: 90px; } -.input-medium { width: 150px; } -.input-large { width: 210px; } -.input-xlarge { width: 270px; } -.input-xxlarge { width: 530px; } - -// Grid style input sizes -input[class*="span"], -select[class*="span"], -textarea[class*="span"], -.uneditable-input { - float: none; - margin-left: 0; -} - - - -// GRID SIZING FOR INPUTS -// ---------------------- - -#inputGridSystem > .generate(@gridColumns, @gridColumnWidth, @gridGutterWidth); - - - - -// DISABLED STATE -// -------------- - -// Disabled and read-only inputs -input[disabled], -select[disabled], -textarea[disabled], -input[readonly], -select[readonly], -textarea[readonly] { - background-color: #f5f5f5; - border-color: #ddd; - cursor: not-allowed; -} - - - - -// FORM FIELD FEEDBACK STATES -// -------------------------- - -// Warning -.control-group.warning { - .formFieldState(@warningText, @warningText, @warningBackground); -} -// Error -.control-group.error { - .formFieldState(@errorText, @errorText, @errorBackground); -} -// Success -.control-group.success { - .formFieldState(@successText, @successText, @successBackground); -} - -// HTML5 invalid states -// Shares styles with the .control-group.error above -input:focus:required:invalid, -textarea:focus:required:invalid, -select:focus:required:invalid { - color: #b94a48; - border-color: #ee5f5b; - &:focus { - border-color: darken(#ee5f5b, 10%); - .box-shadow(0 0 6px lighten(#ee5f5b, 20%)); - } -} - - - -// FORM ACTIONS -// ------------ - -.form-actions { - padding: (@baseLineHeight - 1) 20px @baseLineHeight; - margin-top: @baseLineHeight; - margin-bottom: @baseLineHeight; - background-color: #f5f5f5; - border-top: 1px solid #ddd; -} - -// For text that needs to appear as an input but should not be an input -.uneditable-input { - display: block; - background-color: @white; - border-color: #eee; - .box-shadow(inset 0 1px 2px rgba(0,0,0,.025)); - cursor: not-allowed; -} - -// Placeholder text gets special styles; can't be bundled together though for some reason -.placeholder(@grayLight); - - - -// HELP TEXT -// --------- - -.help-block { - display: block; // account for any element using help-block - margin-top: 5px; - margin-bottom: 0; - color: @grayLight; -} - -.help-inline { - display: inline-block; - .ie7-inline-block(); - margin-bottom: 9px; - vertical-align: middle; - padding-left: 5px; -} - - - -// INPUT GROUPS -// ------------ - -// Allow us to put symbols and text within the input field for a cleaner look -.input-prepend, -.input-append { - margin-bottom: 5px; - .clearfix(); // Clear the float to prevent wrapping - input, - .uneditable-input { - .border-radius(0 3px 3px 0); - &:focus { - position: relative; - z-index: 2; - } - } - .uneditable-input { - border-left-color: #ccc; - } - .add-on { - float: left; - display: block; - width: auto; - min-width: 16px; - height: @baseLineHeight; - margin-right: -1px; - padding: 4px 5px; - font-weight: normal; - line-height: @baseLineHeight; - color: @grayLight; - text-align: center; - text-shadow: 0 1px 0 @white; - background-color: #f5f5f5; - border: 1px solid #ccc; - .border-radius(3px 0 0 3px); - } - .active { - background-color: lighten(@green, 30); - border-color: @green; - } -} -.input-prepend { - .add-on { - *margin-top: 1px; /* IE6-7 */ - } -} -.input-append { - input, - .uneditable-input { - float: left; - .border-radius(3px 0 0 3px); - } - .uneditable-input { - border-left-color: #eee; - border-right-color: #ccc; - } - .add-on { - margin-right: 0; - margin-left: -1px; - .border-radius(0 3px 3px 0); - } - input:first-child { - // In IE7, having a hasLayout container (from clearfix's zoom:1) can make the first input - // inherit the sum of its ancestors' margins. - *margin-left: -160px; - - &+.add-on { - *margin-left: -21px; - } - } -} - - - -// SEARCH FORM -// ----------- - -.search-query { - padding-left: 14px; - padding-right: 14px; - margin-bottom: 0; // remove the default margin on all inputs - .border-radius(14px); -} - - - -// HORIZONTAL & VERTICAL FORMS -// --------------------------- - -// Common properties -// ----------------- - -.form-search, -.form-inline, -.form-horizontal { - input, - textarea, - select, - .help-inline, - .uneditable-input { - display: inline-block; - margin-bottom: 0; - } - // Re-hide hidden elements due to specifity - .hide { - display: none; - } -} -.form-search label, -.form-inline label, -.form-search .input-append, -.form-inline .input-append, -.form-search .input-prepend, -.form-inline .input-prepend { - display: inline-block; -} -// Make the prepend and append add-on vertical-align: middle; -.form-search .input-append .add-on, -.form-inline .input-prepend .add-on, -.form-search .input-append .add-on, -.form-inline .input-prepend .add-on { - vertical-align: middle; -} -// Inline checkbox/radio labels -.form-search .radio, -.form-inline .radio, -.form-search .checkbox, -.form-inline .checkbox { - margin-bottom: 0; - vertical-align: middle; -} - -// Margin to space out fieldsets -.control-group { - //margin-bottom: @baseLineHeight / 2; -} - -// Legend collapses margin, so next element is responsible for spacing -legend + .control-group { - margin-top: @baseLineHeight; - -webkit-margin-top-collapse: separate; -} - -// Horizontal-specific styles -// -------------------------- - -.form-horizontal { - // Increase spacing between groups - .control-group { - margin-bottom: @baseLineHeight; - .clearfix(); - } - // Float the labels left - .control-label { - float: left; - width: 140px; - padding-top: 5px; - text-align: right; - } - // Move over all input controls and content - .controls { - margin-left: 160px; - } - // Move over buttons in .form-actions to align with .controls - .form-actions { - padding-left: 160px; - } -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/grid.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/grid.less deleted file mode 100644 index 4acb0a4..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/grid.less +++ /dev/null @@ -1,8 +0,0 @@ -// GRID SYSTEM -// ----------- - -// Fixed (940px) -#gridSystem > .generate(@gridColumns, @gridColumnWidth, @gridGutterWidth); - -// Fluid (940px) -#fluidGridSystem > .generate(@gridColumns, @fluidGridColumnWidth, @fluidGridGutterWidth); diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/hero-unit.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/hero-unit.less deleted file mode 100644 index d18f6fe..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/hero-unit.less +++ /dev/null @@ -1,20 +0,0 @@ -// HERO UNIT -// --------- - -.hero-unit { - padding: 60px; - margin-bottom: 30px; - background-color: #f5f5f5; - .border-radius(6px); - h1 { - margin-bottom: 0; - font-size: 60px; - line-height: 1; - letter-spacing: -1px; - } - p { - font-size: 18px; - font-weight: 200; - //line-height: @baseLineHeight * 1.5; - } -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/labels.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/labels.less deleted file mode 100644 index a152738..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/labels.less +++ /dev/null @@ -1,32 +0,0 @@ -// LABELS -// ------ - -// Base -.label { - padding: 2px 4px 3px; - //font-size: @baseFontSize * .85; - font-weight: bold; - color: @white; - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - background-color: @grayLight; - .border-radius(3px); -} - -// Hover state -.label:hover { - color: @white; - text-decoration: none; -} - -// Colors -.label-important { background-color: @errorText; } -.label-important:hover { background-color: darken(@errorText, 10%); } - -.label-warning { background-color: @orange; } -.label-warning:hover { background-color: darken(@orange, 10%); } - -.label-success { background-color: @successText; } -.label-success:hover { background-color: darken(@successText, 10%); } - -.label-info { background-color: @infoText; } -.label-info:hover { background-color: darken(@infoText, 10%); } diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/layouts.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/layouts.less deleted file mode 100644 index c8d358b..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/layouts.less +++ /dev/null @@ -1,17 +0,0 @@ -// -// Layouts -// Fixed-width and fluid (with sidebar) layouts -// -------------------------------------------- - - -// Container (centered, fixed-width layouts) -.container { - .container-fixed(); -} - -// Fluid layouts (left aligned, with sidebar, min- & max-width content) -.container-fluid { - padding-left: @gridGutterWidth; - padding-right: @gridGutterWidth; - .clearfix(); -} \ No newline at end of file diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/mixins.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/mixins.less deleted file mode 100644 index ac46b52..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/mixins.less +++ /dev/null @@ -1,590 +0,0 @@ -// Mixins.less -// Snippets of reusable CSS to develop faster and keep code readable -// ----------------------------------------------------------------- - - -// UTILITY MIXINS -// -------------------------------------------------- - -// Clearfix -// -------- -// For clearing floats like a boss h5bp.com/q -.clearfix { - *zoom: 1; - &:before, - &:after { - display: table; - content: ""; - } - &:after { - clear: both; - } -} - -// Webkit-style focus -// ------------------ -.tab-focus() { - // Default - outline: thin dotted #333; - // Webkit - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -// Center-align a block level element -// ---------------------------------- -.center-block() { - display: block; - margin-left: auto; - margin-right: auto; -} - -// IE7 inline-block -// ---------------- -.ie7-inline-block() { - *display: inline; /* IE7 inline-block hack */ - *zoom: 1; -} - -// IE7 likes to collapse whitespace on either side of the inline-block elements. -// Ems because we're attempting to match the width of a space character. Left -// version is for form buttons, which typically come after other elements, and -// right version is for icons, which come before. Applying both is ok, but it will -// mean that space between those elements will be .6em (~2 space characters) in IE7, -// instead of the 1 space in other browsers. -.ie7-restore-left-whitespace() { - *margin-left: .3em; - - &:first-child { - *margin-left: 0; - } -} - -.ie7-restore-right-whitespace() { - *margin-right: .3em; - - &:last-child { - *margin-left: 0; - } -} - -// Sizing shortcuts -// ------------------------- -.size(@height: 5px, @width: 5px) { - width: @width; - height: @height; -} -.square(@size: 5px) { - .size(@size, @size); -} - -// Placeholder text -// ------------------------- -.placeholder(@color: @placeholderText) { - :-moz-placeholder { - color: @color; - } - ::-webkit-input-placeholder { - color: @color; - } -} - -// Text overflow -// ------------------------- -// Requires inline-block or block for proper styling -.text-overflow() { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - - - -// FONTS -// -------------------------------------------------- - -#font { - #family { - .serif() { - font-family: Georgia, "Times New Roman", Times, serif; - } - .sans-serif() { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - } - .monospace() { - font-family: Menlo, Monaco, "Courier New", monospace; - } - } - .shorthand(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { - font-size: @size; - font-weight: @weight; - line-height: @lineHeight; - } - .serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { - #font > #family > .serif; - #font > .shorthand(@size, @weight, @lineHeight); - } - .sans-serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { - #font > #family > .sans-serif; - #font > .shorthand(@size, @weight, @lineHeight); - } - .monospace(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { - #font > #family > .monospace; - #font > .shorthand(@size, @weight, @lineHeight); - } -} - - - -// GRID SYSTEM -// -------------------------------------------------- - -// Site container -// ------------------------- -.container-fixed() { - width: @gridRowWidth; - margin-left: auto; - margin-right: auto; - .clearfix(); -} - -// Le grid system -// ------------------------- -#gridSystem { - // Setup the mixins to be used - .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, @columns) { - //width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); - } - .offset(@gridColumnWidth, @gridGutterWidth, @columns) { - //margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2); - } - .gridColumn(@gridGutterWidth) { - float: left; - margin-left: @gridGutterWidth; - } - // Take these values and mixins, and make 'em do their thang - .generate(@gridColumns, @gridColumnWidth, @gridGutterWidth) { - // Row surrounds the columns - .row { - //margin-left: @gridGutterWidth * -1; - .clearfix(); - } - // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7, thanks @dhg) - [class*="span"] { - #gridSystem > .gridColumn(@gridGutterWidth); - } - // Default columns - .span1 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 1); } - .span2 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 2); } - .span3 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 3); } - .span4 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 4); } - .span5 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 5); } - .span6 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 6); } - .span7 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 7); } - .span8 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 8); } - .span9 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 9); } - .span10 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 10); } - .span11 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 11); } - .span12, - .container { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 12); } - // Offset column options - .offset1 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 1); } - .offset2 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 2); } - .offset3 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 3); } - .offset4 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 4); } - .offset5 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 5); } - .offset6 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 6); } - .offset7 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 7); } - .offset8 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 8); } - .offset9 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 9); } - .offset10 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 10); } - .offset11 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 11); } - } -} - -// Fluid grid system -// ------------------------- -#fluidGridSystem { - // Setup the mixins to be used - .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, @columns) { - //width: 1% * (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)); - } - .gridColumn(@fluidGridGutterWidth) { - float: left; - margin-left: @fluidGridGutterWidth; - } - // Take these values and mixins, and make 'em do their thang - .generate(@gridColumns, @fluidGridColumnWidth, @fluidGridGutterWidth) { - // Row surrounds the columns - .row-fluid { - width: 100%; - .clearfix(); - - // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7, thanks @dhg) - > [class*="span"] { - #fluidGridSystem > .gridColumn(@fluidGridGutterWidth); - } - > [class*="span"]:first-child { - margin-left: 0; - } - // Default columns - > .span1 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 1); } - > .span2 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 2); } - > .span3 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 3); } - > .span4 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 4); } - > .span5 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 5); } - > .span6 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 6); } - > .span7 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 7); } - > .span8 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 8); } - > .span9 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 9); } - > .span10 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 10); } - > .span11 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 11); } - > .span12 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 12); } - } - } -} - -// Input grid system -// ------------------------- -#inputGridSystem { - .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, @columns) { - //width: ((@gridColumnWidth) * @columns) + (@gridGutterWidth * (@columns - 1)) - 10; - } - .generate(@gridColumns, @gridColumnWidth, @gridGutterWidth) { - input, - textarea, - .uneditable-input { - &.span1 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 1); } - &.span2 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 2); } - &.span3 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 3); } - &.span4 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 4); } - &.span5 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 5); } - &.span6 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 6); } - &.span7 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 7); } - &.span8 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 8); } - &.span9 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 9); } - &.span10 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 10); } - &.span11 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 11); } - &.span12 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 12); } - } - } -} - -// Make a Grid -// ------------------------- -// Use .makeRow and .makeColumn to assign semantic layouts grid system behavior -.makeRow() { - //margin-left: @gridGutterWidth * -1; - .clearfix(); -} -.makeColumn(@columns: 1) { - float: left; - margin-left: @gridGutterWidth; - //width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); -} - - - -// Form field states (used in forms.less) -// -------------------------------------------------- - -// Mixin for form field states -.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) { - // Set the text color - > label, - .help-block, - .help-inline { - color: @textColor; - } - // Style inputs accordingly - input, - select, - textarea { - color: @textColor; - border-color: @borderColor; - &:focus { - border-color: darken(@borderColor, 10%); - .box-shadow(0 0 6px lighten(@borderColor, 20%)); - } - } - // Give a small background color for input-prepend/-append - .input-prepend .add-on, - .input-append .add-on { - color: @textColor; - background-color: @backgroundColor; - border-color: @textColor; - } -} - - - -// CSS3 PROPERTIES -// -------------------------------------------------- - -// Border Radius -.border-radius(@radius: 5px) { - -webkit-border-radius: @radius; - -moz-border-radius: @radius; - border-radius: @radius; -} - -// Drop shadows -.box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) { - -webkit-box-shadow: @shadow; - -moz-box-shadow: @shadow; - box-shadow: @shadow; -} - -// Transitions -.transition(@transition) { - -webkit-transition: @transition; - -moz-transition: @transition; - -ms-transition: @transition; - -o-transition: @transition; - transition: @transition; -} - -// Transformations -.rotate(@degrees) { - -webkit-transform: rotate(@degrees); - -moz-transform: rotate(@degrees); - -ms-transform: rotate(@degrees); - -o-transform: rotate(@degrees); - transform: rotate(@degrees); -} -.scale(@ratio) { - -webkit-transform: scale(@ratio); - -moz-transform: scale(@ratio); - -ms-transform: scale(@ratio); - -o-transform: scale(@ratio); - transform: scale(@ratio); -} -.translate(@x: 0, @y: 0) { - -webkit-transform: translate(@x, @y); - -moz-transform: translate(@x, @y); - -ms-transform: translate(@x, @y); - -o-transform: translate(@x, @y); - transform: translate(@x, @y); -} -.skew(@x: 0, @y: 0) { - -webkit-transform: skew(@x, @y); - -moz-transform: skew(@x, @y); - -ms-transform: skew(@x, @y); - -o-transform: skew(@x, @y); - transform: skew(@x, @y); -} -.translate3d(@x: 0, @y: 0, @z: 0) { - -webkit-transform: translate(@x, @y, @z); - -moz-transform: translate(@x, @y, @z); - -ms-transform: translate(@x, @y, @z); - -o-transform: translate(@x, @y, @z); - transform: translate(@x, @y, @z); -} - -// Background clipping -// Heads up: FF 3.6 and under need "padding" instead of "padding-box" -.background-clip(@clip) { - -webkit-background-clip: @clip; - -moz-background-clip: @clip; - background-clip: @clip; -} - -// Background sizing -.background-size(@size){ - -webkit-background-size: @size; - -moz-background-size: @size; - -o-background-size: @size; - background-size: @size; -} - - -// Box sizing -.box-sizing(@boxmodel) { - -webkit-box-sizing: @boxmodel; - -moz-box-sizing: @boxmodel; - box-sizing: @boxmodel; -} - -// User select -// For selecting text on the page -.user-select(@select) { - -webkit-user-select: @select; - -moz-user-select: @select; - -o-user-select: @select; - user-select: @select; -} - -// Resize anything -.resizable(@direction: both) { - resize: @direction; // Options: horizontal, vertical, both - overflow: auto; // Safari fix -} - -// CSS3 Content Columns -.content-columns(@columnCount, @columnGap: @gridColumnGutter) { - -webkit-column-count: @columnCount; - -moz-column-count: @columnCount; - column-count: @columnCount; - -webkit-column-gap: @columnGap; - -moz-column-gap: @columnGap; - column-gap: @columnGap; -} - -// Opacity -.opacity(@opacity: 100) { - //opacity: @opacity / 100; - filter: e(%("alpha(opacity=%d)", @opacity)); -} - - - -// BACKGROUNDS -// -------------------------------------------------- - -// Add an alphatransparency value to any background or border color (via Elyse Holladay) -#translucent { - .background(@color: @white, @alpha: 1) { - background-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha); - } - .border(@color: @white, @alpha: 1) { - border-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha); - .background-clip(padding-box); - } -} - -// Gradient Bar Colors for buttons and alerts -.gradientBar(@primaryColor, @secondaryColor) { - #gradient > .vertical(@primaryColor, @secondaryColor); - border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%); - border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); -} - -// Gradients -#gradient { - .horizontal(@startColor: #555, @endColor: #333) { - background-color: @endColor; - background-image: -moz-linear-gradient(left, @startColor, @endColor); // FF 3.6+ - background-image: -ms-linear-gradient(left, @startColor, @endColor); // IE10 - background-image: -webkit-gradient(linear, 0 0, 100% 0, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ - background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ - background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 - background-image: linear-gradient(left, @startColor, @endColor); // Le standard - background-repeat: repeat-x; - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE9 and down - } - .vertical(@startColor: #555, @endColor: #333) { - background-color: mix(@startColor, @endColor, 60%); - background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+ - background-image: -ms-linear-gradient(top, @startColor, @endColor); // IE10 - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ - background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+ - background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10 - background-image: linear-gradient(top, @startColor, @endColor); // The standard - background-repeat: repeat-x; - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down - } - .directional(@startColor: #555, @endColor: #333, @deg: 45deg) { - background-color: @endColor; - background-repeat: repeat-x; - background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+ - background-image: -ms-linear-gradient(@deg, @startColor, @endColor); // IE10 - background-image: -webkit-linear-gradient(@deg, @startColor, @endColor); // Safari 5.1+, Chrome 10+ - background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10 - background-image: linear-gradient(@deg, @startColor, @endColor); // The standard - } - .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) { - background-color: mix(@midColor, @endColor, 80%); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor)); - background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor); - background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor); - background-image: -ms-linear-gradient(@startColor, @midColor @colorStop, @endColor); - background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor); - background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor); - background-repeat: no-repeat; - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down, gets no color-stop at all for proper fallback - } - .radial(@innerColor: #555, @outerColor: #333) { - background-color: @outerColor; - background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor)); - background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor); - background-image: -moz-radial-gradient(circle, @innerColor, @outerColor); - background-image: -ms-radial-gradient(circle, @innerColor, @outerColor); - background-repeat: no-repeat; - // Opera cannot do radial gradients yet - } - .striped(@color, @angle: -45deg) { - background-color: @color; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - } -} -// Reset filters for IE -.reset-filter() { - filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)")); -} - - -// Mixin for generating button backgrounds -// --------------------------------------- -.buttonBackground(@startColor, @endColor) { - // gradientBar will set the background to a pleasing blend of these, to support IE<=9 - .gradientBar(@startColor, @endColor); - .reset-filter(); - - // in these cases the gradient won't cover the background, so we override - &:hover, &:active, &.active, &.disabled, &[disabled] { - background-color: @endColor; - } - - // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves - &:active, - &.active { - background-color: darken(@endColor, 10%) e("\9"); - } -} - - -// COMPONENT MIXINS -// -------------------------------------------------- - -// POPOVER ARROWS -// ------------------------- -// For tipsies and popovers -#popoverArrow { - .top(@arrowWidth: 5px) { - bottom: 0; - left: 50%; - margin-left: -@arrowWidth; - border-left: @arrowWidth solid transparent; - border-right: @arrowWidth solid transparent; - border-top: @arrowWidth solid @black; - } - .left(@arrowWidth: 5px) { - top: 50%; - right: 0; - margin-top: -@arrowWidth; - border-top: @arrowWidth solid transparent; - border-bottom: @arrowWidth solid transparent; - border-left: @arrowWidth solid @black; - } - .bottom(@arrowWidth: 5px) { - top: 0; - left: 50%; - margin-left: -@arrowWidth; - border-left: @arrowWidth solid transparent; - border-right: @arrowWidth solid transparent; - border-bottom: @arrowWidth solid @black; - } - .right(@arrowWidth: 5px) { - top: 50%; - left: 0; - margin-top: -@arrowWidth; - border-top: @arrowWidth solid transparent; - border-bottom: @arrowWidth solid transparent; - border-right: @arrowWidth solid @black; - } -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/modals.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/modals.less deleted file mode 100644 index d1f1d0a..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/modals.less +++ /dev/null @@ -1,87 +0,0 @@ -// MODALS -// ------ - -// Recalculate z-index where appropriate -.modal-open { - .dropdown-menu { z-index: (@zindexDropdown + @zindexModal); } - .dropdown.open { *z-index: (@zindexDropdown + @zindexModal); } - .popover { z-index: (@zindexPopover + @zindexModal); } - .tooltip { z-index: (@zindexTooltip + @zindexModal); } -} - -.modal-body a { - color: #0AAADF; -} - -// Background -.modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: @zindexModalBackdrop; - background-color: @black; - // Fade for backdrop - &.fade { opacity: 0; } -} - -.modal-backdrop, -.modal-backdrop.fade.in { - opacity: 0.6; -} - -// Base modal -.modal { - position: fixed; - top: 50%; - left: 50%; - z-index: @zindexModal; - max-height: 580px; - overflow: auto; - width: 560px; - margin: -250px 0 0 -280px; - background-color: @white; - border: 1px solid #999; - border: 1px solid rgba(0,0,0,.3); - *border: 1px solid #999; /* IE6-7 */ - .border-radius(6px); - .box-shadow(0 3px 7px rgba(0,0,0,0.3)); - .background-clip(padding-box); - &.fade { - .transition(e('opacity .3s linear, top .3s ease-out')); - top: -25%; - } - &.fade.in { top: 50%; } -} -.modal-header { - padding: 9px 15px; - border-bottom: 1px solid #eee; - // Close icon - .close { margin-top: 2px; } -} - -// Body (where all modal content resises) -.modal-body { - padding: 15px; -} -// Remove bottom margin if need be -.modal-body .modal-form { - margin-bottom: 0; -} - -// Footer (for actions) -.modal-footer { - padding: 14px 15px 15px; - margin-bottom: 0; - background-color: #f5f5f5; - border-top: 1px solid #ddd; - .border-radius(0 0 6px 6px); - .box-shadow(inset 0 1px 0 @white); - .clearfix(); - .btn { - float: right; - margin-left: 5px; - margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs - } -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/navbar.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/navbar.less deleted file mode 100644 index 16553c1..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/navbar.less +++ /dev/null @@ -1,299 +0,0 @@ -// NAVBAR (FIXED AND STATIC) -// ------------------------- - - -// COMMON STYLES -// ------------- - -.navbar { - overflow: visible; - margin-bottom: @baseLineHeight; -} - -// Gradient is applied to it's own element because overflow visible is not honored by IE when filter is present -.navbar-inner { - padding-left: 20px; - padding-right: 20px; - #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground); - .border-radius(4px); - @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - .box-shadow(@shadow); -} - -// Navbar button for toggling navbar items in responsive layouts -.btn-navbar { - display: none; - float: right; - padding: 7px 10px; - margin-left: 5px; - margin-right: 5px; - .buttonBackground(@navbarBackgroundHighlight, @navbarBackground); - @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); - .box-shadow(@shadow); -} -.btn-navbar .icon-bar { - display: block; - width: 18px; - height: 2px; - background-color: #f5f5f5; - .border-radius(1px); - .box-shadow(0 1px 0 rgba(0,0,0,.25)); -} -.btn-navbar .icon-bar + .icon-bar { - margin-top: 3px; -} -// Override the default collapsed state -.nav-collapse.collapse { - height: auto; -} - - -// Brand, links, text, and buttons -.navbar { - // Hover and active states - .brand:hover { - text-decoration: none; - } - // Website or project name - .brand { - float: left; - display: block; - padding: 8px 20px 12px; - margin-left: -20px; // negative indent to left-align the text down the page - font-size: 20px; - font-weight: 200; - line-height: 1; - color: @white; - } - // Plain text in topbar - .navbar-text { - margin-bottom: 0; - line-height: 40px; - color: @navbarText; - a:hover { - color: @white; - background-color: transparent; - } - } - // Buttons in navbar - .btn, - .btn-group { - margin-top: 5px; // make buttons vertically centered in navbar - } - .btn-group .btn { - margin-top: 0; // then undo the margin here so we don't accidentally double it - } -} - -// Navbar forms -.navbar-form { - margin-bottom: 0; // remove default bottom margin - .clearfix(); - input, - select { - display: inline-block; - margin-top: 5px; - margin-bottom: 0; - } - .radio, - .checkbox { - margin-top: 5px; - } - input[type="image"], - input[type="checkbox"], - input[type="radio"] { - margin-top: 3px; - } - .input-append, - .input-prepend { - margin-top: 6px; - white-space: nowrap; // preven two items from separating within a .navbar-form that has .pull-left - input { - margin-top: 0; // remove the margin on top since it's on the parent - } - } -} - -// Navbar search -.navbar-search { - position: relative; - float: left; - margin-top: 6px; - margin-bottom: 0; - .search-query { - padding: 4px 9px; - #font > .sans-serif(13px, normal, 1); - color: @white; - color: rgba(255,255,255,.75); - background: #666; - background: rgba(255,255,255,.3); - border: 1px solid #111; - @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); - .box-shadow(@shadow); - .transition(none); - - // Placeholder text gets special styles; can't be bundled together though for some reason - .placeholder(@grayLighter); - - // Hover states - &:hover { - color: @white; - background-color: @grayLight; - background-color: rgba(255,255,255,.5); - } - // Focus states (we use .focused since IE7-8 and down doesn't support :focus) - &:focus, - &.focused { - padding: 5px 10px; - color: @grayDark; - text-shadow: 0 1px 0 @white; - background-color: @white; - border: 0; - .box-shadow(0 0 3px rgba(0,0,0,.15)); - outline: 0; - } - } -} - - -// FIXED NAVBAR -// ------------ - -.navbar-fixed-top { - position: fixed; - top: 0; - right: 0; - left: 0; - z-index: @zindexFixedNavbar; -} -.navbar-fixed-top .navbar-inner { - padding-left: 0; - padding-right: 0; - .border-radius(0); -} - - -// NAVIGATION -// ---------- - -.navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} -.navbar .nav.pull-right { - float: right; // redeclare due to specificity -} -.navbar .nav > li { - display: block; - float: left; -} - -// Links -.navbar .nav > li > a { - float: none; - padding: 10px 10px 11px; - line-height: 19px; - color: @navbarLinkColor; - text-decoration: none; - text-shadow: 0 -1px 0 rgba(0,0,0,.25); -} -// Hover -.navbar .nav > li > a:hover { - background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active - color: @navbarLinkColorHover; - text-decoration: none; -} - -// Active nav items -.navbar .nav .active > a, -.navbar .nav .active > a:hover { - color: @navbarLinkColorHover; - text-decoration: none; - background-color: @navbarBackground; -} - -// Dividers (basically a vertical hr) -.navbar .divider-vertical { - height: @navbarHeight; - width: 1px; - margin: 0 9px; - overflow: hidden; - background-color: @navbarBackground; - border-right: 1px solid @navbarBackgroundHighlight; -} - -// Secondary (floated right) nav in topbar -.navbar .nav.pull-right { - margin-left: 10px; - margin-right: 0; -} - - - -// Dropdown menus -// -------------- - -// Menu position and menu carets -.navbar .dropdown-menu { - margin-top: 1px; - .border-radius(4px); - &:before { - content: ''; - display: inline-block; - border-left: 7px solid transparent; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-bottom-color: rgba(0,0,0,.2); - position: absolute; - top: -7px; - left: 9px; - } - &:after { - content: ''; - display: inline-block; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - border-bottom: 6px solid @white; - position: absolute; - top: -6px; - left: 10px; - } -} - -// Dropdown toggle caret -.navbar .nav .dropdown-toggle .caret, -.navbar .nav .open.dropdown .caret { - border-top-color: @white; -} -.navbar .nav .active .caret { - .opacity(100); -} - -// Remove background color from open dropdown -.navbar .nav .open > .dropdown-toggle, -.navbar .nav .active > .dropdown-toggle, -.navbar .nav .open.active > .dropdown-toggle { - background-color: transparent; -} - -// Dropdown link on hover -.navbar .nav .active > .dropdown-toggle:hover { - color: @white; -} - -// Right aligned menus need alt position -.navbar .nav.pull-right .dropdown-menu { - left: auto; - right: 0; - &:before { - left: auto; - right: 12px; - } - &:after { - left: auto; - right: 13px; - } -} \ No newline at end of file diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/navs.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/navs.less deleted file mode 100644 index 06219fa..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/navs.less +++ /dev/null @@ -1,353 +0,0 @@ -// NAVIGATIONS -// ----------- - - - -// BASE CLASS -// ---------- - -.nav { - margin-left: 0; - margin-bottom: @baseLineHeight; - list-style: none; -} - -// Make links block level -.nav > li > a { - display: block; -} -.nav > li > a:hover { - text-decoration: none; - background-color: @grayLighter; -} - -// Nav headers (for dropdowns and lists) -.nav .nav-header { - display: block; - padding: 3px 15px; - font-size: 11px; - font-weight: bold; - line-height: @baseLineHeight; - color: @grayLight; - text-shadow: 0 1px 0 rgba(255,255,255,.5); - text-transform: uppercase; -} -// Space them out when they follow another list item (link) -.nav li + .nav-header { - margin-top: 9px; -} - - -// NAV LIST -// -------- - -.nav-list { - padding-left: 14px; - padding-right: 14px; - margin-bottom: 0; -} -.nav-list > li > a, -.nav-list .nav-header { - margin-left: -15px; - margin-right: -15px; - text-shadow: 0 1px 0 rgba(255,255,255,.5); -} -.nav-list > li > a { - padding: 3px 15px; -} -.nav-list .active > a, -.nav-list .active > a:hover { - color: @white; - text-shadow: 0 -1px 0 rgba(0,0,0,.2); - background-color: @linkColor; -} -.nav-list [class^="icon-"] { - margin-right: 2px; -} - - - -// TABS AND PILLS -// ------------- - -// Common styles -.nav-tabs, -.nav-pills { - .clearfix(); -} -.nav-tabs > li, -.nav-pills > li { - float: left; -} -.nav-tabs > li > a, -.nav-pills > li > a { - padding-right: 12px; - padding-left: 12px; - margin-right: 2px; - line-height: 14px; // keeps the overall height an even number -} - -// TABS -// ---- - -// Give the tabs something to sit on -.nav-tabs { - border-bottom: 1px solid #ddd; -} - -// Make the list-items overlay the bottom border -.nav-tabs > li { - margin-bottom: -1px; -} - -// Actual tabs (as links) -.nav-tabs > li > a { - padding-top: 9px; - padding-bottom: 9px; - border: 1px solid transparent; - .border-radius(4px 4px 0 0); - &:hover { - border-color: @grayLighter @grayLighter #ddd; - } -} -// Active state, and it's :hover to override normal :hover -.nav-tabs > .active > a, -.nav-tabs > .active > a:hover { - color: @gray; - background-color: @white; - border: 1px solid #ddd; - border-bottom-color: transparent; - cursor: default; -} - -// PILLS -// ----- - -// Links rendered as pills -.nav-pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; - .border-radius(5px); -} - -// Active state -.nav-pills .active > a, -.nav-pills .active > a:hover { - color: @white; - background-color: @linkColor; -} - - - -// STACKED NAV -// ----------- - -// Stacked tabs and pills -.nav-stacked > li { - float: none; -} -.nav-stacked > li > a { - margin-right: 0; // no need for the gap between nav items -} - -// Tabs -.nav-tabs.nav-stacked { - border-bottom: 0; -} -.nav-tabs.nav-stacked > li > a { - border: 1px solid #ddd; - .border-radius(0); -} -.nav-tabs.nav-stacked > li:first-child > a { - .border-radius(4px 4px 0 0); -} -.nav-tabs.nav-stacked > li:last-child > a { - .border-radius(0 0 4px 4px); -} -.nav-tabs.nav-stacked > li > a:hover { - border-color: #ddd; - z-index: 2; -} - -// Pills -.nav-pills.nav-stacked > li > a { - margin-bottom: 3px; -} -.nav-pills.nav-stacked > li:last-child > a { - margin-bottom: 1px; // decrease margin to match sizing of stacked tabs -} - - - -// DROPDOWNS -// --------- - -// Position the menu -.nav-tabs .dropdown-menu, -.nav-pills .dropdown-menu { - margin-top: 1px; - border-width: 1px; -} -.nav-pills .dropdown-menu { - .border-radius(4px); -} - -// Default dropdown links -// ------------------------- -// Make carets use linkColor to start -.nav-tabs .dropdown-toggle .caret, -.nav-pills .dropdown-toggle .caret { - border-top-color: @linkColor; - margin-top: 6px; -} -.nav-tabs .dropdown-toggle:hover .caret, -.nav-pills .dropdown-toggle:hover .caret { - border-top-color: @linkColorHover; -} - -// Active dropdown links -// ------------------------- -.nav-tabs .active .dropdown-toggle .caret, -.nav-pills .active .dropdown-toggle .caret { - border-top-color: @grayDark; -} - -// Active:hover dropdown links -// ------------------------- -.nav > .dropdown.active > a:hover { - color: @black; - cursor: pointer; -} - -// Open dropdowns -// ------------------------- -.nav-tabs .open .dropdown-toggle, -.nav-pills .open .dropdown-toggle, -.nav > .open.active > a:hover { - color: @white; - background-color: @grayLight; - border-color: @grayLight; -} -.nav .open .caret, -.nav .open.active .caret, -.nav .open a:hover .caret { - border-top-color: @white; - .opacity(100); -} - -// Dropdowns in stacked tabs -.tabs-stacked .open > a:hover { - border-color: @grayLight; -} - - - -// TABBABLE -// -------- - - -// COMMON STYLES -// ------------- - -// Clear any floats -.tabbable { - .clearfix(); -} -.tab-content { - overflow: hidden; // prevent content from running below tabs -} - -// Remove border on bottom, left, right -.tabs-below .nav-tabs, -.tabs-right .nav-tabs, -.tabs-left .nav-tabs { - border-bottom: 0; -} - -// Show/hide tabbable areas -.tab-content > .tab-pane, -.pill-content > .pill-pane { - display: none; -} -.tab-content > .active, -.pill-content > .active { - display: block; -} - - -// BOTTOM -// ------ - -.tabs-below .nav-tabs { - border-top: 1px solid #ddd; -} -.tabs-below .nav-tabs > li { - margin-top: -1px; - margin-bottom: 0; -} -.tabs-below .nav-tabs > li > a { - .border-radius(0 0 4px 4px); - &:hover { - border-bottom-color: transparent; - border-top-color: #ddd; - } -} -.tabs-below .nav-tabs .active > a, -.tabs-below .nav-tabs .active > a:hover { - border-color: transparent #ddd #ddd #ddd; -} - -// LEFT & RIGHT -// ------------ - -// Common styles -.tabs-left .nav-tabs > li, -.tabs-right .nav-tabs > li { - float: none; -} -.tabs-left .nav-tabs > li > a, -.tabs-right .nav-tabs > li > a { - min-width: 74px; - margin-right: 0; - margin-bottom: 3px; -} - -// Tabs on the left -.tabs-left .nav-tabs { - float: left; - margin-right: 19px; - border-right: 1px solid #ddd; -} -.tabs-left .nav-tabs > li > a { - margin-right: -1px; - .border-radius(4px 0 0 4px); -} -.tabs-left .nav-tabs > li > a:hover { - border-color: @grayLighter #ddd @grayLighter @grayLighter; -} -.tabs-left .nav-tabs .active > a, -.tabs-left .nav-tabs .active > a:hover { - border-color: #ddd transparent #ddd #ddd; - *border-right-color: @white; -} - -// Tabs on the right -.tabs-right .nav-tabs { - float: right; - margin-left: 19px; - border-left: 1px solid #ddd; -} -.tabs-right .nav-tabs > li > a { - margin-left: -1px; - .border-radius(0 4px 4px 0); -} -.tabs-right .nav-tabs > li > a:hover { - border-color: @grayLighter @grayLighter @grayLighter #ddd; -} -.tabs-right .nav-tabs .active > a, -.tabs-right .nav-tabs .active > a:hover { - border-color: #ddd #ddd #ddd transparent; - *border-left-color: @white; -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/pager.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/pager.less deleted file mode 100644 index 104e41c..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/pager.less +++ /dev/null @@ -1,30 +0,0 @@ -// PAGER -// ----- - -.pager { - margin-left: 0; - margin-bottom: @baseLineHeight; - list-style: none; - text-align: center; - .clearfix(); -} -.pager li { - display: inline; -} -.pager a { - display: inline-block; - padding: 5px 14px; - background-color: #fff; - border: 1px solid #ddd; - .border-radius(15px); -} -.pager a:hover { - text-decoration: none; - background-color: #f5f5f5; -} -.pager .next a { - float: right; -} -.pager .previous a { - float: left; -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/pagination.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/pagination.less deleted file mode 100644 index fa3cba0..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/pagination.less +++ /dev/null @@ -1,55 +0,0 @@ -// PAGINATION -// ---------- - -.pagination { - //height: @baseLineHeight * 2; - margin: @baseLineHeight 0; - } -.pagination ul { - display: inline-block; - .ie7-inline-block(); - margin-left: 0; - margin-bottom: 0; - .border-radius(3px); - .box-shadow(0 1px 2px rgba(0,0,0,.05)); -} -.pagination li { - display: inline; - } -.pagination a { - float: left; - padding: 0 14px; - //line-height: (@baseLineHeight * 2) - 2; - text-decoration: none; - border: 1px solid #ddd; - border-left-width: 0; -} -.pagination a:hover, -.pagination .active a { - background-color: #f5f5f5; -} -.pagination .active a { - color: @grayLight; - cursor: default; -} -.pagination .disabled a, -.pagination .disabled a:hover { - color: @grayLight; - background-color: transparent; - cursor: default; -} -.pagination li:first-child a { - border-left-width: 1px; - .border-radius(3px 0 0 3px); -} -.pagination li:last-child a { - .border-radius(0 3px 3px 0); -} - -// Centered -.pagination-centered { - text-align: center; -} -.pagination-right { - text-align: right; -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/popovers.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/popovers.less deleted file mode 100644 index 558d99e..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/popovers.less +++ /dev/null @@ -1,49 +0,0 @@ -// POPOVERS -// -------- - -.popover { - position: absolute; - top: 0; - left: 0; - z-index: @zindexPopover; - display: none; - padding: 5px; - &.top { margin-top: -5px; } - &.right { margin-left: 5px; } - &.bottom { margin-top: 5px; } - &.left { margin-left: -5px; } - &.top .arrow { #popoverArrow > .top(); } - &.right .arrow { #popoverArrow > .right(); } - &.bottom .arrow { #popoverArrow > .bottom(); } - &.left .arrow { #popoverArrow > .left(); } - .arrow { - position: absolute; - width: 0; - height: 0; - } -} -.popover-inner { - padding: 3px; - width: 280px; - overflow: hidden; - background: @black; // has to be full background declaration for IE fallback - background: rgba(0,0,0,.8); - .border-radius(6px); - .box-shadow(0 3px 7px rgba(0,0,0,0.3)); -} -.popover-title { - padding: 9px 15px; - line-height: 1; - background-color: #f5f5f5; - border-bottom:1px solid #eee; - .border-radius(3px 3px 0 0); -} -.popover-content { - padding: 14px; - background-color: @white; - .border-radius(0 0 3px 3px); - .background-clip(padding-box); - p, ul, ol { - margin-bottom: 0; - } -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/progress-bars.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/progress-bars.less deleted file mode 100644 index c3144e1..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/progress-bars.less +++ /dev/null @@ -1,95 +0,0 @@ -// PROGRESS BARS -// ------------- - - -// ANIMATIONS -// ---------- - -// Webkit -@-webkit-keyframes progress-bar-stripes { - from { background-position: 0 0; } - to { background-position: 40px 0; } -} - -// Firefox -@-moz-keyframes progress-bar-stripes { - from { background-position: 0 0; } - to { background-position: 40px 0; } -} - -// Spec -@keyframes progress-bar-stripes { - from { background-position: 0 0; } - to { background-position: 40px 0; } -} - - - -// THE BARS -// -------- - -// Outer container -.progress { - overflow: hidden; - height: 18px; - margin-bottom: 18px; - #gradient > .vertical(#f5f5f5, #f9f9f9); - .box-shadow(inset 0 1px 2px rgba(0,0,0,.1)); - .border-radius(4px); -} - -// Bar of progress -.progress .bar { - width: 0%; - height: 18px; - color: @white; - font-size: 12px; - text-align: center; - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - #gradient > .vertical(#149bdf, #0480be); - .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15)); - .box-sizing(border-box); - .transition(width .6s ease); -} - -// Striped bars -.progress-striped .bar { - #gradient > .striped(#62c462); - .background-size(40px 40px); -} - -// Call animation for the active one -.progress.active .bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; -} - - - -// COLORS -// ------ - -// Danger (red) -.progress-danger .bar { - #gradient > .vertical(#ee5f5b, #c43c35); -} -.progress-danger.progress-striped .bar { - #gradient > .striped(#ee5f5b); -} - -// Success (green) -.progress-success .bar { - #gradient > .vertical(#62c462, #57a957); -} -.progress-success.progress-striped .bar { - #gradient > .striped(#62c462); -} - -// Info (teal) -.progress-info .bar { - #gradient > .vertical(#5bc0de, #339bb9); -} -.progress-info.progress-striped .bar { - #gradient > .striped(#5bc0de); -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/reset.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/reset.less deleted file mode 100644 index 1115f59..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/reset.less +++ /dev/null @@ -1,126 +0,0 @@ -// Reset.less -// Adapted from Normalize.css http://github.com/necolas/normalize.css -// ------------------------------------------------------------------------ - -// Display in IE6-9 and FF3 -// ------------------------- - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { - display: block; -} - -// Display block in IE6-9 and FF3 -// ------------------------- - -audio, -canvas, -video { - display: inline-block; - *display: inline; - *zoom: 1; -} - -// Prevents modern browsers from displaying 'audio' without controls -// ------------------------- - -audio:not([controls]) { - display: none; -} - -// Base settings -// ------------------------- - -html { - font-size: 100%; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; -} -// Focus states -a:focus { - .tab-focus(); -} -// Hover & Active -a:hover, -a:active { - outline: 0; -} - -// Prevents sub and sup affecting line-height in all browsers -// ------------------------- - -sub, -sup { - position: relative; - font-size: 75%; - line-height: 0; - vertical-align: baseline; -} -sup { - top: -0.5em; -} -sub { - bottom: -0.25em; -} - -// Img border in a's and image quality -// ------------------------- - -img { - max-width: 100%; - height: auto; - border: 0; - -ms-interpolation-mode: bicubic; -} - -// Forms -// ------------------------- - -// Font size in all browsers, margin changes, misc consistency -button, -input, -select, -textarea { - margin: 0; - font-size: 100%; - vertical-align: middle; -} -button, -input { - *overflow: visible; // Inner spacing ie IE6/7 - line-height: normal; // FF3/4 have !important on line-height in UA stylesheet -} -button::-moz-focus-inner, -input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 - padding: 0; - border: 0; -} -button, -input[type="button"], -input[type="reset"], -input[type="submit"] { - cursor: pointer; // Cursors on all buttons applied consistently - -webkit-appearance: button; // Style clickable inputs in iOS -} -input[type="search"] { // Appearance in Safari/Chrome - -webkit-appearance: textfield; - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; -} -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5 -} -textarea { - overflow: auto; // Remove vertical scrollbar in IE6-9 - vertical-align: top; // Readability and alignment cross-browser -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/responsive.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/responsive.less deleted file mode 100644 index 7334aa7..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/responsive.less +++ /dev/null @@ -1,327 +0,0 @@ -/*! - * Bootstrap Responsive v2.0.1 - * - * Copyright 2012 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 @twitter by @mdo and @fat. - */ - -// Responsive.less -// For phone and tablet devices -// ------------------------------------------------------------- - - -// REPEAT VARIABLES & MIXINS -// ------------------------- -// Required since we compile the responsive stuff separately - -@import "variables.less"; // Modify this for custom colors, font-sizes, etc -@import "mixins.less"; - - -// RESPONSIVE CLASSES -// ------------------ - -// Hide from screenreaders and browsers -// Credit: HTML5 Boilerplate -.hidden { - display: none; - visibility: hidden; -} - - - -// UP TO LANDSCAPE PHONE -// --------------------- - -@media (max-width: 480px) { - - // Smooth out the collapsing/expanding nav - .nav-collapse { - -webkit-transform: translate3d(0, 0, 0); // activate the GPU - } - - // Block level the page header small tag for readability - .page-header h1 small { - display: block; - line-height: @baseLineHeight; - } - - // Make span* classes full width - input[class*="span"], - select[class*="span"], - textarea[class*="span"], - .uneditable-input { - display: block; - width: 100%; - min-height: 28px; /* Make inputs at least the height of their button counterpart */ - /* Makes inputs behave like true block-level elements */ - -webkit-box-sizing: border-box; /* Older Webkit */ - -moz-box-sizing: border-box; /* Older FF */ - -ms-box-sizing: border-box; /* IE8 */ - box-sizing: border-box; /* CSS3 spec*/ - } - // But don't let it screw up prepend/append inputs - .input-prepend input[class*="span"], - .input-append input[class*="span"] { - width: auto; - } - - // Update checkboxes for iOS - input[type="checkbox"], - input[type="radio"] { - border: 1px solid #ccc; - } - - // Remove the horizontal form styles - .form-horizontal .control-group > label { - float: none; - width: auto; - padding-top: 0; - text-align: left; - } - // Move over all input controls and content - .form-horizontal .controls { - margin-left: 0; - } - // Move the options list down to align with labels - .form-horizontal .control-list { - padding-top: 0; // has to be padding because margin collaspes - } - // Move over buttons in .form-actions to align with .controls - .form-horizontal .form-actions { - padding-left: 10px; - padding-right: 10px; - } - - // Modals - .modal { - position: absolute; - top: 10px; - left: 10px; - right: 10px; - width: auto; - margin: 0; - &.fade.in { top: auto; } - } - .modal-header .close { - padding: 10px; - margin: -10px; - } - - // Carousel - .carousel-caption { - position: static; - } - -} - - - -// LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET -// -------------------------------------------------- - -@media (max-width: 767px) { - // GRID & CONTAINERS - // ----------------- - // Remove width from containers - .container { - width: auto; - padding: 0 20px; - } - // Fluid rows - .row-fluid { - width: 100%; - } - // Undo negative margin on rows - .row { - margin-left: 0; - } - // Make all columns even - .row > [class*="span"], - .row-fluid > [class*="span"] { - float: none; - display: block; - width: auto; - margin: 0; - } -} - - - -// PORTRAIT TABLET TO DEFAULT DESKTOP -// ---------------------------------- - -@media (min-width: 768px) and (max-width: 979px) { - - // Fixed grid - #gridSystem > .generate(12, 42px, 20px); - - // Fluid grid - #fluidGridSystem > .generate(12, 5.801104972%, 2.762430939%); - - // Input grid - #inputGridSystem > .generate(12, 42px, 20px); - -} - - - -// TABLETS AND BELOW -// ----------------- -@media (max-width: 979px) { - - // UNFIX THE TOPBAR - // ---------------- - // Remove any padding from the body - body { - padding-top: 0; - } - // Unfix the navbar - .navbar-fixed-top { - position: static; - margin-bottom: @baseLineHeight; - } - .navbar-fixed-top .navbar-inner { - padding: 5px; - } - .navbar .container { - width: auto; - padding: 0; - } - // Account for brand name - .navbar .brand { - padding-left: 10px; - padding-right: 10px; - margin: 0 0 0 -5px; - } - // Nav collapse clears brand - .navbar .nav-collapse { - clear: left; - } - // Block-level the nav - .navbar .nav { - float: none; - //margin: 0 0 (@baseLineHeight / 2); - } - .navbar .nav > li { - float: none; - } - .navbar .nav > li > a { - margin-bottom: 2px; - } - .navbar .nav > .divider-vertical { - display: none; - } - .navbar .nav .nav-header { - color: @navbarText; - text-shadow: none; - } - // Nav and dropdown links in navbar - .navbar .nav > li > a, - .navbar .dropdown-menu a { - padding: 6px 15px; - font-weight: bold; - color: @navbarLinkColor; - .border-radius(3px); - } - .navbar .dropdown-menu li + li a { - margin-bottom: 2px; - } - .navbar .nav > li > a:hover, - .navbar .dropdown-menu a:hover { - background-color: @navbarBackground; - } - // Dropdowns in the navbar - .navbar .dropdown-menu { - position: static; - top: auto; - left: auto; - float: none; - display: block; - max-width: none; - margin: 0 15px; - padding: 0; - background-color: transparent; - border: none; - .border-radius(0); - .box-shadow(none); - } - .navbar .dropdown-menu:before, - .navbar .dropdown-menu:after { - display: none; - } - .navbar .dropdown-menu .divider { - display: none; - } - // Forms in navbar - .navbar-form, - .navbar-search { - float: none; - //padding: (@baseLineHeight / 2) 15px; - //margin: (@baseLineHeight / 2) 0; - border-top: 1px solid @navbarBackground; - border-bottom: 1px solid @navbarBackground; - @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); - .box-shadow(@shadow); - } - // Pull right (secondary) nav content - .navbar .nav.pull-right { - float: none; - margin-left: 0; - } - // Static navbar - .navbar-static .navbar-inner { - padding-left: 10px; - padding-right: 10px; - } - // Navbar button - .btn-navbar { - display: block; - } - - // Hide everything in the navbar save .brand and toggle button */ - .nav-collapse { - overflow: hidden; - height: 0; - } -} - - - -// DEFAULT DESKTOP -// --------------- - -@media (min-width: 980px) { - .nav-collapse.collapse { - height: auto !important; - } -} - - - -// LARGE DESKTOP & UP -// ------------------ - -@media (min-width: 1200px) { - - // Fixed grid - #gridSystem > .generate(12, 70px, 30px); - - // Fluid grid - #fluidGridSystem > .generate(12, 5.982905983%, 2.564102564%); - - // Input grid - #inputGridSystem > .generate(12, 70px, 30px); - - // Thumbnails - .thumbnails { - margin-left: -30px; - } - .thumbnails > li { - margin-left: 30px; - } - -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/scaffolding.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/scaffolding.less deleted file mode 100644 index 47ce538..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/scaffolding.less +++ /dev/null @@ -1,29 +0,0 @@ -// Scaffolding -// Basic and global styles for generating a grid system, structural layout, and page templates -// ------------------------------------------------------------------------------------------- - - -// STRUCTURAL LAYOUT -// ----------------- - -body { - margin: 0; - font-family: @baseFontFamily; - font-size: @baseFontSize; - line-height: @baseLineHeight; - color: @textColor; - background-color: @white; -} - - -// LINKS -// ----- - -a { - color: @linkColor; - text-decoration: none; -} -a:hover { - color: @linkColorHover; - text-decoration: underline; -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/sprites.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/sprites.less deleted file mode 100644 index eb44e16..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/sprites.less +++ /dev/null @@ -1,460 +0,0 @@ -// SPRITES -// Glyphs and icons for buttons, nav, and more -// ------------------------------------------- - - -// ICONS -// ----- - -// All icons receive the styles of the tag with a base class -// of .i and are then given a unique class to add width, height, -// and background-position. Your resulting HTML will look like -// . - -// For the white version of the icons, just add the .icon-white class: -// - -[class^="icon-"], -[class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - line-height: 14px; - vertical-align: text-top; - background-image: url(@iconSpritePath); - background-position: 14px 14px; - background-repeat: no-repeat; - - .ie7-restore-right-whitespace(); -} -.icon-white { - background-image: url(@iconWhiteSpritePath); -} - -.icon-grey { - background-image: url(@iconGreySpritePath); -} - -.icon-glass { - background-position: 0 0; -} -.icon-music { - background-position: -24px 0; -} -.icon-search { - background-position: -48px 0; -} -.icon-envelope { - background-position: -72px 0; -} -.icon-heart { - background-position: -96px 0; -} -.icon-star { - background-position: -120px 0; -} -.icon-star-empty { - background-position: -144px 0; -} -.icon-user { - background-position: -168px 0; -} -.icon-film { - background-position: -192px 0; -} -.icon-th-large { - background-position: -216px 0; -} -.icon-th { - background-position: -240px 0; -} -.icon-th-list { - background-position: -264px 0; -} -.icon-ok { - background-position: -288px 0; -} -.icon-remove { - background-position: -312px 0; -} -.icon-zoom-in { - background-position: -336px 0; -} -.icon-zoom-out { - background-position: -360px 0; -} -.icon-off { - background-position: -384px 0; -} -.icon-signal { - background-position: -408px 0; -} -.icon-cog { - background-position: -432px 0; -} -.icon-trash { - background-position: -456px 0; -} -.icon-home { - background-position: 0 -24px; -} -.icon-file { - background-position: -24px -24px; -} -.icon-time { - background-position: -48px -24px; -} -.icon-road { - background-position: -72px -24px; -} -.icon-download-alt { - background-position: -96px -24px; -} -.icon-download { - background-position: -120px -24px; -} -.icon-upload { - background-position: -144px -24px; -} -.icon-inbox { - background-position: -168px -24px; -} -.icon-play-circle { - background-position: -192px -24px; -} -.icon-repeat { - background-position: -216px -24px; -} -.icon-refresh { - background-position: -240px -24px; -} -.icon-list-alt { - background-position: -264px -24px; -} -.icon-lock { - background-position: -287px -24px; -} -.icon-flag { - background-position: -312px -24px; -} -.icon-headphones { - background-position: -336px -24px; -} -.icon-volume-off { - background-position: -360px -24px; -} -.icon-volume-down { - background-position: -384px -24px; -} -.icon-volume-up { - background-position: -408px -24px; -} -.icon-qrcode { - background-position: -432px -24px; -} -.icon-barcode { - background-position: -456px -24px; -} -.icon-tag { - background-position: 0 -48px; -} -.icon-tags { - background-position: -25px -48px; -} -.icon-book { - background-position: -48px -48px; -} -.icon-bookmark { - background-position: -72px -48px; -} -.icon-print { - background-position: -96px -48px; -} -.icon-camera { - background-position: -120px -48px; -} -.icon-font { - background-position: -144px -48px; -} -.icon-bold { - background-position: -167px -48px; -} -.icon-italic { - background-position: -192px -48px; -} -.icon-text-height { - background-position: -216px -48px; -} -.icon-text-width { - background-position: -240px -48px; -} -.icon-align-left { - background-position: -264px -48px; -} -.icon-align-center { - background-position: -288px -48px; -} -.icon-align-right { - background-position: -312px -48px; -} -.icon-align-justify { - background-position: -336px -48px; -} -.icon-list { - background-position: -360px -48px; -} -.icon-indent-left { - background-position: -384px -48px; -} -.icon-indent-right { - background-position: -408px -48px; -} -.icon-facetime-video { - background-position: -432px -48px; -} -.icon-picture { - background-position: -456px -48px; -} -.icon-pencil { - background-position: 0 -72px; -} -.icon-map-marker { - background-position: -24px -72px; -} -.icon-adjust { - background-position: -48px -72px; -} -.icon-tint { - background-position: -72px -72px; -} -.icon-edit { - background-position: -96px -72px; -} -.icon-share { - background-position: -120px -72px; -} -.icon-check { - background-position: -144px -72px; -} -.icon-move { - background-position: -168px -72px; -} -.icon-step-backward { - background-position: -192px -72px; -} -.icon-fast-backward { - background-position: -216px -72px; -} -.icon-backward { - background-position: -240px -72px; -} -.icon-play { - background-position: -264px -72px; -} -.icon-pause { - background-position: -288px -72px; -} -.icon-stop { - background-position: -312px -72px; -} -.icon-forward { - background-position: -336px -72px; -} -.icon-fast-forward { - background-position: -360px -72px; -} -.icon-step-forward { - background-position: -384px -72px; -} -.icon-eject { - background-position: -408px -72px; -} -.icon-chevron-left { - background-position: -432px -72px; -} -.icon-chevron-right { - background-position: -456px -72px; -} -.icon-plus-sign { - background-position: 0 -96px; -} -.icon-minus-sign { - background-position: -24px -96px; -} -.icon-remove-sign { - background-position: -48px -96px; -} -.icon-ok-sign { - background-position: -72px -96px; -} -.icon-question-sign { - background-position: -96px -96px; -} -.icon-info-sign { - background-position: -120px -96px; -} -.icon-screenshot { - background-position: -144px -96px; -} -.icon-remove-circle { - background-position: -168px -96px; -} -.icon-ok-circle { - background-position: -192px -96px; -} -.icon-ban-circle { - background-position: -216px -96px; -} -.icon-arrow-left { - background-position: -240px -96px; -} -.icon-arrow-right { - background-position: -264px -96px; -} -.icon-arrow-up { - background-position: -289px -96px; -} -.icon-arrow-down { - background-position: -312px -96px; -} -.icon-share-alt { - background-position: -336px -96px; -} -.icon-resize-full { - background-position: -360px -96px; -} -.icon-resize-small { - background-position: -384px -96px; -} -.icon-plus { - background-position: -408px -96px; -} -.icon-minus { - background-position: -433px -96px; -} -.icon-asterisk { - background-position: -456px -96px; -} -.icon-exclamation-sign { - background-position: 0 -120px; -} -.icon-gift { - background-position: -24px -120px; -} -.icon-leaf { - background-position: -48px -120px; -} -.icon-fire { - background-position: -72px -120px; -} -.icon-eye-open { - background-position: -96px -120px; -} -.icon-eye-close { - background-position: -120px -120px; -} -.icon-warning-sign { - background-position: -144px -120px; -} -.icon-plane { - background-position: -168px -120px; -} -.icon-calendar { - background-position: -192px -120px; -} -.icon-random { - background-position: -216px -120px; - width: 16px; -} -.icon-comment { - background-position: -240px -120px; -} -.icon-magnet { - background-position: -264px -120px; -} -.icon-chevron-up { - background-position: -288px -120px; -} -.icon-chevron-down { - background-position: -313px -119px; -} -.icon-retweet { - background-position: -336px -120px; -} -.icon-shopping-cart { - background-position: -360px -120px; -} -.icon-folder-close { - background-position: -384px -120px; - width: 16px; -} -.icon-folder-open { - background-position: -408px -120px; - width: 16px; -} -.icon-resize-vertical { - background-position: -432px -119px; -} -.icon-resize-horizontal { - background-position: -456px -118px; -} -.icon-hdd { - background-position: 0 -144px; -} -.icon-bullhorn { - background-position: -24px -144px; -} -.icon-bell { - background-position: -48px -144px; -} -.icon-certificate { - background-position: -72px -144px; -} -.icon-thumbs-up { - background-position: -96px -144px; -} -.icon-thumbs-down { - background-position: -120px -144px; -} -.icon-hand-right { - background-position: -144px -144px; -} -.icon-hand-left { - background-position: -168px -144px; -} -.icon-hand-up { - background-position: -192px -144px; -} -.icon-hand-down { - background-position: -216px -144px; -} -.icon-circle-arrow-right { - background-position: -240px -144px; -} -.icon-circle-arrow-left { - background-position: -264px -144px; -} -.icon-circle-arrow-up { - background-position: -288px -144px; -} -.icon-circle-arrow-down { - background-position: -312px -144px; -} -.icon-globe { - background-position: -336px -144px; -} -.icon-wrench { - background-position: -360px -144px; -} -.icon-tasks { - background-position: -384px -144px; -} -.icon-filter { - background-position: -408px -144px; -} -.icon-briefcase { - background-position: -432px -144px; -} -.icon-fullscreen { - background-position: -456px -144px; -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/style.css b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/style.css index 5115017..1690b7b 100644 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/style.css +++ b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/style.css @@ -1228,9 +1228,9 @@ li.item p { background: url('/bundles/trinityadmin/img/flags/de.png') center center no-repeat; } -.nav-tab-zh a, -.nav-tab-zh_CN a { - background: url('/bundles/trinityadmin/img/flags/ch.png') center center no-repeat; +.nav-tab-cn a, +.nav-tab-cn_CN a { + background: url('/bundles/trinityadmin/img/flags/cn.png') center center no-repeat; } .file-preview-img { diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/tables.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/tables.less deleted file mode 100644 index 3c0abe9..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/tables.less +++ /dev/null @@ -1,150 +0,0 @@ -// -// Tables.less -// Tables for, you guessed it, tabular data -// ---------------------------------------- - - -// BASE TABLES -// ----------------- - -table { - max-width: 100%; - border-collapse: collapse; - border-spacing: 0; -} - -// BASELINE STYLES -// --------------- - -.table { - width: 100%; - margin-bottom: @baseLineHeight; - // Cells - th, - td { - padding: 8px; - line-height: @baseLineHeight; - text-align: left; - vertical-align: top; - border-top: 1px solid #ddd; - } - th { - font-weight: bold; - } - // Bottom align for column headings - thead th { - vertical-align: bottom; - } - // Remove top border from thead by default - thead:first-child tr th, - thead:first-child tr td { - border-top: 0; - } - // Account for multiple tbody instances - tbody + tbody { - border-top: 2px solid #ddd; - } -} - - - -// CONDENSED TABLE W/ HALF PADDING -// ------------------------------- - -.table-condensed { - th, - td { - padding: 4px 5px; - } -} - - -// BORDERED VERSION -// ---------------- - -.table-bordered { - border: 1px solid #ddd; - border-collapse: separate; // Done so we can round those corners! - *border-collapse: collapsed; // IE7 can't round corners anyway - .border-radius(4px); - th + th, - td + td, - th + td, - td + th { - border-left: 1px solid #ddd; - } - // Prevent a double border - thead:first-child tr:first-child th, - tbody:first-child tr:first-child th, - tbody:first-child tr:first-child td { - border-top: 0; - } - // For first th or td in the first row in the first thead or tbody - thead:first-child tr:first-child th:first-child, - tbody:first-child tr:first-child td:first-child { - .border-radius(4px 0 0 0); - } - thead:first-child tr:first-child th:last-child, - tbody:first-child tr:first-child td:last-child { - .border-radius(0 4px 0 0); - } - // For first th or td in the first row in the first thead or tbody - thead:last-child tr:last-child th:first-child, - tbody:last-child tr:last-child td:first-child { - .border-radius(0 0 0 4px); - } - thead:last-child tr:last-child th:last-child, - tbody:last-child tr:last-child td:last-child { - .border-radius(0 0 4px 0); - } -} - - -// ZEBRA-STRIPING -// -------------- - -// Default zebra-stripe styles (alternating gray and transparent backgrounds) -.table-striped { - tbody { - tr:nth-child(odd) td, - tr:nth-child(odd) th { - background-color: #f9f9f9; - } - } -} - - -// HOVER EFFECT -// ------------ -// Placed here since it has to come after the potential zebra striping -.table { - tbody tr:hover td, - tbody tr:hover th { - background-color: #f5f5f5; - } -} - - -// TABLE CELL SIZING -// ----------------- - -// Change the columns -.tableColumns(@columnSpan: 1) { - float: none; - //width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 16; - margin-left: 0; -} -table { - .span1 { .tableColumns(1); } - .span2 { .tableColumns(2); } - .span3 { .tableColumns(3); } - .span4 { .tableColumns(4); } - .span5 { .tableColumns(5); } - .span6 { .tableColumns(6); } - .span7 { .tableColumns(7); } - .span8 { .tableColumns(8); } - .span9 { .tableColumns(9); } - .span10 { .tableColumns(10); } - .span11 { .tableColumns(11); } - .span12 { .tableColumns(12); } -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/thumbnails.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/thumbnails.less deleted file mode 100644 index 3a12d4e..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/thumbnails.less +++ /dev/null @@ -1,35 +0,0 @@ -// THUMBNAILS -// ---------- - -.thumbnails { - margin-left: -@gridGutterWidth; - list-style: none; - .clearfix(); -} -.thumbnails > li { - float: left; - margin: 0 0 @baseLineHeight @gridGutterWidth; -} -.thumbnail { - display: block; - padding: 4px; - line-height: 1; - border: 1px solid #ddd; - .border-radius(4px); - .box-shadow(0 1px 1px rgba(0,0,0,.075)); -} -// Add a hover state for linked versions only -a.thumbnail:hover { - border-color: @linkColor; - .box-shadow(0 1px 4px rgba(0,105,214,.25)); -} -// Images and captions -.thumbnail > img { - display: block; - max-width: 100%; - margin-left: auto; - margin-right: auto; -} -.thumbnail .caption { - padding: 9px; -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/tooltip.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/tooltip.less deleted file mode 100644 index 5111a19..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/tooltip.less +++ /dev/null @@ -1,35 +0,0 @@ -// TOOLTIP -// ------= - -.tooltip { - position: absolute; - z-index: @zindexTooltip; - display: block; - visibility: visible; - padding: 5px; - font-size: 11px; - .opacity(0); - &.in { .opacity(80); } - &.top { margin-top: -2px; } - &.right { margin-left: 2px; } - &.bottom { margin-top: 2px; } - &.left { margin-left: -2px; } - &.top .tooltip-arrow { #popoverArrow > .top(); } - &.left .tooltip-arrow { #popoverArrow > .left(); } - &.bottom .tooltip-arrow { #popoverArrow > .bottom(); } - &.right .tooltip-arrow { #popoverArrow > .right(); } -} -.tooltip-inner { - max-width: 200px; - padding: 3px 8px; - color: @white; - text-align: center; - text-decoration: none; - background-color: @black; - .border-radius(4px); -} -.tooltip-arrow { - position: absolute; - width: 0; - height: 0; -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/type.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/type.less deleted file mode 100644 index 68afdf6..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/type.less +++ /dev/null @@ -1,220 +0,0 @@ -// Typography.less -// Headings, body text, lists, code, and more for a versatile and durable typography system -// ---------------------------------------------------------------------------------------- - - -// BODY TEXT -// --------- - -p { - //margin: 0 0 @baseLineHeight / 2; - font-family: @baseFontFamily; - font-size: @baseFontSize; - line-height: @baseLineHeight; - small { - //font-size: @baseFontSize - 2; - color: @grayLight; - } -} -.lead { - margin-bottom: @baseLineHeight; - font-size: 20px; - font-weight: 200; - //line-height: @baseLineHeight * 1.5; -} - -// HEADINGS -// -------- - -h1, h2, h3, h4, h5, h6 { - margin:10px 0; - font-weight: bold; - color: @grayDark; - text-rendering: optimizelegibility; // Fix the character spacing for headings - small { - font-weight: normal; - color: @grayLight; - } -} -h1 { - font-size: 30px; - //line-height: @baseLineHeight * 2; - margin:15px 0; - small { - font-size: 18px; - } -} -h2 { - font-size: 24px; - //line-height: @baseLineHeight * 2; - small { - font-size: 18px; - } -} -h3 { - //line-height: @baseLineHeight * 1.5; - font-size: 18px; - small { - font-size: 14px; - } -} -h4, h5, h6 { - line-height: @baseLineHeight; -} -h4 { - font-size: 14px; - small { - font-size: 12px; - } -} -h5 { - font-size: 12px; -} -h6 { - font-size: 11px; - color: @grayLight; - text-transform: uppercase; -} - -// Page header -.page-header { - //padding-bottom: @baseLineHeight - 1; - margin: @baseLineHeight 0; - border-bottom: 1px solid @grayLighter; -} -.page-header h1 { - line-height: 1; -} - - - -// LISTS -// ----- - -// Unordered and Ordered lists -ul, ol { - padding: 0; - //margin: 0 0 @baseLineHeight / 2 25px; -} -ul ul, -ul ol, -ol ol, -ol ul { - margin-bottom: 0; -} -ul { - list-style: disc; -} -ol { - list-style: decimal; -} -li { - line-height: @baseLineHeight; - list-style:none; -} -ul.unstyled, -ol.unstyled { - margin-left: 0; - list-style: none; -} - -// Description Lists -dl { - margin-bottom: @baseLineHeight; -} -dt, -dd { - line-height: @baseLineHeight; -} -dt { - font-weight: bold; -} -dd { - //margin-left: @baseLineHeight / 2; -} - -// MISC -// ---- - -// Horizontal rules -hr { - margin: @baseLineHeight 0; - border: 0; - border-top: 1px solid @hrBorder; - border-bottom: 1px solid @white; -} - -// Emphasis -strong { - font-weight: bold; -} -em { - font-style: italic; -} -.muted { - color: @grayLight; -} - -// Abbreviations and acronyms -abbr { - font-size: 90%; - text-transform: uppercase; - border-bottom: 1px dotted #ddd; - cursor: help; -} - -// Blockquotes -blockquote { - padding: 0 0 0 15px; - margin: 0 0 @baseLineHeight; - border-left: 5px solid @grayLighter; - p { - margin-bottom: 0; - #font > .shorthand(16px,300,@baseLineHeight * 1.25); - } - small { - display: block; - line-height: @baseLineHeight; - color: @grayLight; - &:before { - content: '\2014 \00A0'; - } - } - - // Float right with text-align: right - &.pull-right { - float: right; - padding-left: 0; - padding-right: 15px; - border-left: 0; - border-right: 5px solid @grayLighter; - p, - small { - text-align: right; - } - } -} - -// Quotes -q:before, -q:after, -blockquote:before, -blockquote:after { - content: ""; -} - -// Addresses -address { - display: block; - margin-bottom: @baseLineHeight; - line-height: @baseLineHeight; - font-style: normal; -} - -// Misc -small { - font-size: 100%; -} -cite { - font-style: normal; -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/utilities.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/utilities.less deleted file mode 100644 index d60d220..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/utilities.less +++ /dev/null @@ -1,23 +0,0 @@ -// UTILITY CLASSES -// --------------- - -// Quick floats -.pull-right { - float: right; -} -.pull-left { - float: left; -} - -// Toggling content -.hide { - display: none; -} -.show { - display: block; -} - -// Visibility -.invisible { - visibility: hidden; -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/variables.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/variables.less deleted file mode 100644 index c494502..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/variables.less +++ /dev/null @@ -1,108 +0,0 @@ -// Variables.less -// Variables to customize the look and feel of Bootstrap -// ----------------------------------------------------- - - - -// GLOBAL VALUES -// -------------------------------------------------- - -// Links -@linkColor: #e4e4e4; -@linkColorHover: darken(@linkColor, 15%); - -// Grays -@black: #000; -@grayDarker: #222; -@grayDark: #333; -@gray: #555; -@grayLight: #999; -@grayLighter: #eee; -@white: #fff; - -// Accent colors -@blue: #049cdb; -@blueDark: #0064cd; -@green: #46a546; -@red: #9d261d; -@yellow: #ffc40d; -@orange: #f89406; -@pink: #c3325f; -@purple: #7a43b6; - -// Typography -@baseFontSize: 12px; -@baseFontFamily: Arial, Verdana, sans-serif; -@baseLineHeight: 16px; -@textColor: @grayDark; - -// Buttons -@primaryButtonBackground: @linkColor; - - - -// COMPONENT VARIABLES -// -------------------------------------------------- - -// Z-index master list -// Used for a bird's eye view of components dependent on the z-axis -// Try to avoid customizing these :) -@zindexDropdown: 1000; -@zindexPopover: 1010; -@zindexTooltip: 1020; -@zindexFixedNavbar: 1030; -@zindexModalBackdrop: 1040; -@zindexModal: 1050; - -// Sprite icons path -@iconSpritePath: "../img/glyphicons-halflings.png"; -@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png"; -@iconGreySpritePath: "../img/glyphicons-halflings-grey.png"; - -// Input placeholder text color -@placeholderText: @grayLight; - -// Hr border color -@hrBorder: @grayLighter; - -// Navbar -@navbarHeight: 40px; -@navbarBackground: @grayDarker; -@navbarBackgroundHighlight: @grayDark; -@navbarLinkBackgroundHover: transparent; - -@navbarText: @grayLight; -@navbarLinkColor: @grayLight; -@navbarLinkColorHover: @white; - -// Form states and alerts -@warningText: #c09853; -@warningBackground: #fcf8e3; -@warningBorder: darken(spin(@warningBackground, -10), 3%); - -@errorText: #b94a48; -@errorBackground: #f2dede; -@errorBorder: darken(spin(@errorBackground, -10), 3%); - -@successText: #468847; -@successBackground: #dff0d8; -@successBorder: darken(spin(@successBackground, -10), 5%); - -@infoText: #3a87ad; -@infoBackground: #d9edf7; -@infoBorder: darken(spin(@infoBackground, -10), 7%); - - - -// GRID -// -------------------------------------------------- - -// Default 940px grid -@gridColumns: 12; -@gridColumnWidth: 60px; -@gridGutterWidth: 15px; -@gridRowWidth: ((@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))); - -// Fluid grid -@fluidGridColumnWidth: 6.382978723%; -@fluidGridGutterWidth: 2.127659574%; diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/wells.less b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/wells.less deleted file mode 100644 index 2fcd8b7..0000000 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/css/wells.less +++ /dev/null @@ -1,17 +0,0 @@ -// WELLS -// ----- - -.well { - min-height: 20px; - padding: 9px; - margin-bottom: 20px; - background-color: #f5f5f5; - border: 1px solid #eee; - border: 1px solid rgba(0,0,0,.05); - .border-radius(4px); - .box-shadow(inset 0 1px 1px rgba(0,0,0,.05)); - blockquote { - border-color: #ddd; - border-color: rgba(0,0,0,.15); - } -} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/js/admin.js b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/js/admin.js index 97a9031..bfec4b7 100644 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/js/admin.js +++ b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/public/js/admin.js @@ -528,7 +528,7 @@ var form_helpers = function() { dayNamesShort: trans('crud.picker.dayNamesShort'), dayNamesMin: trans('crud.picker.dayNamesMin'), weekHeader: trans('crud.picker.weekHeader'), - dateFormat: 'yy-mm-dd', + dateFormat: $(this).data('format') ? $(this).data('format') : 'yy-mm-dd', timeFormat: 'HH:mm:ss', showSecond: true }); diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/translations/TrinityAdminBundle.en.yml b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/translations/TrinityAdminBundle.en.yml index 8b88c3a..286dab3 100644 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/translations/TrinityAdminBundle.en.yml +++ b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/translations/TrinityAdminBundle.en.yml @@ -19,7 +19,7 @@ crud: form: file: - select: 'Select a fin' + select: 'Select a file' change: 'Modify selection' buttons: diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/views/BaseAdmin/index.html.twig b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/views/BaseAdmin/index.html.twig index d22f9c0..8f037d6 100644 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/views/BaseAdmin/index.html.twig +++ b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/views/BaseAdmin/index.html.twig @@ -8,7 +8,9 @@ {% render controller("TrinityAdminMenuBundle:Default:mainMenu") %} {% endblock %} -{% block breadcrumb %}{{ render_admin_breadcrumb() }}{% endblock %} +{% block breadcrumb %} + {{ render_admin_breadcrumb() }} +{% endblock %} {% block panel %} {% include "TrinityAdminBundle:BaseAdmin:panel.html.twig" %} diff --git a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/views/BaseAdmin/indexContextMenu.html.twig b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/views/BaseAdmin/indexContextMenu.html.twig index 239a60d..d93274b 100644 --- a/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/views/BaseAdmin/indexContextMenu.html.twig +++ b/vendor/trinity/src/Trinity/Bundle/AdminBundle/Resources/views/BaseAdmin/indexContextMenu.html.twig @@ -49,10 +49,10 @@ $.each(classes, function(i, v) { if (v !== 'ct-icon' && v.indexOf('ct-icon-') !== -1) { - var j = v.replace('ct-', ''); - var $i = $('').addClass(j); - $item.addClass("admin-item-icon"); - $item.prepend($i[0].outerHTML + " "); + /*var j = v.replace('ct-', '');*/ + /*var $i = $('').addClass(j);*/ + /*$item.addClass("admin-item-icon");*/ + /*$item.prepend($i[0].outerHTML + " ");*/ } }) }) diff --git a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Model/PageQuery.php b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Model/PageQuery.php index a0c160f..4d5d7a3 100644 --- a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Model/PageQuery.php +++ b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Model/PageQuery.php @@ -16,8 +16,13 @@ class PageQuery extends BasePageQuery $choices = array(); foreach ($dataModels as $class => $name) { - $query = $class.'Query'; - $objects = $query::create()->find(); + $query = \PropelQuery::from($class); + $method = method_exists( + $query, + 'dataModelsCollectionFind' + ) ? 'dataModelsCollectionFind' : 'find'; + + $objects = call_user_func(array($query, $method)); $choices[$name] = array(); @@ -31,6 +36,19 @@ class PageQuery extends BasePageQuery return $choices; } + + public function getDataModelsCollection($raw = false) + { + $method = method_exists( + $this->getDataModelQuery(), + 'dataModelsCollectionFind' + ) ? 'dataModelsCollectionFind' : 'find'; + + $method = ($raw) ? 'find' : $method; + + return $this->layOnDataModels() ? call_user_func(array($this->getDataModelQuery(), $method)) : array(); + } + public function filterByIsOrphan($key) { if ($key === true) { diff --git a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Page/PageManager.php b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Page/PageManager.php index d28bff5..605c434 100644 --- a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Page/PageManager.php +++ b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Page/PageManager.php @@ -87,6 +87,15 @@ class PageManager implements PageManagerInterface return $this->menus[$menu_name]; } + public function hasMenu($menu_name) + { + if (null === $this->menus) { + $this->loadMenus(); + } + + return array_key_exists($menu_name, $this->menus); + } + public function loadBlocks() { $this->blockManager->loadPageBlocks($this->current_page); diff --git a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Routing/NodeLoader.php b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Routing/NodeLoader.php index 45ed7a0..8c391ca 100644 --- a/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Routing/NodeLoader.php +++ b/vendor/trinity/src/Trinity/Bundle/ContentManagerBundle/Routing/NodeLoader.php @@ -53,8 +53,7 @@ class NodeLoader extends Loader if ($page && !$node->getController()) { $configuration = $page->getConfiguration(); - $controller = $configuration->getDefaultController() ? $configuration->getDefaultController( - ) : $controller; + $controller = $configuration->getDefaultController() ? $configuration->getDefaultController() : $controller; } $route = new NodeRoute($url, $defaults, $requirements); @@ -79,8 +78,7 @@ class NodeLoader extends Loader } elseif ($nav->transformDomainRegex()) { $route ->setHost($nav->getHost()) - ->addRequirements($nav->getHostRequirements()) - ; + ->addRequirements($nav->getHostRequirements()); } } @@ -96,8 +94,7 @@ class NodeLoader extends Loader $routes->add($routeName, $route); } } catch (\PropelException $e) { - throw new ResourceNotFoundException('Unable to find or load nodes. Please check your database access. ' . $e->getMessage( - )); + throw new ResourceNotFoundException('Unable to find or load nodes. Please check your database access. ' . $e->getMessage()); } return $routes; diff --git a/vendor/trinity/src/Trinity/Bundle/DashBoardBundle/Twig/Extension/ZoneExtension.php b/vendor/trinity/src/Trinity/Bundle/DashBoardBundle/Twig/Extension/ZoneExtension.php index 484c654..cb3a665 100644 --- a/vendor/trinity/src/Trinity/Bundle/DashBoardBundle/Twig/Extension/ZoneExtension.php +++ b/vendor/trinity/src/Trinity/Bundle/DashBoardBundle/Twig/Extension/ZoneExtension.php @@ -28,11 +28,11 @@ class ZoneExtension extends \Twig_Extension public function zoneRender(Zone $zone) { return $this->environment - ->loadTemplate($zone->getTemplate()) - ->render( - array( - 'zone' => $zone - ) - ); + ->loadTemplate($zone->getTemplate()) + ->render( + array( + 'zone' => $zone + ) + ); } } diff --git a/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Configuration/TemplateCrudConfiguration.php b/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Configuration/TemplateCrudConfiguration.php index a178b74..0df487b 100644 --- a/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Configuration/TemplateCrudConfiguration.php +++ b/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Configuration/TemplateCrudConfiguration.php @@ -26,7 +26,7 @@ class TemplateCrudConfiguration extends \Trinity\Bundle\AdminBundle\Configuratio ), )) - ->setMaxPerPage(20) + ->setMaxPerPage(100) ->setRankable(false) diff --git a/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Form/Type/TemplateFilterType.php b/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Form/Type/TemplateFilterType.php index 3349121..f324a52 100644 --- a/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Form/Type/TemplateFilterType.php +++ b/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Form/Type/TemplateFilterType.php @@ -9,7 +9,7 @@ class TemplateFilterType extends BaseAbstractType { protected $options = array( 'data_class' => 'Trinity\Bundle\NotificationBundle\Model\Template', - 'name' => 'template', + 'name' => 'filter_template', 'csrf_protection' => false, ); @@ -18,12 +18,28 @@ class TemplateFilterType extends BaseAbstractType */ public function buildForm(FormBuilderInterface $builder, array $options) { - $builder->add( - 'reference', - 'text', - array( - 'required' => false, - ) - ); + $builder->add( + 'reference', + 'text', + array( + 'required' => false, + ) + ); + + $builder->add( + 'description', + 'text', + array( + 'required' => false, + ) + ); + + $builder->add( + 'content', + 'text', + array( + 'required' => false, + ) + ); } } diff --git a/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Form/Type/TemplateType.php b/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Form/Type/TemplateType.php index 4bab0af..dd683a7 100644 --- a/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Form/Type/TemplateType.php +++ b/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Form/Type/TemplateType.php @@ -41,7 +41,7 @@ class TemplateType extends BaseAbstractType ) ); - if ($options['use_ace_editor'] === true) { + if (isset($options['use_ace_editor']) && $options['use_ace_editor'] === true) { $builder->add( 'content', 'ace_editor', diff --git a/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Model/Template.php b/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Model/Template.php index d222d5c..d8c1855 100644 --- a/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Model/Template.php +++ b/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Model/Template.php @@ -10,4 +10,11 @@ class Template extends BaseTemplate { return (string) $this->reference; } + + public function copyInto($copyObj, $deepCopy = false, $makeNew = true) + { + parent::copyInto($copyObj, $deepCopy, $makeNew); + + $copyObj->setReference('copy_'.$this->getReference()); + } } diff --git a/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Notifier/BasicNotifier.php b/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Notifier/BasicNotifier.php index f475640..11f2139 100644 --- a/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Notifier/BasicNotifier.php +++ b/vendor/trinity/src/Trinity/Bundle/NotificationBundle/Notifier/BasicNotifier.php @@ -80,6 +80,7 @@ class BasicNotifier extends AbstractNotifier $notification ->setContentRender($content) ->setLogContentRender($logContent) + ->setTemplate($template) ->setIsRead(false); if ($this->getUser()) { diff --git a/vendor/trinity/src/Trinity/Bundle/UserBundle/Resources/translations/TrinityUserBundle.en.yml b/vendor/trinity/src/Trinity/Bundle/UserBundle/Resources/translations/TrinityUserBundle.en.yml index ec0aca2..a76e2e7 100644 --- a/vendor/trinity/src/Trinity/Bundle/UserBundle/Resources/translations/TrinityUserBundle.en.yml +++ b/vendor/trinity/src/Trinity/Bundle/UserBundle/Resources/translations/TrinityUserBundle.en.yml @@ -4,10 +4,10 @@ admin: title: 'Login' connect: 'Connection' message: | - Veuillez saisir un identifiant et
    - mot de passe valide pour
    - accéder à la console
    - d'administration + Enter your username and
    + your password for
    + accessing the
    + admin panel xhr: message: 'You are logged out. To perform new actions, please log on.' diff --git a/vendor/trinity/src/Trinity/Bundle/VarsEditorBundle/Controller/VarsAdminController.php b/vendor/trinity/src/Trinity/Bundle/VarsEditorBundle/Controller/VarsAdminController.php index 6022caf..98369ec 100644 --- a/vendor/trinity/src/Trinity/Bundle/VarsEditorBundle/Controller/VarsAdminController.php +++ b/vendor/trinity/src/Trinity/Bundle/VarsEditorBundle/Controller/VarsAdminController.php @@ -63,7 +63,7 @@ class VarsAdminController extends Controller foreach ($config['fieldsets'] as $k => $fieldset) { if (isset($fieldset['vars'])) { foreach ($fieldset['vars'] as $l => $var) { - $config['fieldsets'][$k]['vars'][$l]['value'] = $post[$var['key']]; + $config['fieldsets'][$k]['vars'][$l]['value'] = $post[$var['key']]; } } elseif (isset($fieldset['tabs'])) { foreach ($fieldset['tabs'] as $l => $tab) { @@ -94,6 +94,9 @@ class VarsAdminController extends Controller if (isset($config['fieldsets']) && is_array($config['fieldsets'])) { foreach ($config['fieldsets'] as $fieldset) { if (isset($fieldset['tabs']) && is_array($fieldset['tabs'])) { + $title = isset($fieldset['title']) ? $fieldset['title'] : null; + $appendTemplate = isset($fieldset['append_template']) ? $fieldset['append_template'] : null; + $prependTemplate = isset($fieldset['prepend_template']) ? $fieldset['prepend_template'] : null; $title = isset($fieldset['title']) ? $fieldset['title'] : null; $tabs = array(); @@ -110,21 +113,25 @@ class VarsAdminController extends Controller continue; } + $help = isset($var['help']) ? array('data-help' => $this->get('translator')->trans($var['help'])) : array(); $options = isset($var['options']) ? $var['options'] : array(); - $value = isset($var['value']) ? $var['value'] : null; - $type = isset($var['type']) ? $var['type'] : 'text'; - $help = isset($var['help']) ? array('data-help' => $this->get('translator')->trans($var['help'])) : array(); - $name = $key.'_'.$var['key']; - $label = isset($var['label']) ? $var['label'] : $name; + $configuration = isset($var['configuration']) ? $var['configuration'] : array(); + + $configuration['attr'] = array_merge( + isset($configuration['attr']) ? $configuration['attr'] : array(), + array_merge($options, $help) + ); + + $type = isset($var['type']) ? $var['type'] : 'text'; + $name = $key.'_'.$var['key']; + + $configuration['label'] = isset($var['label']) ? $var['label'] : $name; + $configuration['data'] = isset($var['value']) ? $var['value'] : null; $form->add( $name, $type, - array( - 'label' => $label, - 'data' => $value, - 'attr' => array_merge($options, $help) - ) + $configuration ); $fields[] = $name; @@ -139,9 +146,13 @@ class VarsAdminController extends Controller $fieldsets[] = array( 'title' => $title, 'tabs' => $tabs, + 'prepend_template' => $prependTemplate, + 'append_template' => $appendTemplate, ); } elseif (isset($fieldset['vars']) && is_array($fieldset['vars'])) { $title = isset($fieldset['title']) ? $fieldset['title'] : null; + $appendTemplate = isset($fieldset['append_template']) ? $fieldset['append_template'] : null; + $prependTemplate = isset($fieldset['prepend_template']) ? $fieldset['prepend_template'] : null; $fields = array(); foreach ($fieldset['vars'] as $var) { @@ -153,21 +164,24 @@ class VarsAdminController extends Controller continue; } + $help = isset($var['help']) ? array('data-help' => $this->get('translator')->trans($var['help'])) : array(); $options = isset($var['options']) ? $var['options'] : array(); - $value = isset($var['value']) ? $var['value'] : null; - $type = isset($var['type']) ? $var['type'] : 'text'; - $help = isset($var['help']) ? array('data-help' => $this->get('translator')->trans($var['help'])) : array(); - $name = $var['key']; - $label = isset($var['label']) ? $var['label'] : $name; + $configuration = isset($var['configuration']) ? $var['configuration'] : array(); + $configuration['attr'] = array_merge( + isset($configuration['attr']) ? $configuration['attr'] : array(), + array_merge($options, $help) + ); + + $type = isset($var['type']) ? $var['type'] : 'text'; + $name = $var['key']; + + $configuration['label'] = isset($var['label']) ? $var['label'] : $name; + $configuration['data'] = isset($var['value']) ? $var['value'] : null; $form->add( $name, $type, - array( - 'label' => $label, - 'data' => $value, - 'attr' => array_merge($options, $help) - ) + $configuration ); $fields[] = $name; @@ -176,6 +190,8 @@ class VarsAdminController extends Controller $fieldsets[] = array( 'title' => $title, 'fields' => $fields, + 'prepend_template' => $prependTemplate, + 'append_template' => $appendTemplate, ); } } diff --git a/vendor/trinity/src/Trinity/Bundle/VarsEditorBundle/Resources/views/VarsAdmin/index.html.twig b/vendor/trinity/src/Trinity/Bundle/VarsEditorBundle/Resources/views/VarsAdmin/index.html.twig index 4768cd7..449154a 100644 --- a/vendor/trinity/src/Trinity/Bundle/VarsEditorBundle/Resources/views/VarsAdmin/index.html.twig +++ b/vendor/trinity/src/Trinity/Bundle/VarsEditorBundle/Resources/views/VarsAdmin/index.html.twig @@ -28,6 +28,12 @@
    {{ fieldset.title|trans }} + {% if fieldset.prepend_template is defined and fieldset.prepend_template %} +
    + + {{ include(fieldset.prepend_template) }} + {% endif %} +
    {% for fieldname in fieldset.fields %} {{ form_label(form[fieldname], null, { 'label_attr': {'class': 'control-label'} }) }} @@ -45,10 +51,22 @@
    {% endfor %} + + {% if fieldset.append_template is defined and fieldset.append_template %} + {{ include(fieldset.append_template) }} + {% endif %}
    {% elseif fieldset.tabs is defined %} {{ fieldset.title|trans }} -
    + + {% if fieldset.prepend_template is defined and fieldset.prepend_template %} +
    + + {{ include(fieldset.prepend_template) }} + {% else %} +
    + {% endif %} +
    {% endfor %} + {% if fieldset.append_template is defined and fieldset.append_template %} + {{ include(fieldset.append_template) }} + {% endif %} {% endif %} {% endfor %} diff --git a/vendor/trinity/src/Trinity/Bundle/VarsEditorBundle/Twig/Extension/GlobalVarsExtension.php b/vendor/trinity/src/Trinity/Bundle/VarsEditorBundle/Twig/Extension/GlobalVarsExtension.php index cb65095..0416038 100644 --- a/vendor/trinity/src/Trinity/Bundle/VarsEditorBundle/Twig/Extension/GlobalVarsExtension.php +++ b/vendor/trinity/src/Trinity/Bundle/VarsEditorBundle/Twig/Extension/GlobalVarsExtension.php @@ -21,9 +21,9 @@ class GlobalVarsExtension extends \Twig_Extension ); } - public function getGlobalVarValue($key, $locale = null) + public function getGlobalVarValue($key, $default = null, $locale = null) { - return $this->container->get('global_vars')->get($key, null, $locale); + return $this->container->get('global_vars')->get($key, $default, $locale); } public function getName() diff --git a/vendor/trinity/src/Trinity/Bundle/WidgetBundle/Resources/translations/TrinityWidgetBundle.en.yml b/vendor/trinity/src/Trinity/Bundle/WidgetBundle/Resources/translations/TrinityWidgetBundle.en.yml index bca9b61..3299b85 100644 --- a/vendor/trinity/src/Trinity/Bundle/WidgetBundle/Resources/translations/TrinityWidgetBundle.en.yml +++ b/vendor/trinity/src/Trinity/Bundle/WidgetBundle/Resources/translations/TrinityWidgetBundle.en.yml @@ -14,4 +14,4 @@ form: no_blocks: 'No block found.' no_associated_blocks: 'No associated block.' add: 'Add' - use_parent: 'use parent block.' + use_parent: 'Use parent block.'