From 4cc2d8bc25fa1a6cc4bcc4962373852386afaee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tayfun=20O=CC=88zis=CC=A7=20ERI=CC=87KAN?= Date: Sun, 11 Aug 2013 17:01:36 +0300 Subject: [PATCH] #30 Create tables page - Table variations was adde - No-padding panel was fixed for table usage --- .../stylesheets/_bootstrap_overrides.css.sass | 9 ++ source/index.html.haml | 8 +- source/partials/_dock.haml | 4 +- source/tables.html.haml | 131 ++++++++++++++++++ 4 files changed, 143 insertions(+), 9 deletions(-) create mode 100755 source/tables.html.haml diff --git a/source/assets/stylesheets/_bootstrap_overrides.css.sass b/source/assets/stylesheets/_bootstrap_overrides.css.sass index d0e0514..e0bfd4d 100755 --- a/source/assets/stylesheets/_bootstrap_overrides.css.sass +++ b/source/assets/stylesheets/_bootstrap_overrides.css.sass @@ -49,6 +49,11 @@ margin-top: 4px padding-bottom: 4px font-weight: 200 + .panel-body + &.no-padding + margin-left: -15px + margin-right: -15px + margin-top: -15px // Buttons .btn @@ -56,3 +61,7 @@ .radio, .checkbox margin-top: 0 + +.table + @extend .table-striped + @extend .table-hover diff --git a/source/index.html.haml b/source/index.html.haml index 6771722..ced6d65 100755 --- a/source/index.html.haml +++ b/source/index.html.haml @@ -7,16 +7,10 @@ .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 + Refresh statics %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Toggle'} %i.icon-chevron-down - .badge 3 record .panel-body .page-header %h4 System usage diff --git a/source/partials/_dock.haml b/source/partials/_dock.haml index dd85f05..cddfe65 100644 --- a/source/partials/_dock.haml +++ b/source/partials/_dock.haml @@ -7,9 +7,9 @@ %li.launcher{launcher_active('forms')} %i.icon-file-text-alt =link_to 'Forms', 'forms.html' - %li.launcher + %li.launcher{launcher_active('tables')} %i.icon-table - %a{href: '#'} Tables + =link_to 'Tables', 'tables.html' %li.launcher.dropdown.hover %i.icon-flag %a{href: '#'} Reports diff --git a/source/tables.html.haml b/source/tables.html.haml new file mode 100755 index 0000000..ca697fa --- /dev/null +++ b/source/tables.html.haml @@ -0,0 +1,131 @@ +- page 'Tables', 'tables' + +.panel + .panel-heading + %i.icon-edit.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.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 + +.row + .col-lg-6 + .panel + .panel-heading + %i.icon-edit.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 + + .col-lg-6 + .panel + .panel-heading + %i.icon-edit.icon-large + Default 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 + +.panel + .panel-heading + %i.icon-edit.icon-large + Condensed Table + .panel-body + %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