From 1a4ca5238fd96498d856a5c02ae1cc8859cdf63c Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 21 Sep 2017 13:50:14 +0630 Subject: [PATCH] update dashboard layout --- app/assets/stylesheets/application.scss | 111 ++++---- app/views/layouts/_header.html.erb | 190 +++++++------- app/views/layouts/_left_sidebar.html.erb | 320 +++-------------------- 3 files changed, 198 insertions(+), 423 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 8e6e0e40..fde428bd 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -7,75 +7,70 @@ @import "BSBMaterial/style"; @import "BSBMaterial/themes/all-themes"; -/* Show it is fixed to the top */ -// body { -// min-height: 75rem; -// padding-top: 4.5rem; -// } - - - -.setting_nav{ - background-color: #2f5663; +@media (min-width: 768px) { + .navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand { + margin-left: 0px; + } } -ul.navbar-nav li a{ - text-decoration :none; - color :#e6e6e6; +@media (max-width: 1169px) and (min-width: 992px) { + .navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand { + margin-left: 20px; + } } -ul.dropdown-menu li a{ - text-decoration :none; - color :#525252; +.navbar-brand { + height: 40px; + padding: 5px 0px; } -.setting_breadcrumb{ - background-color: transparent !important; - margin-bottom: 0px !important; -} -.page-header{ - border-bottom :0px solid #000 !important; - margin :0px !important; +.ls-closed .bars:after, .ls-closed .bars:before { + position: absolute; + top: 13px; + left: 13px; } -/*----- Order Processing Items -----*/ -.opi_ul { - display:block; - padding-left:0px; -} -.opi_ul li { - display:list-item; - list-style: none; - margin-top:2px; +.navbar-brand > img { + display: inline; } -.opi_selected { - background-color:#BEA2C2 !important; -} -.opi_default { - cursor: pointer; - background-color: #E8ECF9; - line-height: inherit; - padding:5px; -} -/*----- Order Processing Items -----*/ - -/*----- Header Bar -----*/ - -/*----- Header Bar -----*/ - -/*----- Layout ------ */ - -.margin-top-20 { - margin: 20px 0 0 0; +.navbar-nav > li > a { + margin-top: 12px; } -/*----- Layout ------ */ - -/*--- Reset --- */ - -select.form-control { - height: inherit !important; +.navbar-nav .dropdown-menu { + margin-top: 0px !important; } -/*--- Reset --- */ +.navbar-nav .dropdown a > i.material-icons { + margin-top: 0px; +} + +.navbar-nav > li > a { + display: inline-flex; +} + +.dropdown-menu { + margin-top: 0px !important; +} + +.sidebar { + top: 60px; + height: calc(100vh - 60px); +} + +.right-sidebar { + top: 60px; + height: calc(100vh - 60px); +} + +section.content { + margin: 60px 15px 0 315px; +} + +.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { + position: relative; + min-height: 1px; + padding-right: 10px; + padding-left: 10px; +} \ No newline at end of file diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index e52ecdc2..5ca00368 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,91 +1,105 @@ - -
-
- search +Search Bar --> + + + + +
-->
@@ -37,311 +37,77 @@
  • - text_fields - Typography + room_service + Order Queue Station
  • - layers - Helper Classes + monetization_on + Cashier + +
    • +
  • + + group + CRM + +
    • +
  • + + store + Inventory
  • widgets - Widgets + Transaction
  • - swap_calls - User Interface (UI) + assessment + Report -
    • -
  • - - assignment - Forms - - -
    • -
  • - - view_list - Tables - - -
    • -
  • - - perm_media - Medias - - -
    • -
  • - - pie_chart - Charts - - -
    • -
  • - - content_copy - Example Pages - - -
    • -
  • - - map - Maps - - -
    • -
  • - - trending_down - Multi Level Menu - - -
    • -
  • - - update - Changelogs - -
    • +
  • LABELS
  • @@ -367,12 +133,12 @@
    - © 2016 - 2017 AdminBSB - Material Design. + © <%= Time.now.strftime("%Y") %> Code2Lab - SX Restaurant.
    - Version: 1.0.5 + Version: 1.0.1
    -