padrino-admin 0.11.2 → 0.11.3

data/lib/padrino-admin/bootstrap-less/accordion.less

@@ -5,7 +5,7 @@
 
 // Parent container
 .accordion {
-  margin-bottom: @line-height-base;
+  margin-bottom: @line-height-computed;
 }
 
 // Group == heading + body
@@ -16,15 +16,12 @@
 }
 .accordion-heading {
   border-bottom: 0;
-}
-.accordion-heading .accordion-toggle {
-  display: block;
-  padding: 8px 15px;
-}
 
-// General toggle styles
-.accordion-toggle {
-  cursor: pointer;
+  .accordion-toggle {
+    display: block;
+    padding: 8px 15px;
+    cursor: pointer;
+  }
 }
 
 // Inner needs the styles because you can't animate properly with any styles on the element

data/lib/padrino-admin/bootstrap-less/alerts.less

@@ -7,12 +7,12 @@
 // -------------------------
 
 .alert {
-  padding: 8px 35px 8px 14px;
-  margin-bottom: @line-height-base;
-  color: @state-warning-text;
-  background-color: @state-warning-bg;
-  border: 1px solid @state-warning-border;
-  border-radius: @border-radius-base;
+  padding: 10px 35px 10px 15px;
+  margin-bottom: @line-height-computed;
+  color: @alert-text;
+  background-color: @alert-bg;
+  border: 1px solid @alert-border;
+  border-radius: @alert-border-radius;
 
   // Headings for larger alerts
   h4 {
@@ -22,63 +22,57 @@
   }
   // Match the hr to the border of the alert
   hr {
-    border-top-color: darken(@state-warning-border, 5%);
+    border-top-color: darken(@alert-border, 5%);
   }
-  // Inherit color for immediate links and bolden them some
-  > a,
-  > p > a {
+  // Provide class for links that match alerts
+  .alert-link {
     font-weight: 500;
-    color: darken(@state-warning-text, 10%);
+    color: darken(@alert-text, 10%);
   }
-}
 
-// Adjust close link position
-.close {
-  position: relative;
-  top: -2px;
-  right: -21px;
-  line-height: @line-height-base;
-  color: inherit;
+  // Adjust close link position
+  .close {
+    position: relative;
+    top: -2px;
+    right: -21px;
+    color: inherit;
+  }
 }
 
 // Alternate styles
 // -------------------------
 
 .alert-success {
-  background-color: @state-success-bg;
-  border-color: @state-success-border;
-  color: @state-success-text;
+  background-color: @alert-success-bg;
+  border-color: @alert-success-border;
+  color: @alert-success-text;
   hr {
-    border-top-color: darken(@state-success-border, 5%);
+    border-top-color: darken(@alert-success-border, 5%);
   }
-  > a,
-  > p > a {
-    color: darken(@state-success-text, 10%);
+  .alert-link {
+    color: darken(@alert-success-text, 10%);
   }
 }
-.alert-danger,
-.alert-error {
-  background-color: @state-danger-bg;
-  border-color: @state-danger-border;
-  color: @state-danger-text;
+.alert-danger {
+  background-color: @alert-danger-bg;
+  border-color: @alert-danger-border;
+  color: @alert-danger-text;
   hr {
-    border-top-color: darken(@state-danger-border, 5%);
+    border-top-color: darken(@alert-danger-border, 5%);
   }
-  > a,
-  > p > a {
-    color: darken(@state-danger-text, 10%);
+  .alert-link {
+    color: darken(@alert-danger-text, 10%);
   }
 }
 .alert-info {
-  background-color: @state-info-bg;
-  border-color: @state-info-border;
-  color: @state-info-text;
+  background-color: @alert-info-bg;
+  border-color: @alert-info-border;
+  color: @alert-info-text;
   hr {
-    border-top-color: darken(@state-info-border, 5%);
+    border-top-color: darken(@alert-info-border, 5%);
   }
-  > a,
-  > p > a {
-    color: darken(@state-info-text, 10%);
+  .alert-link {
+    color: darken(@alert-info-text, 10%);
   }
 }
 
@@ -86,13 +80,14 @@
 // -------------------------
 
 .alert-block {
-  padding-top: 14px;
-  padding-bottom: 14px;
-}
-.alert-block > p,
-.alert-block > ul {
-  margin-bottom: 0;
-}
-.alert-block p + p {
-  margin-top: 5px;
+  padding-top: 15px;
+  padding-bottom: 15px;
+
+  > p,
+  > ul {
+    margin-bottom: 0;
+  }
+  p + p {
+    margin-top: 5px;
+  }
 }

data/lib/padrino-admin/bootstrap-less/badges.less

@@ -8,14 +8,14 @@
   display: inline-block;
   min-width: 10px;
   padding: 3px 7px;
-  font-size: 12px;
+  font-size: @font-size-small;
   font-weight: bold;
   color: #fff;
   line-height: 1;
   vertical-align: middle;
   white-space: nowrap;
   text-align: center;
-  background-color: @grayLight;
+  background-color: @gray-light;
   border-radius: 10px;
 
   // Empty labels/badges collapse
@@ -41,11 +41,6 @@ a.badge {
     top: -1px;
   }
 }
-.btn-mini {
-  .badge {
-    top: 0;
-  }
-}
 
 // Account for counters in navs
 a.list-group-item.active > .badge,

data/lib/padrino-admin/bootstrap-less/bootstrap.less

@@ -28,7 +28,6 @@
 
 // Components: common
 @import "component-animations.less";
-@import "glyphicons.less";
 @import "dropdowns.less";
 @import "list-group.less";
 @import "panels.less";

data/lib/padrino-admin/bootstrap-less/breadcrumbs.less

@@ -5,7 +5,7 @@
 
 .breadcrumb {
   padding: 8px 15px;
-  margin: 0 0 @line-height-base;
+  margin: 0 0 @line-height-computed;
   list-style: none;
   background-color: #f5f5f5;
   border-radius: @border-radius-base;
@@ -19,10 +19,10 @@
       color: #ccc;
     }
     &:last-child:after {
-      content: ""; // No divider after last element
+      display: none; // No divider after last element
     }
   }
   > .active {
-    color: @grayLight;
+    color: @gray-light;
   }
 }

data/lib/padrino-admin/bootstrap-less/button-groups.less

@@ -4,24 +4,21 @@
 
 // Button carets
 .btn .caret {
-  border-top-color: @btn-color;
+  border-top-color: @btn-default-color;
 }
 .dropup .btn .caret {
-  border-bottom-color: @btn-color;
+  border-bottom-color: @btn-default-color;
 }
 
 // Make the div behave like a button
-.btn-group {
+.btn-group,
+.btn-group-vertical {
   position: relative;
   display: inline-block;
   vertical-align: middle; // match .btn alignment given font-size hack above
   > .btn {
     position: relative;
     float: left;
-    // Prevent double borders when buttons are next to each other
-    + btn {
-      margin-left: -1px;
-    }
     // Bring the "active" button to the front
     &:hover,
     &:active {
@@ -30,6 +27,11 @@
   }
 }
 
+// Prevent double borders when buttons are next to each other
+.btn-group .btn + .btn {
+  margin-left: -1px;
+}
+
 // Optional: Group multiple button groups together for a toolbar
 .btn-toolbar {
   .clearfix();
@@ -46,31 +48,36 @@
   }
 }
 
-// Float them, remove border radius, then re-add to first and last elements
-.btn-group > .btn {
-  position: relative;
+.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
   border-radius: 0;
 }
 
-
 // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
 .btn-group > .btn:first-child {
   margin-left: 0;
-  .border-left-radius(@border-radius-base);
+  &:not(:last-child):not(.dropdown-toggle) {
+    .border-right-radius(0);
+  }
 }
 // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
-.btn-group > .btn:last-child,
-.btn-group > .dropdown-toggle {
-  .border-right-radius(@border-radius-base);
+.btn-group > .btn:last-child:not(:first-child),
+.btn-group > .dropdown-toggle:not(:first-child) {
+  .border-left-radius(0);
 }
-// Reset corners for large buttons
-.btn-group > .btn.large:first-child {
-  margin-left: 0;
-  .border-left-radius(@border-radius-large);
+
+// Custom edits for including btn-groups within btn-groups (useful for including dropdown buttons within a btn-group)
+.btn-group > .btn-group {
+  float: left;
 }
-.btn-group > .btn.large:last-child,
-.btn-group > .large.dropdown-toggle {
-  .border-right-radius(@border-radius-large);
+.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
+  border-radius: 0;
+}
+.btn-group > .btn-group:first-child > .btn:last-child,
+.btn-group > .btn-group:first-child > .dropdown-toggle {
+  .border-right-radius(0);
+}
+.btn-group > .btn-group:last-child > .btn:first-child {
+  .border-left-radius(0);
 }
 
 // On active and open, don't show outline
@@ -89,10 +96,6 @@
   padding-left: 8px;
   padding-right: 8px;
 }
-.btn-group > .btn-mini + .dropdown-toggle {
-  padding-left: 5px;
-  padding-right: 5px;
-}
 .btn-group > .btn-large + .dropdown-toggle {
   padding-left: 12px;
   padding-right: 12px;
@@ -107,7 +110,6 @@
 
 // Reposition the caret
 .btn .caret {
-  margin-top: 8px;
   margin-left: 0;
 }
 // Carets in other button sizes
@@ -128,20 +130,18 @@
   float: none;
   width: 100%;
   max-width: 100%;
+  + .btn {
+    margin-top: -1px;
+  }
+}
+.btn-group-vertical .btn:not(:first-child):not(:last-child) {
+  border-radius: 0;
 }
 .btn-group-vertical .btn:first-child {
-  border-radius: 0; // Needs to be here for specificity since we're not zeroing them out again
-  .border-top-radius(@border-radius-base);
+  .border-bottom-radius(0);
 }
 .btn-group-vertical .btn:last-child {
-  border-radius: 0; // Needs to be here for specificity since we're not zeroing them out again
-  .border-bottom-radius(@border-radius-base);
-}
-.btn-group-vertical .btn-large:first-child {
-  .border-top-radius(@border-radius-large);
-}
-.btn-group-vertical .btn-large:last-child {
-  .border-bottom-radius(@border-radius-large);
+  .border-top-radius(0);
 }
 
 

data/lib/padrino-admin/bootstrap-less/buttons.less

@@ -9,7 +9,7 @@
 // Core styles
 .btn {
   display: inline-block;
-  padding: 6px 12px;
+  padding: @padding-base-vertical @padding-base-horizontal;
   margin-bottom: 0; // For input.btn
   font-size: @font-size-base;
   font-weight: 500;
@@ -17,7 +17,7 @@
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
-  border: 1px solid @btn-border;
+  border: 1px solid transparent;
   border-radius: @border-radius-base;
   white-space: nowrap;
 
@@ -50,91 +50,35 @@
 }
 
 
-// Button Sizes
-// -------------------------
-
-// Large
-.btn-large {
-  padding: @padding-large;
-  font-size: @font-size-large;
-  border-radius: @border-radius-large;
-}
-
-// Small
-.btn-small {
-  padding: @padding-small;
-  font-size: @font-size-small;
-  border-radius: @border-radius-small;
-}
-
-// Mini
-.btn-mini {
-  padding: @padding-mini;
-  font-size: @font-size-mini;
-  border-radius: @border-radius-small;
-}
-
-
-// Icons in buttons
-// -------------------------
-
-// TODO: figure this shit out
-
-// Block button
-// -------------------------
-
-.btn-block {
-  display: block;
-  width: 100%;
-  padding-left: 0;
-  padding-right: 0;
-}
-
-// Vertically space out multiple block buttons
-.btn-block + .btn-block {
-  margin-top: 5px;
-}
-
-// Specificity overrides
-input[type="submit"],
-input[type="reset"],
-input[type="button"] {
-  &.btn-block {
-    width: 100%;
-  }
-}
-
-
 // Alternate buttons
 // --------------------------------------------------
 
-.btn {
-  color: @btn-color;
-  .btn-pseudo-states(@btn-bg, @btn-border);
+.btn-default {
+  .btn-pseudo-states(@btn-default-color, @btn-default-bg, @btn-default-border);
 }
 .btn-primary {
-  .btn-pseudo-states(@btn-primary-bg, @btn-primary-border);
+  .btn-pseudo-states(@btn-primary-color, @btn-primary-bg, @btn-primary-border);
 }
 // Warning appears as orange
 .btn-warning {
-  .btn-pseudo-states(@btn-bg-warning, @btn-warning-border);
+  .btn-pseudo-states(@btn-warning-color, @btn-warning-bg, @btn-warning-border);
 }
 // Danger and error appear as red
 .btn-danger {
-  .btn-pseudo-states(@btn-bg-danger, @btn-danger-border);
+  .btn-pseudo-states(@btn-danger-color, @btn-danger-bg, @btn-danger-border);
 }
 // Success appears as green
 .btn-success {
-  .btn-pseudo-states(@btn-bg-success, @btn-success-border);
+  .btn-pseudo-states(@btn-success-color, @btn-success-bg, @btn-success-border);
 }
 // Info appears as blue-green
 .btn-info {
-  .btn-pseudo-states(@btn-bg-info, @btn-info-border);
+  .btn-pseudo-states(@btn-info-color, @btn-info-bg, @btn-info-border);
 }
 
 
 // Link buttons
-// --------------------------------------------------
+// -------------------------
 
 // Make a button look and behave like a link
 .btn-link,
@@ -168,8 +112,49 @@ fieldset[disabled] .btn-link {
   fieldset[disabled] & {
     &:hover,
     &:focus {
-      color: @grayDark;
+      color: @gray-dark;
       text-decoration: none;
     }
   }
 }
+
+
+// Button Sizes
+// --------------------------------------------------
+
+.btn-large {
+  padding: @padding-large-vertical @padding-large-horizontal;
+  font-size: @font-size-large;
+  border-radius: @border-radius-large;
+}
+.btn-small {
+  padding: @padding-small-vertical @padding-small-horizontal;
+  font-size: @font-size-small;
+  line-height: 1.5; // ensure proper height of button next to small input
+  border-radius: @border-radius-small;
+}
+
+
+// Block button
+// --------------------------------------------------
+
+.btn-block {
+  display: block;
+  width: 100%;
+  padding-left: 0;
+  padding-right: 0;
+}
+
+// Vertically space out multiple block buttons
+.btn-block + .btn-block {
+  margin-top: 5px;
+}
+
+// Specificity overrides
+input[type="submit"],
+input[type="reset"],
+input[type="button"] {
+  &.btn-block {
+    width: 100%;
+  }
+}