From ae6428ee17eddc7e4f8780b985a070aa55ec2bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tayfun=20O=CC=88zis=CC=A7=20ERI=CC=87KAN?= Date: Fri, 13 Sep 2013 18:31:16 +0300 Subject: [PATCH] 31 Add more content view helpers - Navbar variables were fixed - Panel tools was fixed - Dropdown launcher menu position was fixed --- .gitignore | 2 + config.rb | 1 - .../assets/javascripts/application.js.coffee | 3 - .../stylesheets/_bootstrap_overrides.css.sass | 7 +- source/assets/stylesheets/_variables.css.sass | 6 +- .../assets/stylesheets/application.css.sass | 87 +++++++++---------- source/dashboard.html.haml | 24 ++--- source/partials/_navbar.haml | 2 +- 8 files changed, 65 insertions(+), 67 deletions(-) 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/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 3655d51..4490277 100755 --- a/source/assets/stylesheets/_bootstrap_overrides.css.sass +++ b/source/assets/stylesheets/_bootstrap_overrides.css.sass @@ -16,12 +16,17 @@ //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-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 41a3479..bb15730 100755 --- a/source/assets/stylesheets/application.css.sass +++ b/source/assets/stylesheets/application.css.sass @@ -63,48 +63,46 @@ form .text-center text-align: center -// Grids -.panel.grid - .panel-heading - text-align: left - background-color: lighten($panel-heading-bg, 3) - - .panel-tools +// Panels +.panel + .panel-tools + float: right + margin-top: -4px + margin-right: -8px + .btn-group + margin-top: -6px + .btn-group, .label, .badge 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 - &.filters - background-color: lighten($panel-heading-bg, 5) - .input-group - input - height: 30px - button - height: 30px - padding: 0 10px + 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 @@ -123,11 +121,8 @@ form 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 @@ -205,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 @@ -241,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/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