From cf2f8743a350cfcb7e3f73ccb37863776f16fba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Muhammet=20DI=CC=87LEK?= Date: Wed, 18 Sep 2013 09:44:06 +0300 Subject: [PATCH] #29 navbar fixed --- CHANGELOG.md | 60 ++++++++++--------- app/views/layouts/partials/_navbar.haml | 2 +- .../assets/javascripts/hierapolis.js.coffee | 3 - 3 files changed, 32 insertions(+), 33 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06355a7..c539819 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,51 +2,53 @@ #### [Current] #### - * [6a88594](../../commit/6a88594) - __(Muhammet DILEK)__ scheme.rb fixed - * [361c26d](../../commit/361c26d) - __(Muhammet DILEK)__ [#20](../../issues/20) blank list and filter partial added to scaffold generator - * [89d3fd5](../../commit/89d3fd5) - __(Onur zgr ZKAN)__ Update README.md + * [beff870](../../commit/beff870) - __(Muhammet DİLEK)__ [#29](../../issues/29) theme presentation page updated + * [72c0859](../../commit/72c0859) - __(Muhammet DİLEK)__ [#29](../../issues/29) bootstrap3 class added to generator and theme + * [6a88594](../../commit/6a88594) - __(Muhammet DİLEK)__ scheme.rb fixed + * [361c26d](../../commit/361c26d) - __(Muhammet DİLEK)__ [#20](../../issues/20) blank list and filter partial added to scaffold generator + * [89d3fd5](../../commit/89d3fd5) - __(Onur Özgür ÖZKAN)__ Update README.md * [6f57aa7](../../commit/6f57aa7) - __(Ahmet Sezgin Duran)__ Update README.md - * [7c1f307](../../commit/7c1f307) - __(Muhammet DILEK)__ [#20](../../issues/20) show_for config added - * [ca81bb4](../../commit/ca81bb4) - __(Muhammet DILEK)__ [#20](../../issues/20) detail page added + * [7c1f307](../../commit/7c1f307) - __(Muhammet DİLEK)__ [#20](../../issues/20) show_for config added + * [ca81bb4](../../commit/ca81bb4) - __(Muhammet DİLEK)__ [#20](../../issues/20) detail page added * [19c5718](../../commit/19c5718) - __(Ahmet Sezgin Duran)__ Update README.md * [560fd1b](../../commit/560fd1b) - __(Ahmet Sezgin Duran)__ [#24](../../issues/24) Clean up code and add login links to README.md * [c581aa2](../../commit/c581aa2) - __(Ahmet Sezgin Duran)__ [#24](../../issues/24) Create default users for development and update README.md - * [1943cab](../../commit/1943cab) - __(Muhammet DILEK)__ [#20](../../issues/20) edit and new page added - * [6206a77](../../commit/6206a77) - __(Muhammet DILEK)__ [#20](../../issues/20) pagination view added - * [3c7bf81](../../commit/3c7bf81) - __(Muhammet DILEK)__ [#20](../../issues/20) ransack form added + * [1943cab](../../commit/1943cab) - __(Muhammet DİLEK)__ [#20](../../issues/20) edit and new page added + * [6206a77](../../commit/6206a77) - __(Muhammet DİLEK)__ [#20](../../issues/20) pagination view added + * [3c7bf81](../../commit/3c7bf81) - __(Muhammet DİLEK)__ [#20](../../issues/20) ransack form added * [f2b7ce3](../../commit/f2b7ce3) - __(emineeliftoscali)__ [#23](../../issues/23) Gems Updated with latest versions - Devise secret key added * [a862452](../../commit/a862452) - __(emineeliftoscali)__ [#23](../../issues/23) Gems Updated with latest versions - * [8d31387](../../commit/8d31387) - __(Onur zgr ZKAN)__ [#6](../../issues/6) Add header to README.md + * [8d31387](../../commit/8d31387) - __(Onur Özgür ÖZKAN)__ [#6](../../issues/6) Add header to README.md * [ee34b62](../../commit/ee34b62) - __(kadriye)__ [#6](../../issues/6) mail fixed on README.md * [3622339](../../commit/3622339) - __(kadriye)__ [#6](../../issues/6) README.md updated * [c2cab5d](../../commit/c2cab5d) - __(Ahmet Sezgin Duran)__ [#19](../../issues/19) Add README.md markdown for Travis CI - * [13a97e6](../../commit/13a97e6) - __(Muhammet DILEK)__ [#20](../../issues/20) ransack added - * [f1f8c33](../../commit/f1f8c33) - __(Muhammet DILEK)__ merge - * [28ec222](../../commit/28ec222) - __(Muhammet DILEK)__ [#20](../../issues/20) index improved - * [453767f](../../commit/453767f) - __(Muhammet DILEK)__ merge - * [e471486](../../commit/e471486) - __(Muhammet DILEK)__ [#16](../../issues/16) add csrf_meta_tags to layouts + * [13a97e6](../../commit/13a97e6) - __(Muhammet DİLEK)__ [#20](../../issues/20) ransack added + * [f1f8c33](../../commit/f1f8c33) - __(Muhammet DİLEK)__ merge + * [28ec222](../../commit/28ec222) - __(Muhammet DİLEK)__ [#20](../../issues/20) index improved + * [453767f](../../commit/453767f) - __(Muhammet DİLEK)__ merge + * [e471486](../../commit/e471486) - __(Muhammet DİLEK)__ [#16](../../issues/16) add csrf_meta_tags to layouts * [c338d33](../../commit/c338d33) - __(Ahmet Sezgin Duran)__ [#18](../../issues/18) Change default database of development to Sqlite3 - * [9429352](../../commit/9429352) - __(Muhammet DILEK)__ [#20](../../issues/20) form improved - * [f07214a](../../commit/f07214a) - __(Muhammet DILEK)__ [#21](../../issues/21) error class changed + * [9429352](../../commit/9429352) - __(Muhammet DİLEK)__ [#20](../../issues/20) form improved + * [f07214a](../../commit/f07214a) - __(Muhammet DİLEK)__ [#21](../../issues/21) error class changed * [52318cd](../../commit/52318cd) - __(Ahmet Sezgin Duran)__ [#19](../../issues/19) Fix README.md markdown of Gemnasium * [664c51a](../../commit/664c51a) - __(Ahmet Sezgin Duran)__ [#19](../../issues/19) Add README.md markdowns for Code Climate and Gemnasium - * [d62da34](../../commit/d62da34) - __(Muhammet DILEK)__ [#21](../../issues/21) file changed - * [fe16c6e](../../commit/fe16c6e) - __(Muhammet DILEK)__ [#16](../../issues/16) application layout changed - * [e28bc55](../../commit/e28bc55) - __(Muhammet DILEK)__ [#21](../../issues/21) Simple form improved for bootstrap 3 + * [d62da34](../../commit/d62da34) - __(Muhammet DİLEK)__ [#21](../../issues/21) file changed + * [fe16c6e](../../commit/fe16c6e) - __(Muhammet DİLEK)__ [#16](../../issues/16) application layout changed + * [e28bc55](../../commit/e28bc55) - __(Muhammet DİLEK)__ [#21](../../issues/21) Simple form improved for bootstrap 3 * [eff7256](../../commit/eff7256) - __(Ahmet Sezgin Duran)__ [#19](../../issues/19) Add configuration file for Travis CI - * [7c7fa5b](../../commit/7c7fa5b) - __(Muhammet DILEK)__ [#16](../../issues/16) form page added - * [aca6f8b](../../commit/aca6f8b) - __(Muhammet DILEK)__ [#16](../../issues/16) tables page added - * [0008243](../../commit/0008243) - __(Muhammet DILEK)__ [#16](../../issues/16) view helper moved to application helper - * [b39c20a](../../commit/b39c20a) - __(Muhammet DILEK)__ [#16](../../issues/16) hq namespace base layout added - * [f954448](../../commit/f954448) - __(Muhammet DILEK)__ [#16](../../issues/16) login layout added - * [51e9f1f](../../commit/51e9f1f) - __(Muhammet DILEK)__ [#16](../../issues/16) partials added + * [7c7fa5b](../../commit/7c7fa5b) - __(Muhammet DİLEK)__ [#16](../../issues/16) form page added + * [aca6f8b](../../commit/aca6f8b) - __(Muhammet DİLEK)__ [#16](../../issues/16) tables page added + * [0008243](../../commit/0008243) - __(Muhammet DİLEK)__ [#16](../../issues/16) view helper moved to application helper + * [b39c20a](../../commit/b39c20a) - __(Muhammet DİLEK)__ [#16](../../issues/16) hq namespace base layout added + * [f954448](../../commit/f954448) - __(Muhammet DİLEK)__ [#16](../../issues/16) login layout added + * [51e9f1f](../../commit/51e9f1f) - __(Muhammet DİLEK)__ [#16](../../issues/16) partials added * [a9663dc](../../commit/a9663dc) - __(Onur Ozgur OZKAN)__ [#9](../../issues/9) Setup mailchimp settings - * [740c66a](../../commit/740c66a) - __(Muhammet DILEK)__ [#16](../../issues/16) hierapolis assets added under the vendor + * [740c66a](../../commit/740c66a) - __(Muhammet DİLEK)__ [#16](../../issues/16) hierapolis assets added under the vendor * [a7f31ef](../../commit/a7f31ef) - __(Onur Ozgur OZKAN)__ [#13](../../issues/13) Set staging env - * [d24d060](../../commit/d24d060) - __(Muhammet DILEK)__ [#16](../../issues/16) bootstrap-sass gem updated for bootstrap 3 + * [d24d060](../../commit/d24d060) - __(Muhammet DİLEK)__ [#16](../../issues/16) bootstrap-sass gem updated for bootstrap 3 * [8183086](../../commit/8183086) - __(Onur Ozgur OZKAN)__ [#15](../../issues/15) Set racktime out * [2cac814](../../commit/2cac814) - __(Onur Ozgur OZKAN)__ [#12](../../issues/12) Set default timezone and i18n * [6538045](../../commit/6538045) - __(Onur Ozgur OZKAN)__ [#14](../../issues/14) Vulnerability Note VU[#380039](../../issues/380039) @@ -54,5 +56,5 @@ * [071d9d8](../../commit/071d9d8) - __(Onur Ozgur OZKAN)__ [#10](../../issues/10) Add .editorconfig file * [1a7c073](../../commit/1a7c073) - __(Onur Ozgur OZKAN)__ [#8](../../issues/8) Add VERSION.txt * [f404cc1](../../commit/f404cc1) - __(Onur Ozgur OZKAN)__ [#7](../../issues/7) Add CHANGELOG.md - * [1a31842](../../commit/1a31842) - __(Muhammet DILEK)__ [#5](../../issues/5) project created with cybele - * [20f347a](../../commit/20f347a) - __(Muhammet DILEK)__ Initial commit + * [1a31842](../../commit/1a31842) - __(Muhammet DİLEK)__ [#5](../../issues/5) project created with cybele + * [20f347a](../../commit/20f347a) - __(Muhammet DİLEK)__ Initial commit diff --git a/app/views/layouts/partials/_navbar.haml b/app/views/layouts/partials/_navbar.haml index 7ea6d18..dc1c598 100644 --- a/app/views/layouts/partials/_navbar.haml +++ b/app/views/layouts/partials/_navbar.haml @@ -1,4 +1,4 @@ -#navbar.navbar +#navbar.navbar.navbar-default %a.navbar-brand{:href => '#'} %i.icon-beer Hierapolis diff --git a/vendor/assets/javascripts/hierapolis.js.coffee b/vendor/assets/javascripts/hierapolis.js.coffee index dcf666d..30bae7c 100644 --- a/vendor/assets/javascripts/hierapolis.js.coffee +++ b/vendor/assets/javascripts/hierapolis.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()