diff --git a/.gitignore b/.gitignore index fceec1f..73b8583 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ tmp _yardoc doc/ *.psd + +build/ diff --git a/config.rb b/config.rb index 6d8a358..7c6a7ce 100755 --- a/config.rb +++ b/config.rb @@ -67,7 +67,6 @@ # i18n activate :i18n -set :fonts_dir, 'assets/fonts' set :css_dir, 'assets/stylesheets' set :js_dir, 'assets/javascripts' set :images_dir, 'assets/images' diff --git a/source/assets/fonts/glyphiconshalflings-regular.eot b/source/assets/fonts/glyphiconshalflings-regular.eot deleted file mode 100755 index bd59ccd..0000000 Binary files a/source/assets/fonts/glyphiconshalflings-regular.eot and /dev/null differ diff --git a/source/assets/fonts/glyphiconshalflings-regular.otf b/source/assets/fonts/glyphiconshalflings-regular.otf deleted file mode 100755 index b058f1c..0000000 Binary files a/source/assets/fonts/glyphiconshalflings-regular.otf and /dev/null differ diff --git a/source/assets/fonts/glyphiconshalflings-regular.svg b/source/assets/fonts/glyphiconshalflings-regular.svg deleted file mode 100755 index 0fb4587..0000000 --- a/source/assets/fonts/glyphiconshalflings-regular.svg +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/source/assets/fonts/glyphiconshalflings-regular.ttf b/source/assets/fonts/glyphiconshalflings-regular.ttf deleted file mode 100755 index c63c068..0000000 Binary files a/source/assets/fonts/glyphiconshalflings-regular.ttf and /dev/null differ diff --git a/source/assets/fonts/glyphiconshalflings-regular.woff b/source/assets/fonts/glyphiconshalflings-regular.woff deleted file mode 100755 index 4c778ff..0000000 Binary files a/source/assets/fonts/glyphiconshalflings-regular.woff and /dev/null differ diff --git a/source/assets/javascripts/application.js.coffee b/source/assets/javascripts/application.js.coffee index dcf666d..30bae7c 100644 --- a/source/assets/javascripts/application.js.coffee +++ b/source/assets/javascripts/application.js.coffee @@ -14,9 +14,6 @@ $(document).ready -> ), -> $(this).find('.dropdown-menu').stop(true, true).delay(100).fadeOut() - # Dock dropdown fix - $('#dock li.launcher').each -> - $(this).find('.dropdown-menu').css 'top', $(this).position().top + 33 $('#toggle').click -> $('#dock .launcher a').toggle() diff --git a/source/assets/stylesheets/_bootstrap_overrides.css.sass b/source/assets/stylesheets/_bootstrap_overrides.css.sass index 112bd1f..4490277 100755 --- a/source/assets/stylesheets/_bootstrap_overrides.css.sass +++ b/source/assets/stylesheets/_bootstrap_overrides.css.sass @@ -13,47 +13,20 @@ top: -6px right: 20px -// Panels +//Panels .panel // Remove box shadow from panels +box-shadow(none) - // Panel heading styles .panel-heading + text-align: left + background-color: lighten($panel-heading-bg, 3) 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 + .panel-footer + background-color: lighten($panel-heading-bg, 3) + .pull-right + padding-top: 5px // Buttons .btn diff --git a/source/assets/stylesheets/_variables.css.sass b/source/assets/stylesheets/_variables.css.sass index 0334a2d..8356e85 100755 --- a/source/assets/stylesheets/_variables.css.sass +++ b/source/assets/stylesheets/_variables.css.sass @@ -28,9 +28,9 @@ $box-shadow-color: rgba(black, 0.04) $brand-primary: $base-color $brand-success: $brand-primary -$navbar-bg: rgba(0,0,0,0) -$navbar-brand-color: $base-dark-color -$navbar-brand-hover-color: lighten($base-dark-color, 10) +$navbar-default-bg: rgba(0,0,0,0) +$navbar-default-brand-color: $base-dark-color +$navbar-default-brand-hover-color: lighten($base-dark-color, 5) $breadcrumb-bg: $clouds $panel-heading-bg: $clouds diff --git a/source/assets/stylesheets/application.css.sass b/source/assets/stylesheets/application.css.sass index 5e102df..bb15730 100755 --- a/source/assets/stylesheets/application.css.sass +++ b/source/assets/stylesheets/application.css.sass @@ -63,47 +63,67 @@ form .text-center text-align: center -.tables - .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 - .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 +// Panels +.panel + .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 + +// Grids +.grid + .filters + background-color: lighten($panel-heading-bg, 5) + .input-group + input + height: 30px + button + height: 30px + padding: 0 10px + 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 + .pagination + margin: 0 + #navbar .navbar-brand @@ -180,7 +200,7 @@ form text-align: left position: absolute margin-left: 85px - top: 80px + top: 8px > li > a padding: 5px 20px a, li.dropdown-header @@ -216,7 +236,7 @@ form height: 10px background-color: white position: absolute - right: -5px + right: -6px margin-top: 22px #content diff --git a/source/dashboard.html.haml b/source/dashboard.html.haml index 8996bb1..cdab681 100755 --- a/source/dashboard.html.haml +++ b/source/dashboard.html.haml @@ -16,17 +16,17 @@ .label.label-info Info -.panel +.panel.panel-default .panel-heading %i.icon-beer.icon-large Hierapolis Rocks! - .panel-tools - .btn-group - %a.btn{href: '#'} - %i.icon-refresh - Refresh statics - %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Toggle'} - %i.icon-chevron-down + .panel-tools + .btn-group + %a.btn{href: '#'} + %i.icon-refresh + Refresh statics + %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Toggle'} + %i.icon-chevron-down .panel-body .page-header %h4 System usage @@ -37,11 +37,11 @@ .page-header %h4 User statics .row.text-center - .col-3 + .col-md-3 %input.knob.second{'data-bgcolor' => '#d4ecfd', 'data-fgcolor' => '#30a1ec', 'data-inputcolor' => '#333', 'data-thickness' => '.3', 'data-width' => '140', 'data-height' => '140', :type => 'text', :value => '50'}/ - .col-3 + .col-md-3 %input.knob.second{'data-bgcolor' => '#c4e9aa', 'data-fgcolor' => '#8ac368', 'data-inputcolor' => '#333', 'data-thickness' => '.3', 'data-width' => '140', 'data-height' => '140', :type => 'text', :value => '75'}/ - .col-3 + .col-md-3 %input.knob.second{'data-bgcolor' => '#cef3f5', 'data-fgcolor' => '#5ba0a3', 'data-inputcolor' => '#333', 'data-thickness' => '.3', 'data-width' => '140', 'data-height' => '140', :type => 'text', :value => '35'}/ - .col-3 + .col-md-3 %input.knob.second{'data-bgcolor' => '#f8d2e0', 'data-fgcolor' => '#b85e80', 'data-inputcolor' => '#333', 'data-thickness' => '.3', 'data-width' => '140', 'data-height' => '140', :type => 'text', :value => '85'}/ \ No newline at end of file diff --git a/source/forms.html.haml b/source/forms.html.haml index f5616aa..fa52e61 100755 --- 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 diff --git a/source/partials/_navbar.haml b/source/partials/_navbar.haml index 30b1836..216a398 100644 --- a/source/partials/_navbar.haml +++ b/source/partials/_navbar.haml @@ -1,4 +1,4 @@ -#navbar.navbar +#navbar.navbar.navbar-default %a.navbar-brand{:href => '#'} %i.icon-beer Hierapolis diff --git a/source/tables.html.haml b/source/tables.html.haml index e75b886..de9172e 100755 --- a/source/tables.html.haml +++ b/source/tables.html.haml @@ -12,254 +12,226 @@ %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Lemon'} %i.icon-lemon -.panel.tables +.panel.panel-default.grid + .panel-heading %i.icon-table.icon-large Default Table - .panel-tools - .btn-group - %a.btn{href: '#'} - %i.icon-wrench - Settings - %a.btn{href: '#'} - %i.icon-filter - Filters - %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Reload'} - %i.icon-refresh - .badge 3 record - .panel-body.no-padding - .table-header.row - .col-lg-9 - TODO: Add filters here - .col-lg-3 + + .panel-tools + .btn-group + %a.btn{href: '#'} + %i.icon-wrench + Settings + %a.btn{href: '#'} + %i.icon-filter + Filters + %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Reload'} + %i.icon-refresh + .badge 3 record + + .panel-body.filters + .row + .col-md-9 + Add your custom filters here... + .col-md-3 .input-group %input.form-control{placeholder: 'Quick search...', type: 'text'}/ %span.input-group-btn %button.btn{type: 'button'} %i.icon-search - %table.table - %thead - %tr - %th # - %th First Name - %th Last Name - %th Username - %th.actions - Actions - %tbody - %tr.success - %td 1 - %td Mark - %td Otto - %td @mdo - %td.action - %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'} - %i.icon-zoom-in - %a.btn.btn-info{href: '#'} - %i.icon-edit - %a.btn.btn-danger{href: '#'} - %i.icon-trash - %tr.danger - %td 2 - %td Jacob - %td Thornton - %td @fat - %td.action - %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'} - %i.icon-zoom-in - %a.btn.btn-info{href: '#'} - %i.icon-edit - %a.btn.btn-danger{href: '#'} - %i.icon-trash - %tr.warning - %td 3 - %td Larry - %td the Bird - %td @twitter - %td.action - %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'} - %i.icon-zoom-in - %a.btn.btn-info{href: '#'} - %i.icon-edit - %a.btn.btn-danger{href: '#'} - %i.icon-trash - %tr.active - %td 4 - %td Mark - %td Otto - %td @mdo - %td.action - %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'} - %i.icon-zoom-in - %a.btn.btn-info{href: '#'} - %i.icon-edit - %a.btn.btn-danger{href: '#'} - %i.icon-trash - %tr.disabled - %td 5 - %td Jacob - %td Thornton - %td @fat - %td.action - %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'} - %i.icon-zoom-in - %a.btn.btn-info{href: '#'} - %i.icon-edit - %a.btn.btn-danger{href: '#'} - %i.icon-trash - %tr - %td 6 - %td Larry - %td the Bird - %td @twitter - %td.action - %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'} - %i.icon-zoom-in - %a.btn.btn-info{href: '#'} - %i.icon-edit - %a.btn.btn-danger{href: '#'} - %i.icon-trash - %tr - %td 7 - %td Jacob - %td Thornton - %td @fat - %td.action - %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'} - %i.icon-zoom-in - %a.btn.btn-info{href: '#'} - %i.icon-edit - %a.btn.btn-danger{href: '#'} - %i.icon-trash - %tr - %td 8 - %td Larry - %td the Bird - %td @twitter - %td.action - %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'} - %i.icon-zoom-in - %a.btn.btn-info{href: '#'} - %i.icon-edit - %a.btn.btn-danger{href: '#'} - %i.icon-trash - %tr - %td 9 - %td Mark - %td Otto - %td @mdo - %td.action - %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'} - %i.icon-zoom-in - %a.btn.btn-info{href: '#'} - %i.icon-edit - %a.btn.btn-danger{href: '#'} - %i.icon-trash - %tr - %td 10 - %td Jacob - %td Thornton - %td @fat - %td.action - %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'} - %i.icon-zoom-in - %a.btn.btn-info{href: '#'} - %i.icon-edit - %a.btn.btn-danger{href: '#'} - %i.icon-trash - .table-footer - %ul.pagination - %li - %a{:href => '#'} « - %li.active - %a{:href => '#'} 1 - %li - %a{:href => '#'} 2 - %li - %a{:href => '#'} 3 - %li - %a{:href => '#'} 4 - %li - %a{:href => '#'} 5 - %li - %a{:href => '#'} 6 - %li - %a{:href => '#'} 7 - %li - %a{:href => '#'} 8 - %li - %a{:href => '#'} » - .pull-right - Showing 1 to 10 of 32 entries + %table.table + %thead + %tr + %th # + %th First Name + %th Last Name + %th Username + %th.actions + Actions + %tbody + %tr.success + %td 1 + %td Mark + %td Otto + %td @mdo + %td.action + %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'} + %i.icon-zoom-in + %a.btn.btn-info{href: '#'} + %i.icon-edit + %a.btn.btn-danger{href: '#'} + %i.icon-trash + %tr.danger + %td 2 + %td Jacob + %td Thornton + %td @fat + %td.action + %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'} + %i.icon-zoom-in + %a.btn.btn-info{href: '#'} + %i.icon-edit + %a.btn.btn-danger{href: '#'} + %i.icon-trash + %tr.warning + %td 3 + %td Larry + %td the Bird + %td @twitter + %td.action + %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'} + %i.icon-zoom-in + %a.btn.btn-info{href: '#'} + %i.icon-edit + %a.btn.btn-danger{href: '#'} + %i.icon-trash + %tr.active + %td 4 + %td Mark + %td Otto + %td @mdo + %td.action + %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'} + %i.icon-zoom-in + %a.btn.btn-info{href: '#'} + %i.icon-edit + %a.btn.btn-danger{href: '#'} + %i.icon-trash + %tr.disabled + %td 5 + %td Jacob + %td Thornton + %td @fat + %td.action + %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'} + %i.icon-zoom-in + %a.btn.btn-info{href: '#'} + %i.icon-edit + %a.btn.btn-danger{href: '#'} + %i.icon-trash + %tr + %td 6 + %td Larry + %td the Bird + %td @twitter + %td.action + %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'} + %i.icon-zoom-in + %a.btn.btn-info{href: '#'} + %i.icon-edit + %a.btn.btn-danger{href: '#'} + %i.icon-trash + %tr + %td 7 + %td Jacob + %td Thornton + %td @fat + %td.action + %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'} + %i.icon-zoom-in + %a.btn.btn-info{href: '#'} + %i.icon-edit + %a.btn.btn-danger{href: '#'} + %i.icon-trash + %tr + %td 8 + %td Larry + %td the Bird + %td @twitter + %td.action + %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'} + %i.icon-zoom-in + %a.btn.btn-info{href: '#'} + %i.icon-edit + %a.btn.btn-danger{href: '#'} + %i.icon-trash + %tr + %td 9 + %td Mark + %td Otto + %td @mdo + %td.action + %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'} + %i.icon-zoom-in + %a.btn.btn-info{href: '#'} + %i.icon-edit + %a.btn.btn-danger{href: '#'} + %i.icon-trash + %tr + %td 10 + %td Jacob + %td Thornton + %td @fat + %td.action + %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'} + %i.icon-zoom-in + %a.btn.btn-info{href: '#'} + %i.icon-edit + %a.btn.btn-danger{href: '#'} + %i.icon-trash -.row - .col-lg-6 - .panel.tables - .panel-heading - %i.icon-table.icon-large - Padding Table - .panel-body - %table.table - %thead - %tr - %th # - %th First Name - %th Last Name - %th Username - %tbody - %tr - %td 1 - %td Mark - %td Otto - %td @mdo - %tr - %td 2 - %td Jacob - %td Thornton - %td @fat - %tr - %td 3 - %td Larry - %td the Bird - %td @twitter - .col-lg-6 - .panel.tables - .panel-heading - %i.icon-table.icon-large - Bordered Table - .panel-body - %table.table.table-bordered - %thead - %tr - %th # - %th First Name - %th Last Name - %th Username - %tbody - %tr - %td 1 - %td Mark - %td Otto - %td @mdo - %tr - %td 2 - %td Jacob - %td Thornton - %td @fat - %tr - %td 3 - %td Larry - %td the Bird - %td @twitter + .panel-footer + %ul.pagination.pagination-sm + %li + %a{:href => '#'} « + %li.active + %a{:href => '#'} 1 + %li + %a{:href => '#'} 2 + %li + %a{:href => '#'} 3 + %li + %a{:href => '#'} 4 + %li + %a{:href => '#'} 5 + %li + %a{:href => '#'} 6 + %li + %a{:href => '#'} 7 + %li + %a{:href => '#'} 8 + %li + %a{:href => '#'} » + .pull-right + Showing 1 to 10 of 32 entries + +.panel.panel-default.grid + .panel-heading + %i.icon-table.icon-large + Padding Table + %table.table + %thead + %tr + %th # + %th First Name + %th Last Name + %th Username + %tbody + %tr + %td 1 + %td Mark + %td Otto + %td @mdo + %tr + %td 2 + %td Jacob + %td Thornton + %td @fat + %tr + %td 3 + %td Larry + %td the Bird + %td @twitter -.panel.tables +.panel.panel-default.grid .panel-heading %i.icon-table.icon-large - Condensed Table - .panel-body.no-padding - %table.table.table-condensed + Bordered Table + .panel-body + %table.table.table-bordered %thead %tr %th # @@ -281,4 +253,33 @@ %td 3 %td Larry %td the Bird - %td @twitter \ No newline at end of file + %td @twitter + + +.panel.panel-default.grid + .panel-heading + %i.icon-table.icon-large + Condensed Table + %table.table.table-condensed + %thead + %tr + %th # + %th First Name + %th Last Name + %th Username + %tbody + %tr + %td 1 + %td Mark + %td Otto + %td @mdo + %tr + %td 2 + %td Jacob + %td Thornton + %td @fat + %tr + %td 3 + %td Larry + %td the Bird + %td @twitter \ No newline at end of file