Commit Graph

163 Commits

Author SHA1 Message Date
Ingo Schommer
82cf93855e MINOR Reverting padding changes from pull request #377, way too global - solved through a .cms-panel-padded class in CMSSettingsController instead 2012-05-08 00:53:06 +02:00
Ingo Schommer
23148b959a Merge pull request #402 from ohararyan/sapphire
---

http://open.silverstripe.org/ticket/7214

Added watermark to show current state of preview.
Removed button styling from Draft and Preview and added styling to show current selected state.

Designs signed off by Paul

Conflicts:
	admin/css/screen.css
2012-05-07 13:01:00 +02:00
Ingo Schommer
f56097a29b Merge pull request #386 from adrexia/sapphire
---

Includes:
* Changes to chosen to include a custom function that will let the drop-down rise-up if there is room and it would otherwise drop beneath the size of the window (changes in coffeescript, jquery output, and chosen css)
* Changes in SCSS to stop the automatic addition of scrollbars, and to limit the extra space at the bottom of the filter div

Issues remaining:
* jLayout is calculating the height of the filter div incorrectly. It is assuming the div is around 70px longer than it is. This height assumption is linked somehow to chosen, as initiating the select box results in a correct height calculation.
2012-05-07 11:21:23 +02:00
Ryan O'Hara
abb5719d33 ENHANCEMENT: Style change to buttons for preview states. Removed open in new window (TRAC-7214) 2012-05-04 13:53:33 +12:00
Ryan O'Hara
92484581e3 ENHANCEMENT: Add disabled state to preview buttons and add watermark for the current state being viewed (TRAC:7214) 2012-05-04 13:53:33 +12:00
Ingo Schommer
4029f96728 ENHANCEMENT Section icons in CMS (#7269) 2012-05-03 13:49:19 +02:00
Ingo Schommer
30153d4538 Merge pull request #394 from silverstripe-big-o/sapphire
---

Set the input to the left and label on the right in CheckboxFieldHolder_Small.ss for consistancy with checkbox set field.

Conflicts:
	admin/scss/_style.scss
2012-05-02 14:03:59 +02:00
Jeremy Bridson
db9806a895 BUGFIX:Trac#7196 - Fixed styling issues with CMS page settings. 2012-05-02 16:58:08 +12:00
Naomi Guyer
dc5e36ec5c BUGFIX: 7117 Fixes
Includes:
* Changes to chosen to include a custom function that will let the
drop-down rise-up if there is room and it would otherwise drop beneath
the size of the window (changes in coffeescript, jquery output, and
chosen css)
* Changes in SCSS to stop the automatic addition of scrollbars, and
to limit the extra space at the bottom of the filter div

Issues remaining:
* jLayout is calculating the height of the filter div incorrectly.
It is assuming the div is around 70px longer than it is. This height
assumption is linked somehow to chosen, as initiating the select box
results in a correct height calculation.
2012-05-01 17:14:16 +12:00
Ingo Schommer
e7a4eec0da Merge pull request #377 from adrexia/sapphire
---

Added padding back into the settings panel.
2012-04-27 09:42:10 +02:00
Naomi Guyer
f5c26e7282 BUGFIX: Add padding to settings panel 2012-04-27 16:45:07 +12:00
Naomi Guyer
4dc564b143 BUGFIX: actions panel
Fix actions panel background colours and shading to work on both the
main page content areas and the settings area. Adjust margin and
z-index so there isn't a visible space on the left-hand side.
2012-04-27 15:48:09 +12:00
Naomi Guyer
e392cc21c3 BUGFIX: Pop-up scrolling IE7
Added position relative to the body of the iframe to fix scrolling bug
2012-04-23 17:01:38 +12:00
Ingo Schommer
e40455f2e3 MINOR Fixed tabset/breadcrumb tabular styling, avoid tabs overflowing into hidden space (still needs more work to fix properly) 2012-04-18 16:56:04 +02:00
Jeremy Bridson
4c9fa6276d ENHANCMENT:Trac#7166 - added styling for 2nd level tabs. 2012-04-18 14:28:13 +12:00
Jeremy Bridson
02abc42f24 BUGFIX:fixed unwanted box shadow on cms-panel-header when side panel is collapsed 2012-04-18 13:59:00 +12:00
Jeremy Bridson
330dd3008c ENHANCEMENT:Trac#7166 - styled the new combined tree and edit view. 2012-04-18 13:35:57 +12:00
Ingo Schommer
473d3a66b8 MINOR Fixed controller contexts in LeftAndMain->SiteTreeAsUL() - needs different context for edit links and determining "current page" (not applicable for CMSPagesController) 2012-04-17 22:33:30 +02:00
Ingo Schommer
84b0a7d96c MINOR Renamed .ss-tabset to .cms-tabset in cms templates to distinguish entwine selectors and add extra functionality (cookies, re-selecting tab, panel loading) 2012-04-17 17:40:37 +02:00
Jeremy Bridson
64300caae3 ENHANCEMENT:fixed issues with overflow between tabs and breadcrumbs in cms-content-header 2012-04-16 16:31:24 +12:00
Will Rossiter
907568b182 ENHANCEMENT: move hard coded template HTML for composite field and field group out to separate template files. 2012-04-14 17:36:08 +12:00
Jeremy Bridson
20aeb76979 BUGFIX:fixed overflow issues in cms-content-header with back button / breadcrumbs / tabs 2012-04-13 16:08:05 +12:00
Ingo Schommer
ac45e5b9c0 Merge branch 'integration'
Conflicts:
	admin/css/ie8.css
	admin/css/screen.css
	admin/scss/_style.scss
	dev/install/config-form.html
	dev/install/install.css
	dev/install/php5-required.html
2012-04-11 16:31:12 +02:00
Jeremy Bridson
98399f7779 BUGFIX:Trac #6854 / #7115 - fixed styling issues with filter panel across CMS - fixed the issue with the width of the date fields - aligned action buttons in filter panel with the designs. 2012-04-11 16:00:56 +12:00
Jeremy Bridson
54905b077b BUGFIX:fixed width of dropdowns in filter side menu. 2012-04-10 17:40:01 +12:00
Julian Seidenberg
9183890148 BUGFIX: SSF-168 fixing Webkit rendering issue that would display elements outside of an absolute positioned layout, breaking the layout in the reportadmin section. The fix is to hide to container that breaks the layout and use js to move the required elements out of the container when the CMS needs them. 2012-04-10 12:41:47 +12:00
Jeremy Bridson
e212e8cb25 BUGFIX: fixed a couple of minor bugs - X-scrolling to 9999em on ModelAdmin and padding on active tabs in pages. 2012-04-10 09:02:24 +12:00
Jeremy Bridson
6c697e5d05 BUGFIX:SSF-38 - fixed the issue with the size of the popup being to large on-load - added overflow scroll. Altered the header and tabs to match the style of edit profile. 2012-04-05 13:23:56 +12:00
Felipe Skroski
4ffef20b09 ENHANCEMENT: SSF-168 updated print styles to the datagrid 2012-04-04 14:09:52 +12:00
Julian Seidenberg
7f8a682ad7 BUGFIX: SSF-38 fixing the "Choose files from your computer" upload field 2012-04-04 13:46:24 +12:00
Jeremy Bridson
cebe2fc093 BUGFIX:removed header from edit profile popup and restyled broken tabs - still needs a proper fix after beta II. 2012-04-03 14:34:42 +12:00
Julian Seidenberg
5c3c3cb347 BUGFIX: SSF-38 removing the z-index on the TabSet so that the upload button works in the HtmlEditorField insert image lightbox. 2012-04-03 10:31:01 +12:00
Jeremy Bridson
c0fd9bf97c ENHANCEMENT:SSF-38 - Styled in-content file upload dialog box. Also added fixes for cms-content-header box-shadow. 2012-03-30 14:33:20 +13:00
Ingo Schommer
efc30fd39e MINOR Removed setRightTitle() special case (and too specific styling) from Group->getCMSFields(), implemented title attribute for chosen.js drop downs instead (to be styled with more friendly title popovers) 2012-03-27 17:07:50 +02:00
jbridson
31d4629cdb BUGFIX:removed the float from the li (checkboxes) in members permissions... fixed layout issues Trac #6958 2012-03-27 17:02:18 +02:00
jbridson
83be1a8b43 BUGFIX:removed unnecessary horizontal line from new members page and replaced cms-help-toggle text with ?icon Trac #6956 2012-03-27 17:02:18 +02:00
jbridson
97aa2c8ba6 BUGFIX:adjusted padding so that content aligns properly on the add page panel Trac #6990 2012-03-27 17:02:18 +02:00
jbridson
6fb95e098d BUGFIX:fixed padding issues with navigation tabs across the CMS 2012-03-27 17:02:18 +02:00
Ingo Schommer
87fbb720a1 MINOR Fixing 1px gap between nav tree and page header 2012-03-27 17:02:18 +02:00
jbridson
62ef8a269f ENHANCEMENT:replaced text "Toggle Formatting Help" with a ? icon on edit profile Popup - Trac #6904 2012-03-27 17:02:17 +02:00
jbridson
1a66ecd6ac BUGFIX:fixed styling issues on edit profile dialog popup - Trac #6819 2012-03-27 17:02:14 +02:00
jbridson
304b89f802 MINOR:replaced back button icon with correct icon. 2012-03-27 15:38:36 +02:00
Sean Harvey
ffdf548575 ENHANCEMENT Adding missing MemberImportForm to SecurityAdmin, putting each importer into
Users and Groups tab for context instead of Import tab, and fixing
styling to be close to how it was in SS 2.4.
2012-03-24 13:20:19 +13:00
Ingo Schommer
e70c9b7d13 Merge pull request #246 from silverstripe-scienceninjas/trac-6853
BUGFIX: #6853 Necessary styles required to complement work on same-index...
2012-03-15 15:40:38 -07:00
Sam Minnee
069d7117d7 BUGFIX: Remove stray scrolling and zooming glitches on iPad. 2012-03-15 14:13:30 +13:00
Ingo Schommer
d8a5db4ea7 MINOR Padding for "parent mode" radio buttons on "add page" panel 2012-03-12 10:53:51 +01:00
jbridson
4a6116b562 MINOR:fixed use of $grid_x/y variables and documented 'magic' numbers 2012-03-12 09:35:38 +01:00
Normann Lou
aed91931a7 MINOR SSF-53 : code convention, use "-" instead of "_" for html class property value 2012-03-12 09:35:25 +01:00
Sam Minnée
603a984ad4 Merge pull request #236 from silverstripe-big-o/pull/SSF-25
SSF-25: ModelAdmin
2012-03-09 15:23:20 -08:00
Ingo Schommer
bf6317d534 MINOR Removed unrelated styles from .cms-panel-padded class (which should just do what it says) 2012-03-09 22:26:00 +01:00