31 Add more content view helpers

- Panel dimensions and colors was fixed - Font files was removed
frralf · Sep 12, 2013 · 371d9d1 · 371d9d1
1 parent 2b09097
commit 371d9d1
Show file tree

Hide file tree

Showing 9 changed files with 298 additions and 479 deletions.
diff --git a/source/assets/fonts/glyphiconshalflings-regular.eot b/source/assets/fonts/glyphiconshalflings-regular.eot
diff --git a/source/assets/fonts/glyphiconshalflings-regular.otf b/source/assets/fonts/glyphiconshalflings-regular.otf
diff --git a/source/assets/fonts/glyphiconshalflings-regular.svg b/source/assets/fonts/glyphiconshalflings-regular.svg
diff --git a/source/assets/fonts/glyphiconshalflings-regular.ttf b/source/assets/fonts/glyphiconshalflings-regular.ttf
diff --git a/source/assets/fonts/glyphiconshalflings-regular.woff b/source/assets/fonts/glyphiconshalflings-regular.woff
diff --git a/source/assets/stylesheets/_bootstrap_overrides.css.sass b/source/assets/stylesheets/_bootstrap_overrides.css.sass
@@ -13,7 +13,7 @@
     top: -6px
     right: 20px
 
-// Panels
+//Panels
 .panel // Remove box shadow from panels
   +box-shadow(none)
 
@@ -22,38 +22,6 @@
     color: $base-dark-color
     i[class*='icon-']
       margin-right: 5px
-  .panel-tools
-    float: right
-    margin-top: -48px
-    margin-right: -8px
-    .btn-group
-      margin-top: -6px
-    .btn-group, .label, .badge
-      float: right
-      display: inline-block
-    .btn
-      padding: 8px 6px
-      font-weight: 200
-      font-size: 1em
-      color: $base-dark-color
-      &:hover
-        color: $base-color
-      &:active, &:focus
-        color: darken($base-color, 10)
-        +box-shadow(none)
-      span.badge
-        font-size: .7em
-        padding: 2px 4px
-    .label, .badge
-      margin-right: 5px
-      margin-top: 4px
-      padding-bottom: 4px
-      font-weight: 200
-  .panel-body
-    &.no-padding
-      margin-left: -15px
-      margin-right: -15px
-      margin-top: -15px
 
 // Buttons
 .btn

diff --git a/source/assets/stylesheets/application.css.sass b/source/assets/stylesheets/application.css.sass
@@ -63,47 +63,72 @@ form
 .text-center
   text-align: center
 
-.tables
+// Grids
+.panel.grid
+  .panel-heading
+    text-align: left
+    background-color: lighten($panel-heading-bg, 3)
+
+    .panel-tools
+      float: right
+      margin-top: -4px
+      margin-right: -8px
+      .btn-group
+        margin-top: -6px
+      .btn-group, .label, .badge
+        float: right
+        display: inline-block
+      .btn
+        padding: 8px 6px
+        font-weight: 200
+        font-size: 1em
+        color: $base-dark-color
+        &:hover
+          color: $base-color
+        &:active, &:focus
+          color: darken($base-color, 10)
+          +box-shadow(none)
+        span.badge
+          font-size: .7em
+          padding: 2px 4px
+      .label, .badge
+        margin-right: 5px
+        margin-top: 4px
+        padding-bottom: 4px
+        font-weight: 200
   .panel-body
-    .table-header
-      text-align: left
-      padding: 10px
-      background-color: lighten($panel-heading-bg, 3)
-      border-bottom: 1px solid $table-border-color
-      &.row
-        margin: 0
+    &.filters
+      background-color: lighten($panel-heading-bg, 5)
       .input-group
-        margin-right: -15px
         input
           height: 30px
         button
           height: 30px
           padding: 0 10px
-    .table-footer
-      background-color: lighten($panel-heading-bg, 3)
-      border-top: 1px solid $table-border-color
-      +border-bottom-left-radius(4px)
-      +border-bottom-right-radius(4px)
-      padding: 10px 10px 5px 10px
-      margin-bottom: -14px
-      .pagination
-        margin: 0
-    table
-      margin-bottom: 0
-      th:first-child, td:first-child
-        padding-left: 15px
-      tr.disabled
-        +opacity(.4)
-        td
-          text-decoration: line-through
-        td.action
-          text-decoration: none !important
+  table
+    margin-bottom: 0
+    th:first-child, td:first-child
+      padding-left: 15px
+    tr.disabled
+      +opacity(.4)
+      td
+        text-decoration: line-through
       td.action
-        width: 15%
-        padding: 5px
-        .btn
-          height: 25px
-          padding: 2px 6px
+        text-decoration: none !important
+    td.action
+      width: 15%
+      padding: 5px
+      .btn
+        height: 25px
+        padding: 2px 6px
+  .panel-footer
+    padding: 10px 10px 5px 10px
+    background-color: lighten($panel-heading-bg, 3)
+    .pagination
+      margin: 0
+    .pull-right
+      padding-top: 5px
+
 
 #navbar
   .navbar-brand

diff --git a/source/forms.html.haml b/source/forms.html.haml
@@ -1,6 +1,6 @@
 - page 'Forms', 'forms'
 
-.panel
+.panel.panel-default
   .panel-heading
     %i.icon-edit.icon-large
     Form Default
@@ -135,7 +135,7 @@
         %button.btn.btn-default{:type => 'submit'} Submit
         %a.btn{href: '#'} Cancel
 
-.panel
+.panel.panel-default
   .panel-heading
     %i.icon-edit.icon-large
     Form Horizontal
@@ -184,7 +184,7 @@
         %button.btn.btn-default{:type => 'submit'} Save
         %a.btn{href: '#'} Cancel
 
-.panel
+.panel.panel-default
   .panel-heading
     %i.icon-edit.icon-large
     Knob Inputs