Skip to content

Commit

Permalink
update assets (some are now in the CoreBundle)
Browse files Browse the repository at this point in the history
  • Loading branch information
rande committed Sep 25, 2014
1 parent 9fb78d8 commit 2f0621a
Show file tree
Hide file tree
Showing 368 changed files with 1,341 additions and 52,118 deletions.
16 changes: 8 additions & 8 deletions DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -193,17 +193,17 @@ public function getConfigTreeBuilder()
->children()
->arrayNode('stylesheets')
->defaultValue(array(
'bundles/sonataadmin/vendor/bootstrap/dist/css/bootstrap.min.css',
'bundles/sonataadmin/vendor/AdminLTE/css/font-awesome.min.css',
'bundles/sonataadmin/vendor/AdminLTE/css/ionicons.min.css',
'bundles/sonatacore/vendor/bootstrap/dist/css/bootstrap.min.css',
'bundles/sonatacore/vendor/components-font-awesome/css/font-awesome.min.css',
'bundles/sonatacore/vendor/ionicons/css/ionicons.min.css',
'bundles/sonataadmin/vendor/AdminLTE/css/AdminLTE.css',

'bundles/sonatacore/vendor/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css',

'bundles/sonataadmin/vendor/jqueryui/themes/base/jquery-ui.css',

'bundles/sonataadmin/vendor/select2/select2.css',
'bundles/sonataadmin/vendor/select2/select2-bootstrap.css',
'bundles/sonatacore/vendor/select2/select2.css',
'bundles/sonatacore/vendor/select2/select2-bootstrap.css',

'bundles/sonataadmin/vendor/x-editable/dist/bootstrap3-editable/css/bootstrap-editable.css',

Expand All @@ -215,12 +215,12 @@ public function getConfigTreeBuilder()
->end()
->arrayNode('javascripts')
->defaultValue(array(
'bundles/sonataadmin/vendor/jquery/dist/jquery.min.js',
'bundles/sonatacore/vendor/jquery/dist/jquery.min.js',
'bundles/sonataadmin/vendor/jquery.scrollTo/jquery.scrollTo.min.js',

'bundles/sonatacore/vendor/moment/min/moment.min.js',

'bundles/sonataadmin/vendor/bootstrap/dist/js/bootstrap.min.js',
'bundles/sonatacore/vendor/bootstrap/dist/js/bootstrap.min.js',

'bundles/sonatacore/vendor/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js',

Expand All @@ -232,7 +232,7 @@ public function getConfigTreeBuilder()

'bundles/sonataadmin/vendor/x-editable/dist/bootstrap3-editable/js/bootstrap-editable.min.js',

'bundles/sonataadmin/vendor/select2/select2.min.js',
'bundles/sonatacore/vendor/select2/select2.min.js',

'bundles/sonataadmin/App.js',
'bundles/sonataadmin/Admin.js',
Expand Down
18 changes: 9 additions & 9 deletions Resources/doc/reference/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -132,24 +132,24 @@ Full Configuration Options
- bundles/sonataadmin/admin-lte/css/font-awesome.min.css
- bundles/sonataadmin/admin-lte/css/ionicons.min.css
- bundles/sonataadmin/admin-lte/css/AdminLTE.css
- bundles/sonatajquery/themes/flick/jquery-ui-1.10.4.custom.css
- bundles/sonataadmin/select2/select2.css
- bundles/sonataadmin/select2/select2-bootstrap.css
- bundles/sonataadmin/bootstrap3-editable/bootstrap3-editable/css/bootstrap-editable.css
- bundles/sonataadmin/vendor/jqueryui/themes/flick/jquery-ui-1.10.4.custom.css
- bundles/sonatacore/vendor/select2/select2.css
- bundles/sonatacore/vendor/select2/select2-bootstrap.css
- bundles/sonataadmin/vendor/x-editable/dist/bootstrap3-editable/css/bootstrap-editable.css
- bundles/sonataadmin/css/styles.css
- bundles/sonataadmin/css/layout.css
- bundles/sonataadmin/css/tree.css
javascripts:
# Defaults:
- bundles/sonatajquery/jquery-1.10.2.js
- bundles/sonatajquery/jquery-ui-1.10.4.js
- bundles/sonatajquery/jquery-ui-i18n.js
- bundles/sonatacore/vendor/jquery/dist/jquery.js
- bundles/sonataadmin/vendor/jqueryui/ui/jquery-ui-1.10.4.js
- bundles/sonataadmin/vendor/jqueryui/ui/jquery-ui-i18n.js
- bundles/sonataadmin/jquery/jquery.form.js
- bundles/sonataadmin/jquery/jquery.confirmExit.js
- bundles/sonataadmin/admin-lte/js/bootstrap.min.js
- bundles/sonataadmin/bootstrap3-editable/bootstrap3-editable/js/bootstrap-editable.min.js
- bundles/sonataadmin/select2/select2.min.js
- bundles/sonataadmin/vendor/x-editable/dist/bootstrap3-editable/js/bootstrap-editable.min.js
- bundles/sonatacore/select2/select2.min.js
- bundles/sonataadmin/App.js
- bundles/sonataadmin/Admin.js
- bundles/sonataadmin/treeview.js
Expand Down
4 changes: 2 additions & 2 deletions Resources/public/vendor/AdminLTE/.bower.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "AdminLTE",
"homepage": "https://github.com/almasaeed2010/AdminLTE",
"_release": "f31f32b317",
"_release": "e7c61ff4f4",
"_resolution": {
"type": "branch",
"branch": "master",
"commit": "f31f32b317cfeb0bc6a0c0c675124c8010e0e9e3"
"commit": "e7c61ff4f453f7d0c572a262ec31e44b61630382"
},
"_source": "https://github.com/almasaeed2010/AdminLTE.git",
"_target": "master",
Expand Down
3 changes: 2 additions & 1 deletion Resources/public/vendor/AdminLTE/.gitignore
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@

*.DS_Store
.idea
Empty file modified Resources/public/vendor/AdminLTE/LICENSE
100644 → 100755
Empty file.
5 changes: 3 additions & 2 deletions Resources/public/vendor/AdminLTE/README.md
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@ Want More?
**Almsaeed studio just opened a new premium templates page. Hand picked to insure the best quality and the most affordable prices. Visit http://almsaeedstudio.com/premium for more information.**


![preview image](http://almsaeedstudio.com/adminlte.png "AdminLTE Presentation")
!["AdminLTE Presentation"](http://almsaeedstudio.com/adminlte2.png "AdminLTE Presentation")

**AdminLTE** has been carefully coded with clear comments in all of its JS, LESS and HTML files. LESS has been used to increase code customizability.

Announcements:
--------------
- Check the change log at the bottom
- Check out the new updated dashboard!
- Thanks to **[@hason](https://github.com/hason)** for the great contribution, we now have a bower branch that supports Bower.js

Special Features:
-----------------
Expand Down
153 changes: 142 additions & 11 deletions Resources/public/vendor/AdminLTE/css/AdminLTE.css
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import url(//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,300italic,400italic,600italic);

@import url(//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic);
@import url(//fonts.googleapis.com/css?family=Kaushan+Script);
/*!
* AdminLTE v1.2
Expand Down Expand Up @@ -113,6 +112,7 @@ body.fixed .wrapper {
.content {
padding: 20px 15px;
background: #f9f9f9;
overflow: auto;
}
/* Utility */
/* H1 - H6 font */
Expand Down Expand Up @@ -142,7 +142,7 @@ h6,
}
/* All images should be responsive */
img {
max-width: 100%important;
max-width: 100% !important;
}
.sort-highlight {
background: #f4f4f4;
Expand Down Expand Up @@ -240,6 +240,9 @@ img {
.text-blue {
color: #0073b7 !important;
}
.text-black {
color: #222222 !important;
}
.text-light-blue {
color: #3c8dbc !important;
}
Expand Down Expand Up @@ -315,17 +318,141 @@ img {
.table-striped > tbody > tr:nth-child(odd) > th {
background-color: #f3f4f5;
}
.table.no-border,
.table.no-border td,
.table.no-border th {
border: 0;
}
/* .text-center in tables */
table.text-center,
table.text-center td,
table.text-center th {
text-align: center;
}
.table.align th {
text-align: left;
}
.table.align td {
text-align: right;
}
.text-bold,
.text-bold.table td,
.text-bold.table th {
font-weight: 700;
}
.border-radius-none {
-webkit-border-radius: 0 !important;
-moz-border-radius: 0 !important;
border-radius: 0 !important;
}
/* _fix for sparkline tooltip */
.jqstooltip {
padding: 5px!important;
width: auto!important;
height: auto!important;
}
/*
Gradient Background colors
*/
.bg-teal-gradient {
background: #39cccc !important;
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #39cccc), color-stop(1, #7adddd)) !important;
background: -ms-linear-gradient(bottom, #39cccc, #7adddd) !important;
background: -moz-linear-gradient(center bottom, #39cccc 0%, #7adddd 100%) !important;
background: -o-linear-gradient(#7adddd, #39cccc) !important;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7adddd', endColorstr='#39cccc', GradientType=0) !important;
color: #fff;
}
.bg-light-blue-gradient {
background: #3c8dbc !important;
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #3c8dbc), color-stop(1, #67a8ce)) !important;
background: -ms-linear-gradient(bottom, #3c8dbc, #67a8ce) !important;
background: -moz-linear-gradient(center bottom, #3c8dbc 0%, #67a8ce 100%) !important;
background: -o-linear-gradient(#67a8ce, #3c8dbc) !important;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#67a8ce', endColorstr='#3c8dbc', GradientType=0) !important;
color: #fff;
}
.bg-blue-gradient {
background: #0073b7 !important;
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #0073b7), color-stop(1, #0089db)) !important;
background: -ms-linear-gradient(bottom, #0073b7, #0089db) !important;
background: -moz-linear-gradient(center bottom, #0073b7 0%, #0089db 100%) !important;
background: -o-linear-gradient(#0089db, #0073b7) !important;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0089db', endColorstr='#0073b7', GradientType=0) !important;
color: #fff;
}
.bg-aqua-gradient {
background: #00c0ef !important;
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #00c0ef), color-stop(1, #14d1ff)) !important;
background: -ms-linear-gradient(bottom, #00c0ef, #14d1ff) !important;
background: -moz-linear-gradient(center bottom, #00c0ef 0%, #14d1ff 100%) !important;
background: -o-linear-gradient(#14d1ff, #00c0ef) !important;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#14d1ff', endColorstr='#00c0ef', GradientType=0) !important;
color: #fff;
}
.bg-yellow-gradient {
background: #f39c12 !important;
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #f39c12), color-stop(1, #f7bc60)) !important;
background: -ms-linear-gradient(bottom, #f39c12, #f7bc60) !important;
background: -moz-linear-gradient(center bottom, #f39c12 0%, #f7bc60 100%) !important;
background: -o-linear-gradient(#f7bc60, #f39c12) !important;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f7bc60', endColorstr='#f39c12', GradientType=0) !important;
color: #fff;
}
.bg-purple-gradient {
background: #932ab6 !important;
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #932ab6), color-stop(1, #b959d9)) !important;
background: -ms-linear-gradient(bottom, #932ab6, #b959d9) !important;
background: -moz-linear-gradient(center bottom, #932ab6 0%, #b959d9 100%) !important;
background: -o-linear-gradient(#b959d9, #932ab6) !important;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b959d9', endColorstr='#932ab6', GradientType=0) !important;
color: #fff;
}
.bg-green-gradient {
background: #00a65a !important;
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #00a65a), color-stop(1, #00ca6d)) !important;
background: -ms-linear-gradient(bottom, #00a65a, #00ca6d) !important;
background: -moz-linear-gradient(center bottom, #00a65a 0%, #00ca6d 100%) !important;
background: -o-linear-gradient(#00ca6d, #00a65a) !important;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00ca6d', endColorstr='#00a65a', GradientType=0) !important;
color: #fff;
}
.bg-red-gradient {
background: #f56954 !important;
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #f56954), color-stop(1, #f89384)) !important;
background: -ms-linear-gradient(bottom, #f56954, #f89384) !important;
background: -moz-linear-gradient(center bottom, #f56954 0%, #f89384 100%) !important;
background: -o-linear-gradient(#f89384, #f56954) !important;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f89384', endColorstr='#f56954', GradientType=0) !important;
color: #fff;
}
.bg-black-gradient {
background: #222222 !important;
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #222222), color-stop(1, #3c3c3c)) !important;
background: -ms-linear-gradient(bottom, #222222, #3c3c3c) !important;
background: -moz-linear-gradient(center bottom, #222222 0%, #3c3c3c 100%) !important;
background: -o-linear-gradient(#3c3c3c, #222222) !important;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#3c3c3c', endColorstr='#222222', GradientType=0) !important;
color: #fff;
}
.bg-maroon-gradient {
background: #85144b !important;
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #85144b), color-stop(1, #b11b64)) !important;
background: -ms-linear-gradient(bottom, #85144b, #b11b64) !important;
background: -moz-linear-gradient(center bottom, #85144b 0%, #b11b64 100%) !important;
background: -o-linear-gradient(#b11b64, #85144b) !important;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b11b64', endColorstr='#85144b', GradientType=0) !important;
color: #fff;
}
.connectedSortable {
min-height: 100px;
}
/*---------------------------------------------------
LESS Elements 0.9
---------------------------------------------------
A set of useful LESS mixins
More info at: http://lesselements.com
---------------------------------------------------*/
/*
Components: navbar, logo and content header
-------------------------------------------------
Expand Down Expand Up @@ -740,7 +867,6 @@ body > .header .logo .icon {
display: block;
white-space: nowrap;
/* Prevent text from breaking */

border-bottom: 1px solid #f4f4f4;
}
.navbar-nav > .notifications-menu > .dropdown-menu > li .menu > li > a:hover,
Expand All @@ -762,11 +888,9 @@ body > .header .logo .icon {
padding: 15px 0px;
margin-right: 5px;
/* Default background and font colors */

background: #00c0ef;
color: #f9f9f9;
/* Fallback for browsers that doesn't support rgba */

color: rgba(255, 255, 255, 0.7);
}
.navbar-nav > .notifications-menu > .dropdown-menu > li .menu > li > a > .glyphicon.danger,
Expand Down Expand Up @@ -1296,7 +1420,6 @@ body > .header .logo .icon {
border-bottom-left-radius: 0;
border-bottom: 0px solid #f4f4f4;
color: #444;
padding-bottom: 10px;
}
.box .box-header:before,
.box .box-header:after {
Expand All @@ -1311,14 +1434,14 @@ body > .header .logo .icon {
.box .box-header > .ion,
.box .box-header .box-title {
display: inline-block;
padding: 10px 0px 10px 10px;
padding: 10px 10px 10px 10px;
margin: 0;
font-size: 20px;
font-weight: 400;
float: left;
cursor: default;
}
.box .box-header a:not(.btn) {
.box .box-header a {
color: #444;
}
.box .box-header > .box-tools {
Expand Down Expand Up @@ -1463,7 +1586,7 @@ body > .header .logo .icon {
.box.box-solid.box-success > .box-header a {
color: #444;
}
.box.box-solid > .box-header > .box-tools > .btn {
.box.box-solid > .box-header > .box-tools .btn {
border: 0;
box-shadow: none;
}
Expand Down Expand Up @@ -1648,6 +1771,7 @@ Component: timeline
--------------------
*/
.timeline {
position: relative;
margin: 0 0 30px 0;
padding: 0;
list-style: none;
Expand All @@ -1659,7 +1783,7 @@ Component: timeline
bottom: 0;
width: 5px;
background: #ddd;
left: 45px;
left: 30px;
border: 1px solid #eee;
margin: 0;
-webkit-border-radius: 2px;
Expand Down Expand Up @@ -2103,6 +2227,13 @@ Component: timeline
background: #fff;
padding: 10px;
}
/* Nav tabs bottom */
.tabs-bottom.nav-3 li a {
width: 3333.33333333% !important;
}
.tabs-bottom li a {
border: 0;
}
/* PAGINATION */
.pagination > li > a {
background: #fafafa;
Expand Down
Loading

0 comments on commit 2f0621a

Please sign in to comment.