diff --git a/README.md b/README.md index 9b67b65f..081ba3ac 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ ruby 2.4.1p111 > BUTTON - 1. Submit/Add/Edit/Confirm buttons => btn-primary + 1. Submit/Add/Edit/Confirm buttons => btn-primary (theme color) 2. Show/Detail Buttons => btn-info 3. Delete => btn-delete 4. Cancel/Back => btn-default diff --git a/app/assets/javascripts/BSBMaterial/demo.js b/app/assets/javascripts/BSBMaterial/demo.js index 0d251792..87f67674 100644 --- a/app/assets/javascripts/BSBMaterial/demo.js +++ b/app/assets/javascripts/BSBMaterial/demo.js @@ -78,7 +78,7 @@ function activateNotificationAndTasksScroll() { } //Google Analiytics ====================================================================================== -addLoadEvent(loadTracking); +// addLoadEvent(loadTracking); var trackingId = 'UA-30038099-6'; function addLoadEvent(func) { diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 6cbe41b0..e355c13c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -62,6 +62,7 @@ $(document).on('turbolinks:load', function() { $(function(){ + $('body').bootstrapMaterialDesign(); var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight())); $('#custom-slimscroll').slimScroll({ diff --git a/app/assets/stylesheets/BSBMaterial/style.css b/app/assets/stylesheets/BSBMaterial/style.css index 8b5b3ffe..016707ab 100644 --- a/app/assets/stylesheets/BSBMaterial/style.css +++ b/app/assets/stylesheets/BSBMaterial/style.css @@ -7445,6 +7445,22 @@ fieldset[disabled] .form-control { margin-right: 7px; margin-top: 2px; font-size: 20px; } + .dropdown-menu > li > span > div.switch { + padding: 7px 18px; + color: #666; + -moz-transition: all 0.5s; + -o-transition: all 0.5s; + -webkit-transition: all 0.5s; + transition: all 0.5s; + font-size: 14px; + line-height: 25px; } + .dropdown-menu > li > span > div.switch:hover { + background-color: rgba(0, 0, 0, 0.075); } + .dropdown-menu > li > span > div.switch i.material-icons { + float: left; + margin-right: 7px; + margin-top: 2px; + font-size: 20px; } .dropdown-animated { -webkit-animation-duration: .3s !important; diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 551199f4..eae016f8 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -51,6 +51,10 @@ margin-top: 0px !important; } +.switch label { + color: #070707 !important; +} + .ls-closed .bars:after, .ls-closed .bars:before { position: absolute; top: 8px; @@ -135,6 +139,12 @@ section.content { font-size:0.87rem; } +.btn:not(.btn-link):not(.btn-circle) span { + position: relative; + top: 0px; + margin-left: 0px; +} + /* End Reset Theme */ /* *************************************************** */ diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 8d86f8d5..6bb0adb9 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -26,6 +26,15 @@