Browse Source

simplify

pull/253/head
connors 11 years ago
parent
commit
6c061ea2d3
  1. 12
      dist/ratchet.css
  2. 18
      lib/sass/badges.scss
  3. 4
      lib/sass/bars.scss
  4. 58
      lib/sass/buttons.scss
  5. 1
      lib/sass/push.scss
  6. 6
      lib/sass/toggles.scss

12
dist/ratchet.css vendored

@ -397,9 +397,6 @@ p {
-webkit-box-shadow: none; -webkit-box-shadow: none;
box-shadow: none; box-shadow: none;
} }
.popover .bar-nav .title + .btn:last-child {
right: 15px;
}
.card { .card {
width: auto; width: auto;
@ -714,7 +711,7 @@ input[type="button"] {
.bar-nav .btn.pull-left { .bar-nav .btn.pull-left {
margin-right: 10px; margin-right: 10px;
} }
.bar-nav .btn-link { .bar-nav .btn .btn-link {
padding: 0; padding: 0;
margin-top: 0; margin-top: 0;
font-size: 16px; font-size: 16px;
@ -723,7 +720,7 @@ input[type="button"] {
background-color: transparent; background-color: transparent;
border: none; border: none;
} }
.bar-nav .btn-link:active, .bar-nav .btn-link.active { .bar-nav .btn .btn-link:active, .bar-nav .btn .btn-link.active {
color: #3071a9; color: #3071a9;
} }
@ -740,10 +737,11 @@ input[type="button"] {
.popover .btn-block:last-child { .popover .btn-block:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
.popover .bar-nav .btn-link.pull-left {
.bar-nav .btn-link.pull-left {
margin-left: 5px; margin-left: 5px;
} }
.popover .bar-nav .btn-link.pull-right { .bar-nav .btn-link.pull-right {
margin-right: 5px; margin-right: 5px;
} }

18
lib/sass/badges.scss

@ -85,15 +85,13 @@
} }
// Ratchicons in table-views // Ratchicons in table-views
.table-view { .table-view .badge {
.badge { margin-top: 2px;
margin-top: 2px;
&.pull-left {
&.pull-left { margin-right: 5px;
margin-right: 5px; }
} &.pull-right {
&.pull-right { margin-left: 5px;
margin-left: 5px;
}
} }
} }

4
lib/sass/bars.scss

@ -130,8 +130,4 @@
border-bottom: $border-default; border-bottom: $border-default;
border-radius: 12px 12px 0 0; border-radius: 12px 12px 0 0;
@include box-shadow(none); @include box-shadow(none);
.title + .btn:last-child {
right: 15px;
}
} }

58
lib/sass/buttons.scss

@ -129,21 +129,18 @@ input[type="button"] {
// Buttons in nav bars // Buttons in nav bars
// -------------------------------------------------- // --------------------------------------------------
.bar-nav { .bar-nav .btn {
// Generic style for all buttons in .bar-title position: relative;
.btn { z-index: 10; // Position the buttons on top of .title
position: relative; padding: 6px 12px;
z-index: 10; // Position the buttons on top of .title margin-top: 8px;
padding: 6px 12px; font-weight: $font-weight-light;
margin-top: 8px;
font-weight: $font-weight-light; &.pull-right {
margin-left: $bar-side-spacing;
&.pull-right { }
margin-left: $bar-side-spacing; &.pull-left {
} margin-right: $bar-side-spacing;
&.pull-left {
margin-right: $bar-side-spacing;
}
} }
// Link button (Buttons that look like links) // Link button (Buttons that look like links)
@ -179,30 +176,25 @@ input[type="button"] {
// Block level buttons in popovers // Block level buttons in popovers
// -------------------------------------------------- // --------------------------------------------------
.popover { .popover .btn-block {
.btn-block { margin-bottom: 5px;
margin-bottom: 5px;
}
// Remove extra margin on bottom of last button // Remove extra margin on bottom of last button
.btn-block:last-child { &:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
// Line the button text up with content's text }
.bar-nav .btn-link { // Line the button text up with content's text
&.pull-left { .bar-nav .btn-link {
margin-left: 5px; &.pull-left {
} margin-left: 5px;
&.pull-right { }
margin-right: 5px; &.pull-right {
} margin-right: 5px;
} }
} }
// Buttons in table-views // Buttons in table-views
// -------------------------------------------------- // --------------------------------------------------
.table-view { .table-view .btn {
.btn { margin-top: -1px; // Center the btn inside the cell
margin-top: -1px; // Center the btn inside the cell
}
} }

1
lib/sass/push.scss

@ -3,7 +3,6 @@
// -------------------------------------------------- // --------------------------------------------------
.content { .content {
// Fade animation // Fade animation
&.fade { &.fade {
left: 0; left: 0;

6
lib/sass/toggles.scss

@ -62,8 +62,6 @@
// Toggles in table-views // Toggles in table-views
// -------------------------------------------------- // --------------------------------------------------
.table-view { .table-view .toggle {
.toggle { margin-top: -4px; // Center the toggle inside the cell
margin-top: -4px; // Center the toggle inside the cell
}
} }

Loading…
Cancel
Save