From cd5f2eb748d080384a08e9c8b69f25ec7910a9a1 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 12 Oct 2017 15:42:06 +0630 Subject: [PATCH] remove _sidebar and add mm --- app/assets/stylesheets/application.scss | 7 + app/assets/stylesheets/sx-sidebar.css | 225 ----------------------- app/views/layouts/_left_sidebar.html.erb | 2 +- app/views/layouts/_sidebar.html.erb | 36 ---- app/views/layouts/application.html.erb | 3 +- config/locales/mm.yml | 2 +- 6 files changed, 10 insertions(+), 265 deletions(-) delete mode 100644 app/assets/stylesheets/sx-sidebar.css delete mode 100644 app/views/layouts/_sidebar.html.erb diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 771b1d48..89e75d3d 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -109,6 +109,13 @@ section.content { opacity: 1; } +.sidebar .menu .list .header { + background: #eee; + font-size: 12px; + font-weight: bold; + padding: 8px 16px; +} + /* End Reset Theme */ /* *************************************************** */ diff --git a/app/assets/stylesheets/sx-sidebar.css b/app/assets/stylesheets/sx-sidebar.css deleted file mode 100644 index 3f07bdad..00000000 --- a/app/assets/stylesheets/sx-sidebar.css +++ /dev/null @@ -1,225 +0,0 @@ -/*! - * Start Bootstrap - Simple Sidebar (http://startbootstrap.com/template-overviews/simple-sidebar) - * Copyright 2013-2017 Start Bootstrap - * Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-simple-sidebar/blob/master/LICENSE) - */ - -/**/ -#wrapper { - padding-left: 0; - -webkit-transition: all 0.5s ease; - -moz-transition: all 0.5s ease; - -o-transition: all 0.5s ease; - transition: all 0.5s ease; -} - -#wrapper.toggled { - padding-left: 210px; -} - -#sidebar-wrapper { - /* z-index: 1000;*/ - /*position: fixed;*/ - z-index: 1; - position: ; - left: 200px; - width: 0; - height: 100%; - margin-left: -224px; - margin-top:-20px; - overflow-x: ; - -webkit-transition: all 0.5s ease; - -moz-transition: all 0.5s ease; - -o-transition: all 0.5s ease; - transition: all 0.5s ease; -} - -#wrapper.toggled #sidebar-wrapper { - width: 216px; -} - -#page-content-wrapper { - width: 100%; - position: absolute; - padding-top: 20px; - -} - -#wrapper.toggled #page-content-wrapper { - position: absolute; - margin-right: -200px; - padding-top: 20px; -} - - -/* Sidebar Styles */ - -.sidebar-nav { - position: absolute; - background: #222d32; - top: 0; - width: 200px; - margin: 0; - padding: 0; - list-style: none; -} - -.sidebar-nav li { - text-indent: 20px; - line-height: 40px; -} -.sidebar-nav>li.header { - color: #4b646f; - background-color: #1a2226; - line-height: 35px !important; -} -.main-nav { - - /* background-color: #161926 !important;*/ -} -/*.main-nav a { - color: #fff !important; -} -*/ -.sidebar-nav li a { - display: block; - text-decoration: none; - color: #999999; -} - -.sidebar-nav li a:hover { - text-decoration: none; - color: #fff; - background: rgba(255, 255, 255, 0.2); -} - -.sidebar-nav li a:active, -.sidebar-nav li a:focus { - text-decoration: none; -} - -.sidebar-nav > .sidebar-brand { - height: 65px; - font-size: 18px; - line-height: 60px; -} - -.sidebar-nav > .sidebar-brand a { - color: #999999; -} - -.sidebar-nav > .sidebar-brand a:hover { - color: #fff; - background: none; -} - -@media(min-width:768px) { - #wrapper { - padding-left: 0; - } - #wrapper.toggled { - padding-left: 209px; - } - #sidebar-wrapper { - width: 0; - } - #wrapper.toggled #sidebar-wrapper { - width: 216px; - } - #page-content-wrapper { - padding-top: 20px; - position: relative; - } - #wrapper.toggled #page-content-wrapper { - position: relative; - margin-right: 0; - padding-top: 20px; - } -} -.accordion { - width: 200px; - list-style: none; - font-size: 14px; - color: #999999 ; - padding: 0px !important; - margin: 0px !important; -} - -.accordion .link { - cursor: pointer; - display: block; - /* padding: 15px 15px 15px 42px; - color: #4D4D4D;*/ - /* font-size: 14px; - font-weight: 700;*/ - /*border-bottom: 1px solid #CCC;*/ - position: relative; - -webkit-transition: all 0.4s ease; - -o-transition: all 0.4s ease; - transition: all 0.4s ease; -} - -/*.accordion li:last-child .link { border-bottom: 0; }*/ - -.accordion li i { - position: absolute; - top: 13px; - left: 12px; - font-size: 16px; - color: #999999; - -webkit-transition: all 0.4s ease; - -o-transition: all 0.4s ease; - transition: all 0.4s ease; -} - -.accordion li i.fa-chevron-down { - right: 12px; - left: auto; - font-size: 16px; -} -.accordion li .link:hover { - background: rgba(255, 255, 255, 0.2); - color: #FFF; -} -.accordion li.open .link { color: #fff; } - -.accordion li.open .link > .submenu { display: block;overflow: hidden;} - -.accordion li.open i { color: #fff; } - -.accordion li.open i.fa-chevron-down { - -webkit-transform: rotateX(180deg); - -ms-transform: rotateX(180deg); - -o-transform: rotateX(180deg); - transform: rotateX(180deg); -} - -.submenu { - display: none; - list-style: none; - margin-left: ; - background: #161926; - font-size: 14px; -} - -.submenu li { - margin-left: -38px; - } - -.submenu a { - display: block; - text-decoration: none; - color: #d9d9d9; - padding-left:20px; - -webkit-transition: all 0.25s ease; - -o-transition: all 0.25s ease; - transition: all 0.25s ease; -} - -.submenu a:hover { - background: #b63b4d; - color: #FFF; -} - - - diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb index aaa89fc9..bc891cd5 100644 --- a/app/views/layouts/_left_sidebar.html.erb +++ b/app/views/layouts/_left_sidebar.html.erb @@ -130,7 +130,7 @@
  • donut_large - <%= t :cashier + " " + t :terminal %> + <%= (t :cashier) + " " + (t :terminal) %>
  • diff --git a/app/views/layouts/_sidebar.html.erb b/app/views/layouts/_sidebar.html.erb deleted file mode 100644 index b74ec6ae..00000000 --- a/app/views/layouts/_sidebar.html.erb +++ /dev/null @@ -1,36 +0,0 @@ - diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 86070612..8fec7974 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -47,8 +47,7 @@ -
    -

    <%= t :welcome %>

    +
    <%= yield %>
    diff --git a/config/locales/mm.yml b/config/locales/mm.yml index c37d3927..a4c1c1bb 100644 --- a/config/locales/mm.yml +++ b/config/locales/mm.yml @@ -7,7 +7,7 @@ mm: crm: "စားသုံးသူကြီးကြပ်ရေး" inventory: "ကုန်လှောင်ရုံ" settings: "သတ်မှတ်ချက်များ" - transactions: "အလုပ်ဲပြီးမြောက်မှု့များ" + transactions: "အလုပ်ပြီးမြောက်မှု့များ" reports: "အစီရင်ခံစာ" zones: "Zones" dinings: "Dinings"