Jonathon Menz
8ee9130bcf
NEW: CMS site tree status icons
...
Added coloured status 'dots' to overlay page icons and improved visibility of status labels
2015-03-04 08:43:00 -08:00
Jonathon Menz
5216b67290
Compile latest scss
2015-03-04 08:43:00 -08:00
David Craig
33930597c0
Improve styling on modal dialogs
2015-02-16 08:58:23 +13:00
Elvinas L
730c4d3733
Dropdowns admin styling
2015-02-08 18:59:38 +13:00
Loz Calver
9944e82e51
Merge pull request #3712 from nickspiel/3
...
Update 'spinner' to a SilverStripe branded version
2015-01-27 09:33:12 +00:00
Damian Mooyman
88fdc75456
Merge remote-tracking branch 'composer/3.1' into 3
...
Conflicts:
.editorconfig
docs/en/00_Getting_Started/00_Server_Requirements.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
docs/en/00_Getting_Started/04_Directory_Structure.md
docs/en/00_Getting_Started/index.md
docs/en/01_Tutorials/01_Building_A_Basic_Site.md
docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
docs/en/01_Tutorials/03_Forms.md
docs/en/01_Tutorials/04_Site_Search.md
docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
docs/en/01_Tutorials/index.md
docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
docs/en/02_Developer_Guides/01_Templates/06_Themes.md
docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
docs/en/02_Developer_Guides/05_Extending/05_Injector.md
docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
docs/en/02_Developer_Guides/10_Email/index.md
docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
docs/en/02_Developer_Guides/14_Files/index.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
docs/en/04_Changelogs/3.1.9.md
docs/en/05_Contributing/00_Issues_and_Bugs.md
docs/en/05_Contributing/02_Release_Process.md
docs/en/05_Contributing/03_Documentation.md
filesystem/File.php
filesystem/GD.php
model/DataDifferencer.php
model/Versioned.php
security/BasicAuth.php
security/Member.php
tests/filesystem/FileTest.php
tests/forms/uploadfield/UploadFieldTest.php
tests/model/VersionedTest.php
tests/security/BasicAuthTest.php
2015-01-15 18:52:46 +13:00
Nick Spiel
227ea82953
Update 'spinner' to an SilverStripe branded version
...
PSD: http://nickspiel.me/uploads/silverstripe-assets/spinner.psd
2015-01-14 20:29:07 +11:00
Jonathon Menz
e4db619f8d
MINOR: Fix broken 'Insert From CMS' layout
...
Some updates to UploadField styles broke the layout of this form a bit
2014-11-19 10:52:08 +10:30
Damian Mooyman
0b1f297873
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
README.md
admin/code/LeftAndMain.php
admin/css/screen.css
admin/scss/screen.scss
api/RestfulService.php
conf/ConfigureFromEnv.php
control/injector/ServiceConfigurationLocator.php
control/injector/SilverStripeServiceConfigurationLocator.php
core/ClassInfo.php
core/Object.php
css/AssetUploadField.css
css/ComplexTableField_popup.css
dev/CSSContentParser.php
dev/DevelopmentAdmin.php
docs/en/changelogs/index.md
docs/en/misc/contributing/code.md
docs/en/reference/execution-pipeline.md
filesystem/GD.php
filesystem/ImagickBackend.php
filesystem/Upload.php
forms/Form.php
forms/FormField.php
forms/HtmlEditorConfig.php
forms/gridfield/GridFieldDetailForm.php
forms/gridfield/GridFieldSortableHeader.php
lang/en.yml
model/Aggregate.php
model/DataList.php
model/DataObject.php
model/DataQuery.php
model/Image.php
model/MySQLDatabase.php
model/SQLQuery.php
model/fieldtypes/HTMLText.php
model/fieldtypes/Text.php
scss/AssetUploadField.scss
search/filters/SearchFilter.php
security/Authenticator.php
security/LoginForm.php
security/Member.php
security/MemberAuthenticator.php
security/MemberLoginForm.php
security/Security.php
tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
tests/control/HTTPTest.php
tests/control/RequestHandlingTest.php
tests/filesystem/UploadTest.php
tests/forms/FormTest.php
tests/forms/NumericFieldTest.php
tests/model/DataListTest.php
tests/model/DataObjectTest.php
tests/model/TextTest.php
tests/security/MemberAuthenticatorTest.php
tests/security/SecurityDefaultAdminTest.php
tests/view/SSViewerCacheBlockTest.php
tests/view/SSViewerTest.php
2014-11-18 12:45:54 +13:00
lukepercy
7e4e9dc40c
fixed RemoteURL css for issue 1086
2014-10-22 14:57:59 +13:00
Damian Mooyman
53c40a94fa
API Enable re-authentication within the CMS if a user session is lost
...
BUG Resolve issue with error redirection being ignored within CMS
BUG Fix issue with invalid securityID being re-emitted on failure
2014-10-14 15:19:48 +13:00
Loz Calver
5f653a00eb
Add "retina" styles for high-dpi screens
2014-08-27 17:06:57 +01:00
Ingo Schommer
0d7e9a9692
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
_config/routes.yml
docs/en/topics/datamodel.md
forms/DropdownField.php
2014-02-04 08:19:04 +13:00
Will Rossiter
6d9d53059c
Tidy up active tab styles to match background, border alignment on page tabs.
...
Before: https://www.evernote.com/shard/s6/sh/82f0a398-c80a-4cb7-81d7-a10b6e2c85ff/b1dfa1ae8ffcbd633b548fa3b2ea8951
After: https://www.evernote.com/shard/s6/sh/66cbe9d3-df0a-42c8-a6e8-a82c68161efe/27df7167802de9c3a267d40324972aa3
Tested throughout the CMS in IE8, Firefox and Chrome.
2014-01-29 15:47:15 +13:00
Simon Welsh
39d42e4ea3
Merge branch '3.1'
2014-01-09 08:22:47 +13:00
Will Rossiter
88c59ef0a7
Fix icon being stretched in ModelAdmins
2013-12-23 20:21:05 +13:00
Will Rossiter
3f6db0ddae
Fix section icon in cms header
2013-12-21 17:23:07 +13:00
Will Rossiter
57e65075e9
Dialog icon size
...
The dialog close icon was one 1px higher then the dialog close hover icon causing a little bit of movement when hovering.
2013-12-21 16:11:06 +13:00
Will Rossiter
9ee4de76c4
Merge pull request #1048 from silverstripe-rebelalliance/3.1_7876
...
MINOR:added padding to ui-dialog-title so that it doesn't sit flush with...
2013-12-20 16:09:23 -08:00
Andrew Short
bedf292612
Merge branch '3.1'
...
Conflicts:
docs/en/reference/execution-pipeline.md
lang/nl.yml
2013-11-11 18:18:25 +11:00
Ingo Schommer
2266d77237
Revert "Style destructive actions destructively"
...
This reverts commit 3851ef9f2c
.
Breaks button alignment in CMS.
2013-10-24 11:37:40 +02:00
Ingo Schommer
b56ca812dc
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
tests/security/MemberTest.php
2013-10-23 14:53:29 +02:00
Loz Calver
e46bcf792c
FIX: Allow TreeDropdownField to open upwards ( fixes #2188 )
2013-10-23 13:32:01 +01:00
Ingo Schommer
ea5b3e4269
Merge pull request #2520 from wilr/destructivestyles
...
Style destructive actions destructively
2013-10-22 17:07:38 -07:00
Ingo Schommer
25b6175e67
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
forms/FormField.php
2013-10-20 13:52:56 +02:00
Ingo Schommer
6c96c490c6
Load tree parent nodes if non-existant
...
This edge case can occur when a large tree is cached in HTML already,
without any nodes expanded via ajax. If a new node is added with
a parent that's not existant, it was simply placed on the root node.
This is a display bug, a full CMS refresh fixes it.
Fixes a related bug where tree causes (view) duplicates,
where the same node is rendered twice. This was due to the whole
subtree being refreshed (including the new node) through jstree's
built-in "open"/"select" events, while at the same time
creating a new node through updateNodesFromServer() callbacks.
Also added a global tree loading indication to make it clear
that the tree is still processing.
See https://github.com/silverstripe/silverstripe-cms/issues/872
2013-10-11 11:51:11 +02:00
Will Rossiter
3851ef9f2c
Style destructive actions destructively
2013-10-11 20:00:11 +13:00
RuthAdele
9850d2c5f2
Remove large left margin on field description within cms-content-tools
2013-10-10 12:51:28 +02:00
Ingo Schommer
60fc7e5346
Merge remote-tracking branch 'origin/3.1'
2013-10-06 19:07:39 +02:00
Loz Calver
6b3b61873a
FEATURE: Disable specific tree nodes in TreeDropdownField
...
DO NOT MERGE: to be reviewed.
This feature request was born out of wanting the ability to disable (for example) a top level page from being selected, while still being able to select a child page. Using setFilterFunction() simply removes the node and its children.
Extra styling for disabled nodes
Disable ability to select a disabled node for TreeDropdownField
Disable hover CSS changes
Fixing merge conflict during rebase
Return a boolean for nodeIsDisabled()
2013-10-02 12:53:23 +01:00
Ingo Schommer
455e550d9a
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/topics/testing/create-silverstripe-test.md
forms/Form.php
i18n/i18n.php
model/Image.php
2013-09-27 19:22:14 +02:00
Andrew Short
cd9a4f9b3f
Fix the display of long CMS menu item titles.
2013-09-26 22:24:59 +10:00
James Cocker
3e9c827603
Reverted incorrect CSS sprite location changes
...
Reverted the sprite location, undoing the incorrect location that was added in 3a17e168cc
, probably due to a local incorrect Compass setup.
2013-09-21 14:22:46 +01:00
jaedb
3a17e168cc
Styling admin notice popup
2013-09-18 11:42:26 +02:00
Ingo Schommer
5d33f187c7
"Add page" page type styles
...
Regression from changing #PageType to more specific selector in master,
due to FormField->HolderID() API changes. Failed to take into account the tag
name hierarchy (is a <ul> vs. has a <ul>)
See https://github.com/silverstripe/silverstripe-cms/issues/786
2013-08-28 11:10:03 +02:00
Ingo Schommer
a4c6ae3e90
Merge remote-tracking branch 'origin/3.1'
2013-08-22 13:56:33 +02:00
Will Rossiter
1621d6afde
Merge pull request #2316 from chillu/pulls/editor-brokenlink
...
Render broken link in HtmlEditorField
2013-08-17 17:01:14 -07:00
Ingo Schommer
7ae75c1a89
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
forms/HtmlEditorField.php
2013-08-16 13:37:44 +02:00
Ingo Schommer
d325551079
Merge remote-tracking branch 'origin/3.1.0' into 3.1
2013-08-16 13:36:34 +02:00
Naomi Guyer
fb67181366
BUG: Context menu too long - CSS only (Fixes CMS #811 )
2013-08-16 13:34:23 +02:00
Ingo Schommer
eb17cf3eb9
Merge pull request #2275 from ARNHOE/3.1-updatefieldgroupstyle
...
BUG Fieldgroup styling
2013-08-15 12:14:05 -07:00
Ingo Schommer
79205f7d43
Render broken link in HtmlEditorField
...
Regression: 2.4 had this in the default cms/css/editor.css,
which got moved to the simple theme at some point,
where this styling was removed.
2013-08-09 11:51:18 +02:00
Ingo Schommer
542728cd94
Merge remote-tracking branch 'origin/3.1'
2013-08-03 19:47:32 +02:00
Arno Poot
fefb7af0f5
BUG Fieldgroup styling
2013-07-28 15:52:39 +02:00
Arno Poot
968e99f45e
Updated field class to use doubleborder mixin
2013-07-26 16:44:00 +02:00
Simon Welsh
fbce9fd7cd
Merge branch '3.1'
...
Conflicts:
.travis.yml
docs/en/misc/contributing/code.md
javascript/HtmlEditorField.js
2013-07-05 10:22:58 +12:00
Damian Mooyman
f47383f52e
BUG Fixed issue where file upload via the HTML Editor media dialogue would not prompt users to overwrite existing files
2013-06-20 15:21:18 +12:00
Ingo Schommer
a4189a6744
Merge pull request #2117 from ohararyan/3.1
...
FIX make sure select dropdowns in add page dialog aren't cut off
2013-06-19 05:30:54 -07:00
Ingo Schommer
94b4237372
Merge remote-tracking branch 'origin/3.1'
2013-06-19 11:17:33 +02:00
Sam Minnée
34287895ef
Merge pull request #2099 from chillu/pulls/insert-media-tweaks
...
Various "Insert Media" dialog tweaks
2013-06-18 21:32:00 -07:00
Ryan O'Hara
36d9563da8
FIX make sure select dropdowns in add page dialog aren't cut off due to .parent-mode class having overflow:auto
2013-06-19 11:27:22 +12:00
Sam Minnée
8bf4d417c6
Merge pull request #2094 from chillu/pulls/dialog-sizing
...
Min/max constraints for CMS dialog
2013-06-18 14:56:41 -07:00
Ingo Schommer
04c337dc82
Tab breadcrumbs floating (regression from #1778 )
2013-06-17 01:26:04 +02:00
Ingo Schommer
9e4a7c835f
Accessibility: Visible focus rings
2013-06-15 11:52:02 +02:00
Ingo Schommer
be62c731f5
Compressed layout in "Insert Media" detail screen
...
- Same font size as other CMS UI
- Smaller thumbnail height
- Less label width and padding for file info
2013-06-15 10:13:45 +02:00
Ingo Schommer
6338b0b2d9
Reduced line height for form field help text
2013-06-15 10:13:45 +02:00
Ingo Schommer
4bc2f9bc0d
Localization-resilient SCSS selector ( fixes #1590 )
2013-06-15 10:13:45 +02:00
Ingo Schommer
071f30ded7
Consistent dropdown styles between chosen.js and treedropdown
...
Removed trigger background. Incidentally this also makes it less
obvious that the trigger has too much padding on the right
(which I can't figure out ...)
2013-06-15 10:13:45 +02:00
Ingo Schommer
ea4f8cec07
Tighten "Insert Media" dialog layout
...
Reduce space usage to fit into typical dialog dimensions without scrolling
2013-06-15 10:13:44 +02:00
Ingo Schommer
1bd31c84f2
Reduced URL field width in "Insert Media" to avoid wrap
...
450px width are often not available to the dialog (with all margins/paddings subtracted from the window).
Ensure the URL doesn't cause an unnecessary wrap. Ideally we can size this to the dialog width
automatically of course.
2013-06-15 10:13:44 +02:00
Ingo Schommer
10a558c882
Hide "delete" button in "Insert Media" dialog
2013-06-15 10:13:44 +02:00
Ingo Schommer
3f295adbdd
.field.noborder style, use it in "Insert Media" dialog
2013-06-15 10:13:43 +02:00
Ingo Schommer
9f600ada2c
Min/max constraints for CMS dialog
2013-06-13 20:03:16 +02:00
Ingo Schommer
98f8191dff
Fixed Tab floating in CMS ( fixes #1778 )
...
Removed inline-block from header elements which seems
to cause the issues of tabs stacking on top of each other.
Replaced header background to work on multiline scenarios
Added bottom margin to breadcrumbs so they don't look cramped
when tabs are floated below them.
See https://github.com/silverstripe/silverstripe-framework/pull/1863 ,
https://github.com/silverstripe/silverstripe-framework/issues/1943 ,
https://groups.google.com/forum/?fromgroups#!topic/silverstripe-dev/c-W-ZxDlDuA ,
http://open.silverstripe.org/ticket/6882
2013-06-13 00:04:56 +02:00
Will Rossiter
358988e9c6
Merge pull request #2059 from adrexia/batch-actions
...
Batch actions styling
2013-06-03 19:14:13 -07:00
Will Rossiter
cc7a6eeaed
Merge pull request #2060 from adrexia/preview
...
Preview Background styling
2013-06-03 19:00:02 -07:00
Naomi Guyer
aaa8bf0029
Preview Background styling
...
* Added background color to preview for sites that don't have a
background color (based on @clarkepaul's commit:
https://github.com/silverstripe-droptables/sapphire/commit/7750c8f75fc4a
764b384c6e19dbe543c4811cdcb)
2013-06-04 12:57:09 +12:00
Naomi Guyer
91605ca8ad
Batch actions styling
...
* Removed cog icon (usually associated with settings), and tidied up
padding (based on @clarkepaul's commit:
https://github.com/silverstripe-droptables/sapphire/commit/b09cd5f7f8e73
4df1f7ca0d387a5b97a03a3b604)
2013-06-04 12:48:51 +12:00
Naomi Guyer
01e7bfb350
Filter notice styling and panel adjustments
...
* Based on @clarkepaul's commit here:
https://github.com/silverstripe-droptables/sapphire/commit/e5de6c06489f3
449ee8131bf4ee2a4e1b2380bee
* Kept margin adjustments, but avoided implementing tab changes, as
tabs have chnaged a lot since original commit
2013-06-04 12:11:05 +12:00
Ingo Schommer
5a1d476e8d
Merge branch 'idvalidattr' of git://github.com/wilr/sapphire into wilr-idvalidattr
2013-05-31 19:27:19 +02:00
g4b0
7bcaf90e2a
BUG: fixed "regression" inserted with 9281ebc64764a58f86f685f9765e1d8b60995e5a adding a new class to SiteTree elem (edit-disabled)
2013-05-30 17:09:34 +02:00
Will Rossiter
831a507c90
FIX: Update references to ID values from 79c9433
2013-05-26 11:11:55 +12:00
Ingo Schommer
67d1327b90
Avoid collision of status flags in tree items when updating tree nodes
...
Fixes silverstripe/silverstripe-cms#445
See https://github.com/silverstripe/silverstripe-framework/pull/1996
Thanks to Jean-Fabien for getting this started
2013-05-25 11:27:50 +02:00
Will Rossiter
9273df15ff
Merge pull request #2003 from edlinklater/641-insert_link_styling
...
Formatting tweaks, fixes silverstripe/silverstripe-cms#641
2013-05-24 23:00:05 -07:00
Naomi Guyer
c445997f32
Replace logout button with a more commonly used symbol
...
* Power icon swapped for door icon
* Minor hover/focus opacity effect added to button
2013-05-25 16:45:49 +12:00
Ed Linklater
98ba6b331c
Formatting tweaks, fixes silverstripe/silverstripe-cms#641
2013-05-25 15:54:49 +12:00
Naomi Guyer
be5eaf1353
BUG: Fix alignment of media button
2013-05-25 13:40:37 +12:00
Ingo Schommer
30b53e65fe
API Full-width HTMLEditorField by default
2013-05-22 16:15:16 +02:00
Loz Calver
55a4fb40a6
FIX: Remove left margin on stacked form field descriptions ( fixes #1958 )
2013-05-21 09:52:45 +01:00
Sean Harvey
33be390db8
Put back cog icon for multi-select batch actions (was removed in f4b080e
)
2013-05-15 21:09:19 +12:00
Damian Mooyman
9da57b083a
BUG Fixed broken ErrorPage icons in CMS view
2013-04-10 17:15:42 +12:00
Ingo Schommer
9456b8043c
Fixed "insert media" styling (regression from 27b0cda0
)
2013-04-09 14:47:10 +02:00
Ingo Schommer
310bc8d09c
Better default icon for ModelAdmin
...
Cogwheels doesn't really communicate its meaning well...
New icon is from http://thenounproject.com/noun/database/#icon-No6001 ,
doesn't require permanent attribution (CC0)
2013-04-09 13:43:32 +02:00
Ingo Schommer
01f46d039f
NEW Enforce max node counts to avoid excessive resource usage
...
Rendering potentially 1000s of nodes can exceed the CPU and memory constraints
of a normal PHP process, as well as the rendering capabilities of browsers.
Set a hard maximum for the renderable nodes, deferring to a "show as list" action
in the main CMS tree. For TreeDropdownField, we don't have the list fallback option,
so ask the user to search for the node title instead.
Also makes both the "node_threshold_total" and "node_threshold_leaf" values configurable
2013-04-09 10:24:18 +12:00
Will Rossiter
d94a6a5407
Polish add page screen. Disable styles and fix SelectionField
2013-04-08 19:54:46 +12:00
Andrew Short
10f46ba08e
Include padding on padded edit form panels inside a tabset
2013-03-29 02:23:43 +11:00
Daniel Hensby
a03d1e66ca
BUG CMS messages touch the bottom of the inputs
...
making spacing even: http://screencast.com/t/oYHnG1Bj
2013-03-20 13:50:10 +01:00
James Cocker
7e575481c7
CMS CSS Minor Polishing Tweaks
...
Fixed what I believe to be a few very minor CSS regressions, that appeared after the CSS restructure for the side-by-side preview.
- Reverted background of the right panel (and tab active state) to the slightly darker shade (as per 3.0) to keep each of the 3 panels visually separate.
- Slightly increased padding on ui-tabs-panel as felt a but too close for comfort. Had decreased since 3.0.
- Decreased padding for logged in user name in menu, felt too excessive. (3.0 was neater)
- Evened out padding above buttons in site tree sidebar
Screenshots showing changes:
3.0: http://spdr.me/xauh
3.1 before commit: http://spdr.me/jkIe
3.1 after commit: http://spdr.me/IxtB
2013-03-14 09:41:38 +01:00
Hamish Friedlander
7efae6b95f
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-02-18 14:31:57 +13:00
Ingo Schommer
eafafb31e3
Fixed screen.css (wrong compilation)
2013-02-18 01:28:17 +01:00
Ingo Schommer
e21bd49462
BUG TimeField respects user choice ( fixes #8260 )
...
Regression from c969e04731
.
Also fixes width to accommodate for widest common format:
"11:11:11 AM"
2013-02-17 21:00:02 +01:00
Ingo Schommer
923ad8861f
Layout regression in "add pages"
...
Unrelated fields affected by changes to CMS tooltips. See 1ca3883a76
.
2013-02-13 10:15:06 +01:00
Jeremy Bridson
2e77e87ed3
BUGFIX: fix for broken layout in insert media dialog - Trac #8232
2013-02-07 21:43:34 +01:00
Ingo Schommer
b350ded87c
Fixed DatetimeField formatting (single row, smaller field)
...
Also removed the arbitrary right-floating of fields within a fieldgroup
2013-02-05 12:01:32 +01:00
Ingo Schommer
1c045b5509
Smaller styling for minor actions in CMS
2013-02-04 13:43:03 +01:00
uniun
ebe41cdadf
CSS fixes for Batchactions.
...
On some browsers Batchactions block looked OK, but on others (e.t. Opera on Linux) every element in Batchactions block had different height.
The height of these elements was related to font size which is a little bit different on every OS'es and browsers.
See https://github.com/silverstripe/sapphire/pull/1132
2013-01-30 14:46:25 +01:00
Ingo Schommer
56336c3758
Merge pull request #1101 from chillu/pulls/preview-configuration
...
NEW Preview size and default mode configurability
2013-01-29 08:16:33 -08:00
Ingo Schommer
c11b3918fc
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
admin/css/screen.css
admin/scss/_style.scss
core/PaginatedList.php
email/Mailer.php
2013-01-21 11:14:57 +01:00
Ingo Schommer
432ff753c2
Wider side panel to fit "add" and "edit" button
...
Moved "edit tree" button into same DOM structure so
we can layout them more easily through inline-block.
Conflicts:
admin/css/screen.css
admin/scss/_style.scss
2013-01-16 00:38:24 +01:00
Ingo Schommer
dc43a6b0f6
Wider sidebar to accommodate "add" and "edit" buttons
...
Conflicts:
admin/css/screen.css
2013-01-16 00:38:24 +01:00