From: <rc...@us...> - 2017-06-26 04:53:35
|
Revision: 7799 http://sourceforge.net/p/web-erp/reponame/7799 Author: rchacon Date: 2017-06-26 04:53:33 +0000 (Mon, 26 Jun 2017) Log Message: ----------- Merge css/WEBootstrap/css/custom.css into css/WEBootstrap/default.css to preserve bootstrap as original. Modified Paths: -------------- trunk/css/WEBootstrap/default.css trunk/doc/Change.log Removed Paths: ------------- trunk/css/WEBootstrap/css/custom.css Deleted: trunk/css/WEBootstrap/css/custom.css =================================================================== --- trunk/css/WEBootstrap/css/custom.css 2017-06-25 14:20:04 UTC (rev 7798) +++ trunk/css/WEBootstrap/css/custom.css 2017-06-26 04:53:33 UTC (rev 7799) @@ -1,45 +0,0 @@ - - - -/*** HEADER - QUICK MENU ***/ - -#QuickMenuDiv{ - float:right; /* to the right side */ - z-index: 10; - margin-right: 1.05%; -} -#QuickMenuDiv ul{ - list-style:none; /* hide the bullets */ - margin:0; - padding:0; - - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - - -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; - filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3'); -} -#QuickMenuDiv li{ - display:inline-block; /* items are inline */ - height:38px; -} -/* make sidebar nav vertical */ -@media (min-width: 1098px) { - .sidebar-nav .navbar .navbar-collapse { - padding: 0; - max-height: none; - } - .sidebar-nav .navbar ul { - float: none; - display: block; - } - .sidebar-nav .navbar li { - float: none; - display: block; - } - .sidebar-nav .navbar li a { - padding-top: 12px; - padding-bottom: 12px; - } -} \ No newline at end of file Modified: trunk/css/WEBootstrap/default.css =================================================================== --- trunk/css/WEBootstrap/default.css 2017-06-25 14:20:04 UTC (rev 7798) +++ trunk/css/WEBootstrap/default.css 2017-06-26 04:53:33 UTC (rev 7799) @@ -1,4 +1,4 @@ -/* $Id: default.css 7166 2016-09-07 21:18:59Z giankocr $*/ +/* $Id:default.css 7166 2016-09-07 21:18:59Z giankocr $*/ /* WEBootstrap theme by giankocr. */ /* WEBootstrap is a bootstrap theme design for WebERP. */ /* Design guidelines: @@ -15,36 +15,34 @@ /*** Default Styles ***/ @import url(http://fonts.googleapis.com/css?family=Raleway); -@import url('css/custom.css'); @import url('css/bootstrap.css'); @import url('css/bootstrap-theme.css'); p.good { - font-weight:bold; - color:#28b095; + font-weight:bold; + color:#28b095; } p.bad { - font-weight:bold; - color:rgb(203, 90, 174); + font-weight:bold; + color:rgb(203, 90, 174); } table { - background-color:white; - margin:0 auto; - width:100%; - /*border-collapse: collapse;*/ - border:thin outset #B3B3B3; + background-color:white; + margin:0 auto; + width:100%; + /*border-collapse:collapse;*/ + border:thin outset #B3B3B3; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -moz-box-shadow: 1px 1px 2px #C3C3C3; - -webkit-box-shadow: 1px 1px 2px #C3C3C3; - box-shadow: 1px 1px 2px #C3C3C3; - -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; - filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3') + -webkit-border-radius:4px; + -moz-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: 1px 1px 2px #C3C3C3; + -webkit-box-shadow:1px 1px 2px #C3C3C3; + box-shadow: 1px 1px 2px #C3C3C3; + -ms-filter:"progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; + filter:progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3') } table.selection { - } th { border-bottom:thin solid #B3B3B3; @@ -53,10 +51,10 @@ text-align:center; } th.ascending { - cursor:s-resize; + cursor:s-resize; } th.descending { - cursor:n-resize; + cursor:n-resize; } th:after { content:""; @@ -78,41 +76,41 @@ visibility:visible; } td { - padding:2px 4px; + color:#575757; + padding:2px 4px; text-align:left; - color:#575757; } td.select { background-color:#eee; } td table { - background: #eee; + background:#eee; } /* table tr:first-child th:first-child, table tr:first-child td:first-child { - -moz-border-radius-topleft: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + -webkit-border-top-left-radius:4px; + border-top-left-radius: 4px; } table tr:first-child th:last-child, table tr:first-child td:last-child { - -moz-border-radius-topright: 4px; - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + -webkit-border-top-right-radius:4px; + border-top-right-radius: 4px; } table tr:last-child td:first-child { - -moz-border-radius-bottomleft: 4px; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + -webkit-border-bottom-left-radius:4px; + border-bottom-left-radius: 4px; } table tr:last-child td:last-child { - -moz-border-radius-bottomright: 4px; - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + -webkit-border-bottom-right-radius:4px; + border-bottom-right-radius: 4px; } */ div.centre { - margin:0 auto; - text-align:center; + margin:0 auto; + text-align:center; } input { } @@ -120,17 +118,17 @@ border-width:0px; background-color:transparent; } -input:hover{ +input:hover { } select { font-family:Arial, Verdana, Helvetica, sans-serif; font-size:12px; border:thin solid #C3C3C3; - -webkit-border-radius:4px; - -moz-border-radius:4px; - border-radius:4px; - padding:4px 8px; - cursor: pointer; + -webkit-border-radius:4px; + -moz-border-radius:4px; + border-radius:4px; + padding:4px 8px; + cursor:pointer; } input.inputerror, input.error, select.error, select.selecterror, label.error { color:red; @@ -137,48 +135,48 @@ border:2px solid red; } input[type='text'], input[type='tel'], input[type='password'], input[type='email'] { - border:thin solid #C3C3C3; - padding:4px 8px; + border:thin solid #C3C3C3; + padding:4px 8px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius:4px; + -moz-border-radius: 4px; + border-radius: 4px; } input:required, select:required, textarea:required { background-color:#e2f5ff; } input[type='text']:focus, input[type='tel']:focus, input[type='password']:focus, input[type='email']:focus, input[type='submit'], textarea:focus, select:focus, button:focus { - outline:none; - border-color:#2380CD; + outline:none; + border-color:#2380CD; - -moz-box-shadow: 0px 0px 5px #55B1EA; - -webkit-box-shadow: 0px 0px 5px #55B1EA; - box-shadow: 0px 0px 5px #55B1EA; + -moz-box-shadow: 0px 0px 5px #55B1EA; + -webkit-box-shadow:0px 0px 5px #55B1EA; + box-shadow: 0px 0px 5px #55B1EA; } input[type='submit'], button { - background-color:#34a7e8; - border:thin outset #1992DA; - padding:6px 24px; - vertical-align:middle; - font-weight:bold; - color:#FFFFFF; - cursor: pointer; + background-color:#34a7e8; + border:thin outset #1992DA; + color:#FFFFFF; + cursor:pointer; + font-weight:bold; + padding:6px 24px; + vertical-align:middle; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -moz-box-shadow: 1px 1px 1px #64BEF1 inset; - -webkit-box-shadow: 1px 1px 1px #64BEF1 inset; - box-shadow: 1px 1px 1px #64BEF1 inset; + -webkit-border-radius:4px; + -moz-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: 1px 1px 1px #64BEF1 inset; + -webkit-box-shadow:1px 1px 1px #64BEF1 inset; + box-shadow: 1px 1px 1px #64BEF1 inset; } -textarea{ - border:thin solid #C3C3C3; - padding:4px 8px; +textarea { + border:thin solid #C3C3C3; + padding:4px 8px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + -webkit-border-radius:4px; + -moz-border-radius: 4px; + border-radius: 4px; } .EvenTableRows { background-color:white; @@ -215,37 +213,36 @@ } /*** Calendar picker ***/ -#calendar{ - +#calendar { } .dpTbl { border:1px solid #C3C3C3; - -moz-box-shadow: 0px 0px 8px #999999; - -webkit-box-shadow: 0px 0px 8px #999999; - box-shadow: 0px 0px 8px #999999; - -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=0, Color='#64BEF1')"; - filter: progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=0, Color='#64BEF1'); + -moz-box-shadow: 0px 0px 8px #999999; + -webkit-box-shadow:0px 0px 8px #999999; + box-shadow: 0px 0px 8px #999999; + -ms-filter:"progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=0, Color='#64BEF1')"; + filter:progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=0, Color='#64BEF1'); } .dpTD { - border: 0; + border:0; width:25px; text-align:right; cursor:pointer; } .dpTbl button { - padding: 4px 12px; + padding:4px 12px; } .dpDayHighlight { - border: 0; + border:0; width:20px; - background-color: yellow; + background-color:yellow; text-align:right; cursor:pointer; } .dpTDHover { - border: 0; + border:0; width:20px; - background-color: #E1E1E1; + background-color:#E1E1E1; text-align:right; cursor:pointer; } @@ -252,64 +249,64 @@ /* Table type is used for UI tables type 1 */ .table1 { - width:90%; - background: #eee; - border: 0px 0px 2px 2px #222 solid; - margin: 0 auto; + background:#eee; + border:0px 0px 2px 2px #222 solid; + margin:0 auto; + width:90%; } /* Table type is used for UI tables type 2 */ .table2 { - width:90%; - background: #eee; - border: 0px 0px 2px 2px #222 solid; - margin: 0 auto; + background:#eee; + border:0px 0px 2px 2px #222 solid; + margin:0 auto; + width:90%; } .tableheader { - font-weight: normal; - background-color: #777C59; + background-color:#777C59; + font-weight:normal; } .notavailable { + color:#555555; + font-style:italic; font-weight:lighter; - font-style:italic; - color:#555555; } .label { + color:#575757; + font-size:120%; + font-style:normal; font-weight:bold; - font-style:normal; - font-size:120%; - color: #575757; } .table_index { - background-color: #F1FFDD; + background-color:#F1FFDD; } .header { - background-image: url(""); - background-repeat: no-repeat; - background-attachment: fixed; - border: none; - margin: 0px; - padding: 0px; - background-color: #fddbdb; + background-attachment:fixed; + background-color:#fddbdb; + background-image:url(""); + background-repeat:no-repeat; + border:none; + margin:0px; + padding:0px; } input.inputerror { - background-color: #fddbdb; + background-color:#fddbdb; } textarea.texterror { - background-color: #fddbdb; + background-color:#fddbdb; } select.selecterror { - background-color: #fddbdb; + background-color:#fddbdb; } .OsRow { - background-color: #234567; + background-color:#234567; color:white; } /*** CANVAS ***/ -#CanvasDiv{ +#CanvasDiv { background:#F1F1F1; margin:0; } @@ -318,78 +315,91 @@ #HeaderDiv { /* - overflow:hidden; REQUIRED: height according to items contained */ + overflow:hidden; REQUIRED:height according to items contained */ color:#333333; font-weight:bold; padding-left:3px; - height: 44px; + height:44px; } -#HeaderWrapDiv{ +#HeaderWrapDiv { } /*** HEADER - APP INFO ***/ -#AppInfoDiv{ - font-family: Raleway, sans-serif; - float:left; /* REQUIRED: to the left */ - +#AppInfoDiv { + float:left; /* REQUIRED:to the left */ + font-family:Raleway, sans-serif; } -#AppInfoDiv img{ - +#AppInfoDiv img { vertical-align:middle; /* center image and text vertically */ } -#AppInfoCompanyDiv{ - display:table-cell; /* REQUIRED: as a cell */ +#AppInfoCompanyDiv { + display:table-cell; /* REQUIRED:as a cell */ } -#AppInfoUserDiv{ - display:table-cell; /* REQUIRED: as a cell */ +#AppInfoUserDiv { + display:table-cell; /* REQUIRED:as a cell */ } -#AppInfoUserDiv a{ - text-decoration:none; +#AppInfoUserDiv a { color:#333333; font-weight:bold; + text-decoration:none; } -#AppInfoUserDiv a:hover{ +#AppInfoUserDiv a:hover { text-decoration:none; } -#AppInfoModuleDiv{ +#AppInfoModuleDiv { } /*** HEADER - QUICK MENU ***/ #QuickMenuDiv { - border-bottom: 3px solid #47c9af; - font-family: Raleway, sans-serif; - line-height: 1; - width: auto; + border-bottom:3px solid #47c9af; + float:right; /* to the right side */ + font-family:Raleway, sans-serif; + line-height:1; + margin-right:1.05%; + width:auto; + z-index: 10; } #QuickMenuDiv ul { + list-style:none; /* hide the bullets */ + margin:0; + padding:0; + + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; + + -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; + filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3'); } #QuickMenuDiv li { + display:inline-block; /* items are inline */ + height:38px; } /*** links as buttons!!! clicking anywhere in the button will activate - the link!!! ***HJ***/ + the link!!! ***HJ***/ #QuickMenuDiv li a { - border: 0; - color: #444444; - display: block; - font-size: 25px; - font-weight: 400; - line-height: 1; - list-style: none; - margin: 0; - margin-right: -4px; - padding: 0; - padding: 10px; - position: relative; - text-decoration: none; - z-index: 2; - -webkit-transition: all .2s ease; - -moz-transition: all .2s ease; - -o-transition: all .2s ease; - transition: all .2s ease; + border:0; + color:#444444; + display:block; + font-size:25px; + font-weight:400; + line-height:1; + list-style:none; + margin:0; + margin-right:-4px; + padding:0; + padding:10px; + position:relative; + text-decoration:none; + z-index:2; + -webkit-transition:all .2s ease; + -moz-transition:all .2s ease; + -o-transition:all .2s ease; + transition:all .2s ease; } #QuickMenuDiv li:first-child a { } @@ -405,7 +415,7 @@ } /*** BODY ***/ -#BodyWrapDiv{ +#BodyWrapDiv { margin-left:-20px; } #BodyDiv { @@ -412,8 +422,8 @@ background:#F1F1F1; clear:right; /* REQUIRED */ color:black; - font-family: Raleway, sans-serif; - min-height: 440px; + font-family:Raleway, sans-serif; + min-height:440px; overflow:hidden; /* REQUIRED */ padding:5px; text-align:center; @@ -423,95 +433,98 @@ margin-bottom:10px; width:auto; /* automatic width */ - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -moz-box-shadow: 1px 1px 2px #C3C3C3; - -webkit-box-shadow: 1px 1px 2px #C3C3C3; - box-shadow: 1px 1px 2px #C3C3C3; - -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; - filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3') + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: 1px 1px 2px #C3C3C3; + -webkit-box-shadow: 1px 1px 2px #C3C3C3; + box-shadow: 1px 1px 2px #C3C3C3; + -ms-filter:"progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; + filter:progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3') } #BodyDiv table.selection { - background-color:white; - border:thin outset #D2D2D2; - padding:5px 0 0 10px; - position: center fixed; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -moz-box-shadow: 1px 1px 2px #C3C3C3; - -webkit-box-shadow: 1px 1px 2px #C3C3C3; - box-shadow: 1px 1px 2px #C3C3C3; - -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; - filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3') + background-color:white; + border:thin outset #D2D2D2; + padding:5px 0 0 10px; + position:center fixed; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: 1px 1px 2px #C3C3C3; + -webkit-box-shadow: 1px 1px 2px #C3C3C3; + box-shadow: 1px 1px 2px #C3C3C3; + -ms-filter:"progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')"; + filter:progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3') } /*** BODY - MAIN MENU ***/ -@media (min-width: 998px) { - .navbar-collapse.collapse { - display: block !important; - height: auto !important; - padding-bottom: 0; - overflow: visible !important; - } +@media (min-width:998px) { + .navbar-collapse.collapse { + display:block !important; + height:auto !important; + padding-bottom:0; + overflow:visible !important; + } } #MainMenuDiv { - font-family:Raleway, sans-serif; - margin-top:5px; + font-family:Raleway, sans-serif; + margin-top:5px; } #MainMenuDiv ul { - list-style:none; /* REQUIRED: hide bullets */ - padding:0; /* REQUIRED: remove extra gaps (ex-bullets) */ + list-style:none; /* REQUIRED:hide bullets */ + padding:0; /* REQUIRED:remove extra gaps (ex-bullets) */ margin:0; } -#MainMenuDiv li{ +#MainMenuDiv li { list-style:none; /* REQUIRED */ padding:0; /* REQUIRED */ } -#MainMenuDiv li a { /* link as button!!! not-pressed state */ - background-color: #47c9af; - background-image: -webkit-linear-gradient(135deg, #28b095, #47c9af); - background-image: -moz-linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); - background-image: -o-linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); - background-image: linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); - border-bottom: 1px solid rgba(255,255,255,.1); - box-shadow: inset 0 1px 1px rgba(0,0,0,.1), 0 1px 1px rgba(0,0,0,.1); - color: rgb(255,255,255); - display:block; - font-size:1.5rem; - font-weight:500; - height:50px; - letter-spacing: .2rem; - line-height:50px; - text-decoration:none; - /*text-shadow: 0 1px 1px rgba(0,0,0,.1);*/ - text-transform: uppercase; - transition: all .1s ease; +#MainMenuDiv li a { + /* link as button!!! not-pressed state */ + background-color:#47c9af; + background-image:-webkit-linear-gradient(135deg, #28b095, #47c9af); + background-image:-moz-linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); + background-image:-o-linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); + background-image:linear-gradient(135deg, #47c9af, rgba(66, 204, 170, 0.94)); + border-bottom:1px solid rgba(255,255,255,.1); + box-shadow:inset 0 1px 1px rgba(0,0,0,.1), 0 1px 1px rgba(0,0,0,.1); + color:rgb(255,255,255); + display:block; + font-size:1.5rem; + font-weight:500; + height:50px; + letter-spacing:.2rem; + line-height:50px; + text-decoration:none; + /*text-shadow:0 1px 1px rgba(0,0,0,.1);*/ + text-transform:uppercase; + transition:all .1s ease; } #MainMenuDiv li:first-child a { - border-top: none; + border-top:none; } -#MainMenuDiv li a:hover{ /* link as button!!! pressed state */ - background-color: rgb(114, 51, 98); - background-image: -webkit-linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); - background-image: -moz-linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); - background-image: -o-linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); - background-image: linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); - cursor: pointer; +#MainMenuDiv li a:hover { + /* link as button!!! pressed state */ + background-color:rgb(114, 51, 98); + background-image:-webkit-linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); + background-image:-moz-linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); + background-image:-o-linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); + background-image:linear-gradient(150deg, rgb(114, 51, 98), rgb(114, 51, 98)); + cursor:pointer; } -#MainMenuDiv .main_menu_selected a{ /* the selected button */ +#MainMenuDiv .main_menu_selected a { + /* the selected button */ /*border:thin inset #191919;*/ background:#2A2A2A; border-bottom:thin solid #191919; } -#MainMenuDiv .main_menu_selected a:hover{ +#MainMenuDiv .main_menu_selected a:hover { background:#2A2A2A; } /*** BODY - SUB MENU ***/ -#SubMenuDiv{ +#SubMenuDiv { } #SubMenuDiv a:link, a:visited { color:#0088CD; @@ -530,7 +543,7 @@ padding:2px; color:#333333; } -#SubMenuDiv li img{ +#SubMenuDiv li img { vertical-align:middle; /* verticall align icon with the text */ } #SubMenuDiv .menu_group_headers { @@ -542,11 +555,12 @@ #InquiriesDiv, #MaintenanceDiv { margin-left:-10px; - margin-top:5px; + margin-top:5px; } -#InquiriesDiv div{ /* default div, used for custom report header */ +#InquiriesDiv div { + /* default div, used for custom report header */ } -#InquiriesDiv body{ +#InquiriesDiv body { .menu_group_item p { color:transparent; /* buttets color */ margin:4px 0 0 0; @@ -570,18 +584,18 @@ overflow:hidden; padding:3px; } -#FooterLogoDiv{ +#FooterLogoDiv { float:right; /* right side */ - padding:2px; + padding:2px; } #FooterLogoDiv img { - vertical-align:middle; + vertical-align:middle; } -#FooterVersionDiv{ +#FooterVersionDiv { float:left; /* left side */ margin-top:3px; } -#FooterTimeDiv{ +#FooterTimeDiv { clear:left; /* below */ } #Report { @@ -613,9 +627,9 @@ } @media (min-width:1098px) { - .navbar-toggle { - background-color: #47c9af; - border: 3px solid rgba(114, 51, 98, 1.00); + .navbar-toggle { + background-color:#47c9af; + border:3px solid rgba(114, 51, 98, 1.00); border-radius:70px; display:none;/* ? */ float:right; @@ -624,16 +638,33 @@ position:relative; } .navbar-collapse.collapse { - display: block !important; - height: auto !important; - padding-bottom: 0; - overflow: visible !important; - } + display:block !important; + height:auto !important; + padding-bottom:0; + overflow:visible !important; + } + /* make sidebar nav vertical */ + .sidebar-nav .navbar .navbar-collapse { + max-height:none; + padding:0; + } + .sidebar-nav .navbar ul { + display:block; + float:none; + } + .sidebar-nav .navbar li { + display:block; + float:none; + } + .sidebar-nav .navbar li a { + padding-top:12px; + padding-bottom:12px; + } } .navbar-toggle { - background-color: #47c9af; - border: 3px solid rgba(114, 51, 98, 1.00); + background-color:#47c9af; + border:3px solid rgba(114, 51, 98, 1.00); border-radius:70px; float:right; margin:0; @@ -641,7 +672,7 @@ position:relative; } .glyphicon.glyphicon-th { - font-size:30px; + font-size:30px; } Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2017-06-25 14:20:04 UTC (rev 7798) +++ trunk/doc/Change.log 2017-06-26 04:53:33 UTC (rev 7799) @@ -1,5 +1,6 @@ webERP Change Log +25/06/22 RChacon: Merge css/WEBootstrap/css/custom.css into css/WEBootstrap/default.css to preserve bootstrap as original. 24/06/22 RChacon: Add style sections for device rendering width ranges for no responsive themes. 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. |