diff --git a/css/bootstrap.css b/templates/flatly/css/bootstrap.css old mode 100755 new mode 100644 similarity index 99% rename from css/bootstrap.css rename to templates/flatly/css/bootstrap.css index 2534e713b..c3b4c5a43 --- a/css/bootstrap.css +++ b/templates/flatly/css/bootstrap.css @@ -7062,18 +7062,4 @@ a.list-group-item-danger.active:focus { } .popover { color: #2c3e50; -} - -/* additional */ -table.tablesorter tbody td.over { - background-color: #F5F5F5; -} -table.tablesorter tbody td.selected { - background-color: #ECECEC; -} -table.tablesorter thead tr th, table.tablesorter tfoot tr th { - padding: 8px; -} -#table_action_header { - height: 36px; } \ No newline at end of file diff --git a/templates/flatly/css/style.css b/templates/flatly/css/style.css new file mode 100644 index 000000000..9beb4cb8a --- /dev/null +++ b/templates/flatly/css/style.css @@ -0,0 +1,67 @@ +/* additional styles placed here */ + +body { + padding-top: 60px; +} +.navbar { + min-height: 40px; +} +.navbar-brand { + padding: 10px 15px; + height: 41px; +} +table.tablesorter { + border: 0; +} +table.tablesorter tbody td.over { + background-color: #F5F5F5; +} +table.tablesorter tbody td.selected { + background-color: #ECECEC; +} +table.tablesorter thead tr th, table.tablesorter tfoot tr th { + padding: 8px; +} +#table_action_header { + height: 35px; + background-color: transparent; + border: 0; +} +table.tablesorter thead tr th, table.tablesorter tfoot tr th { + background-color: #18BC9C; +} +#search_filter_section { + padding: 5px; + margin-bottom: 10px; +} +#titleTextImg { + background-color: transparent !important; +} +#table_action_header ul li span a { + background-color: rgba(0, 0, 0, 0); + border: 0; + color: #aaa; +} +#table_action_header ul li span a:hover { + color: #555; +} +#title, +#page_title { + font-size: 32px; + margin-top: 21px; + margin-bottom: 10.5px; + font-family: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-weight: 400; + line-height: 1.1; + color: inherit; +} +#new_button { + bottom: 5px; +} + +@media (min-width: 768px){ + .navbar-nav > li > a { + padding-top: 10px; + padding-bottom: 10px; + } +} \ No newline at end of file diff --git a/templates/flatly/partial/footer.php b/templates/flatly/partial/footer.php index 7f0f9922e..4ac111daa 100644 --- a/templates/flatly/partial/footer.php +++ b/templates/flatly/partial/footer.php @@ -2,11 +2,7 @@ \ No newline at end of file diff --git a/templates/flatly/partial/header.php b/templates/flatly/partial/header.php index 6f71090e5..7a4ed675b 100644 --- a/templates/flatly/partial/header.php +++ b/templates/flatly/partial/header.php @@ -6,7 +6,8 @@ <?php echo $this->config->item('company').' -- '.$this->lang->line('common_powered_by').' OS Point Of Sale' ?> - + + input->cookie('debug') == "true" || $this->input->get("debug") == "true") : ?> @@ -59,39 +60,32 @@ html { - -