Permalink
Browse files

Add nowrap to buttons to ensure single lines (https://skitch.com/will…

  • Loading branch information...
1 parent 1900842 commit d774cb50f69319497992388de7253082a47e3df6 @wilr wilr committed Aug 2, 2012
Showing with 13 additions and 12 deletions.
  1. +3 −6 admin/css/screen.css
  2. +9 −6 admin/scss/_forms.scss
  3. +1 −0 admin/scss/_style.scss
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -300,27 +300,30 @@ form.small .field, .field.small {
}
.ss-ui-button {
- margin-top:0px;
- &.buttonset {
- margin: 0 -1px; // hack to avoid double borders
- }
-
+ margin-top:0px;
font-weight: bold;
text-decoration: none;
line-height: $grid-y * 2;
color: lighten($color-text-dark, 10%);
border: 1px solid $color-button-generic-border;
border-bottom: 1px solid darken($color-button-generic-border, 10%);
cursor: pointer;
- @include text-shadow(lighten($color-button-generic, 20%) 0 1px 1px);
background-color: $color-button-generic;
+ white-space: nowrap;
+
@include background(
linear-gradient(color-stops(
lighten($color-button-generic, 10%),
darken($color-button-generic, 5%)
))
);
+ @include text-shadow(lighten($color-button-generic, 20%) 0 1px 1px);
+
+ &.buttonset {
+ margin: 0 -1px; // hack to avoid double borders
+ }
+
&.ui-state-hover, &:hover {
text-decoration: none;
background-color: lighten($color-button-generic, 10%);
View
@@ -170,6 +170,7 @@ body.cms {
// Reset to default styles
.ss-ui-button {
line-height: $grid-x*3;
+
.ui-button-text {
line-height: 1.4;
}

2 comments on commit d774cb5

great!

Contributor

dd1079 replied Aug 7, 2012

Repostet here for completeness:

The nowrap works great, but the border issue is not fixed. The SCSS results into:

.cms .ss-ui-button.buttonset { margin: 0 -1px; }

but should result into:

.cms .ss-ui-buttonset .ss-ui-button { margin: 0 -1px; }

Additionally the following rule:

.cms .Actions {
    min-height: 30px;
    overflow: auto;
}

needs an overflow: visible, which is the default value, so you can just leave it out.

Please sign in to comment.