Skip to content

Commit

Permalink
Merge pull request #311 from FrozenNode/dev
Browse files Browse the repository at this point in the history
Merge 4.6.0 into master
  • Loading branch information
janhartigan committed Aug 22, 2013
2 parents 7501fc1 + bfca8f7 commit 4238e19
Show file tree
Hide file tree
Showing 107 changed files with 3,614 additions and 1,005 deletions.
11 changes: 11 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
## Changelog

### 4.6.0
- Support for smaller screens and mobile devices
- Visible option for columns that accepts either a boolean or closure
- Relationship constraints now work with hasMany and hasOne fields
- There is now an `options_filter` option for relationship fields that lets you modify the query before getting the relationship options
- Custom actions and saves now rebuild the supplied config file after performing the action
- The `editable` property now accepts a closure and is passed the current page's data object
- New translations (da, it)
- Bugfix: Constraint fields no longer make multiple requests at a single time
- Bugfix: The key field is no longer set on models. This would cause some bugs on some setups

### 4.5.0
- You can now provide `value`, `min_value`, and `max_value` options in filter fields to set default values
- It is now possible to specify as many submenus in the `menus` array as you want
Expand Down
7 changes: 7 additions & 0 deletions public/css/common.less
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,13 @@
-o-transition: @property @duration @ease @delay;
transition: @property @duration @ease @delay;
}
.noTransition {
-webkit-transition: none;
-moz-transition: none;
-ms-transition: none;
-o-transition: none;
transition: none;
}



Expand Down
65 changes: 65 additions & 0 deletions public/css/elements.less
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
/* Fonts */
@import url(http://fonts.googleapis.com/css?family=Oxygen:400,700&subset=latin-ext,latin);

@highdensity: ~"only screen and (-webkit-min-device-pixel-ratio: 1.5)",
~"only screen and (min--moz-device-pixel-ratio: 1.5)",
~"only screen and (-o-min-device-pixel-ratio: 3/2)",
~"only screen and (min-device-pixel-ratio: 1.5)";
@mobile: ~"only screen and (max-width: 529px)";
@tablet: ~"only screen and (min-width: 530px) and (max-width: 949px)";
@mobileAndTablet: ~"only screen and (max-width: 949px)";
@desktopPlus: ~"only screen and (min-width: 950px)";
@desktop: ~"only screen and (min-width: 950px) and (max-width: 1128px)";
@desktopXl: ~"only screen and (min-width: 1129px)";

.oxygen {
font-family: 'Oxygen', sans-serif;
}
Expand Down Expand Up @@ -52,6 +63,19 @@
}
}

.headerButtonPadding {
padding: 9px 12px 8px;
}

.headerButton {
display: inline-block;
.headerButtonPadding;

&:hover, &.current {
.verticalGradient(#444, #333);
}
}

.editForm {
color: #444;
text-shadow: white 0 1px 0;
Expand Down Expand Up @@ -81,6 +105,10 @@
vertical-align: top;
}

textarea {
width: 98%;
}

select, input[type=hidden], .select2-container {
width: 226px;
}
Expand Down Expand Up @@ -148,6 +176,10 @@
background: url(../img/upload.png) no-repeat;
padding-left: 25px;
}

div.plupload {
width: 100% !important;
}
}

div.image_container {
Expand Down Expand Up @@ -193,4 +225,37 @@
margin: 10px 30px 0 3px;
}
}
}

/**
* The css for a full-screen edit area's main field div containers
*/
.full_screen_fields {
display: inline-block;
vertical-align: top;
margin-bottom: 30px;
margin-right: 30px;

&.control_buttons, &.image, &.wysiwyg, &.markdown, &.textarea {
display: block;
margin-right: 0;
}

&.custom_buttons {
display: block;
}

&.textarea {
textarea {

}
}

div.characters_left {
right: 3px;
}

select {
width: 226px;
}
}
Loading

0 comments on commit 4238e19

Please sign in to comment.