Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7795] trunk
|
From: <rc...@us...> - 2017-06-23 02:10:25
|
Revision: 7795
http://sourceforge.net/p/web-erp/reponame/7795
Author: rchacon
Date: 2017-06-23 02:10:22 +0000 (Fri, 23 Jun 2017)
Log Message:
-----------
Fix class for TransactionsDiv, InquiriesDiv and MaintenanceDiv. Fix bootstrap copy.
Modified Paths:
--------------
trunk/css/WEBootstrap/css/bootstrap.css
trunk/css/WEBootstrap/default.css
trunk/doc/Change.log
trunk/index.php
Modified: trunk/css/WEBootstrap/css/bootstrap.css
===================================================================
--- trunk/css/WEBootstrap/css/bootstrap.css 2017-06-22 02:52:29 UTC (rev 7794)
+++ trunk/css/WEBootstrap/css/bootstrap.css 2017-06-23 02:10:22 UTC (rev 7795)
@@ -1295,7 +1295,7 @@
font-weight: 300;
line-height: 1.4;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.lead {
font-size: 21px;
}
@@ -1451,7 +1451,7 @@
dd {
margin-left: 0;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.dl-horizontal dt {
float: left;
width: 160px;
@@ -1587,7 +1587,7 @@
margin-right: auto;
margin-left: auto;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.container {
width: 750px;
}
@@ -1774,7 +1774,7 @@
.col-xs-offset-0 {
margin-left: 0;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
float: left;
}
@@ -2912,7 +2912,7 @@
margin-bottom: 10px;
color: #737373;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.form-inline .form-group {
display: inline-block;
margin-bottom: 0;
@@ -2978,7 +2978,7 @@
margin-right: -15px;
margin-left: -15px;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.form-horizontal .control-label {
padding-top: 7px;
margin-bottom: 0;
@@ -2988,13 +2988,13 @@
.form-horizontal .has-feedback .form-control-feedback {
right: 15px;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.form-horizontal .form-group-lg .control-label {
padding-top: 11px;
font-size: 18px;
}
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.form-horizontal .form-group-sm .control-label {
padding-top: 6px;
font-size: 12px;
@@ -3632,7 +3632,7 @@
bottom: 100%;
margin-bottom: 2px;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.navbar-right .dropdown-menu {
right: 0;
left: auto;
@@ -4055,7 +4055,7 @@
top: auto;
left: auto;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.nav-tabs.nav-justified > li {
display: table-cell;
width: 1%;
@@ -4073,7 +4073,7 @@
.nav-tabs.nav-justified > .active > a:focus {
border: 1px solid #ddd;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.nav-tabs.nav-justified > li > a {
border-bottom: 1px solid #ddd;
border-radius: 4px 4px 0 0;
@@ -4120,7 +4120,7 @@
top: auto;
left: auto;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.nav-justified > li {
display: table-cell;
width: 1%;
@@ -4141,7 +4141,7 @@
.nav-tabs-justified > .active > a:focus {
border: 1px solid #ddd;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.nav-tabs-justified > li > a {
border-bottom: 1px solid #ddd;
border-radius: 4px 4px 0 0;
@@ -4169,12 +4169,12 @@
margin-bottom: 20px;
border: 1px solid transparent;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.navbar {
border-radius: 4px;
}
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.navbar-header {
float: left;
}
@@ -4191,7 +4191,7 @@
.navbar-collapse.in {
overflow-y: auto;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.navbar-collapse {
width: auto;
border-top: 0;
@@ -4231,7 +4231,7 @@
margin-right: -15px;
margin-left: -15px;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.container > .navbar-header,
.container-fluid > .navbar-header,
.container > .navbar-collapse,
@@ -4244,7 +4244,7 @@
z-index: 1000;
border-width: 0 0 1px;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.navbar-static-top {
border-radius: 0;
}
@@ -4256,7 +4256,7 @@
left: 0;
z-index: 1030;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.navbar-fixed-top,
.navbar-fixed-bottom {
border-radius: 0;
@@ -4285,7 +4285,7 @@
.navbar-brand > img {
display: block;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.navbar > .container .navbar-brand,
.navbar > .container-fluid .navbar-brand {
margin-left: -15px;
@@ -4315,7 +4315,7 @@
.navbar-toggle .icon-bar + .icon-bar {
margin-top: 4px;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.navbar-toggle {
display: none;
}
@@ -4351,7 +4351,7 @@
background-image: none;
}
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.navbar-nav {
float: left;
margin: 0;
@@ -4375,7 +4375,7 @@
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.navbar-form .form-group {
display: inline-block;
margin-bottom: 0;
@@ -4433,7 +4433,7 @@
margin-bottom: 0;
}
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.navbar-form {
width: auto;
padding-top: 0;
@@ -4473,7 +4473,7 @@
margin-top: 15px;
margin-bottom: 15px;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.navbar-text {
float: left;
margin-right: 15px;
@@ -4480,7 +4480,7 @@
margin-left: 15px;
}
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.navbar-left {
float: left !important;
}
@@ -4983,7 +4983,7 @@
.jumbotron .container {
max-width: 100%;
}
-@media screen and (min-width: 1068px) {
+@media screen and (min-width: 768px) {
.jumbotron {
padding-top: 48px;
padding-bottom: 48px;
@@ -5968,7 +5968,7 @@
height: 50px;
overflow: scroll;
}
-@media (min-width: 1068px) {
+@media (min-width: 768px) {
.modal-dialog {
width: 600px;
margin: 30px auto;
@@ -6431,7 +6431,7 @@
.carousel-caption .btn {
text-shadow: none;
}
-@media screen and (min-width: 1068px) {
+@media screen and (min-width: 768px) {
.carousel-control .glyphicon-chevron-left,
.carousel-control .glyphicon-chevron-right,
.carousel-control .icon-prev,
@@ -6597,7 +6597,7 @@
display: inline-block !important;
}
}
-@media (min-width: 1068px) and (max-width: 991px) {
+@media (min-width: 768px) and (max-width: 991px) {
.visible-sm {
display: block !important;
}
@@ -6612,17 +6612,17 @@
display: table-cell !important;
}
}
-@media (min-width: 1068px) and (max-width: 991px) {
+@media (min-width: 768px) and (max-width: 991px) {
.visible-sm-block {
display: block !important;
}
}
-@media (min-width: 1068px) and (max-width: 991px) {
+@media (min-width: 768px) and (max-width: 991px) {
.visible-sm-inline {
display: inline !important;
}
}
-@media (min-width: 1068px) and (max-width: 991px) {
+@media (min-width: 768px) and (max-width: 991px) {
.visible-sm-inline-block {
display: inline-block !important;
}
@@ -6692,7 +6692,7 @@
display: none !important;
}
}
-@media (min-width: 1068px) and (max-width: 991px) {
+@media (min-width: 768px) and (max-width: 991px) {
.hidden-sm {
display: none !important;
}
Modified: trunk/css/WEBootstrap/default.css
===================================================================
--- trunk/css/WEBootstrap/default.css 2017-06-22 02:52:29 UTC (rev 7794)
+++ trunk/css/WEBootstrap/default.css 2017-06-23 02:10:22 UTC (rev 7795)
@@ -547,22 +547,16 @@
border-bottom:thin solid #DADADA;
text-align:center;
color:#2C2C2C;
+}
+#TransactionsDiv,
+#InquiriesDiv,
+#MaintenanceDiv {
+ margin-left:-10px;
+ margin-top:5px;
}
-#TransactionsDiv{
- margin-left:-10px;
-}
-#InquiriesDiv{
- margin-left:-10px;
-}
#InquiriesDiv div{ /* default div, used for custom report header */
-
}
#InquiriesDiv body{
-
-}
-#MaintenanceDiv{
- margin-left:-10px;
-}
.menu_group_item p {
color:transparent; /* buttets color */
margin:4px 0 0 0;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-06-22 02:52:29 UTC (rev 7794)
+++ trunk/doc/Change.log 2017-06-23 02:10:22 UTC (rev 7795)
@@ -1,7 +1,8 @@
webERP Change Log
+23/06/22 RChacon: Fix class for TransactionsDiv, InquiriesDiv and MaintenanceDiv. Fix bootstrap copy.
22/06/22 Exson: Fixed the Over Receive Portion bug in WorkOrderReceive.php.
-21/06/17 RChacon: Add meta viewport for initial-scale=1 (for working css in small devices).
+21/06/17 RChacon: Add meta viewport for initial-scale=1 for working css in small devices.
2017-06-20 4.14 release
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2017-06-22 02:52:29 UTC (rev 7794)
+++ trunk/index.php 2017-06-23 02:10:22 UTC (rev 7795)
@@ -102,7 +102,7 @@
echo '<div id="SubMenuDiv">'; //===HJ===
-echo '<div id="TransactionsDiv" class="col-md-3"><ul class="list-group-item">'; //=== TransactionsDiv ===
+echo '<div id="TransactionsDiv" class="col-xs-12 col-sm-6 col-md-4 col-lg-3"><ul class="list-group-item">'; //=== TransactionsDiv ===
echo '<li class="menu_group_headers">'; //=== SubMenuHeader ===
if ($_SESSION['Module']=='system') {
@@ -129,7 +129,7 @@
echo '</ul></div>'; //=== TransactionsDiv ===
-echo '<div id="InquiriesDiv" class="col-md-3"><ul class="list-group-item">'; //=== InquiriesDiv ===
+echo '<div id="InquiriesDiv" class="col-xs-12 col-sm-6 col-md-4 col-lg-3"><ul class="list-group-item">'; //=== InquiriesDiv ===
echo '<li class="menu_group_headers">';
if ($_SESSION['Module']=='system') {
@@ -157,7 +157,7 @@
echo '</ul></div>'; //=== InquiriesDiv ===
-echo '<div id="MaintenanceDiv" class="col-md-3"><ul class="list-group-item">'; //=== MaintenanceDive ===
+echo '<div id="MaintenanceDiv" class="col-xs-12 col-sm-6 col-md-4 col-lg-3"><ul class="list-group-item">'; //=== MaintenanceDive ===
echo '<li class="menu_group_headers">';
if ($_SESSION['Module']=='system') {
|
