[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17500] updating layout for application in backend
From: |
roger . kolseth |
Subject: |
[Fmsystem-commits] [17500] updating layout for application in backend |
Date: |
Thu, 4 Jan 2018 14:04:54 -0500 (EST) |
Revision: 17500
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17500
Author: rogkol
Date: 2018-01-04 14:04:54 -0500 (Thu, 04 Jan 2018)
Log Message:
-----------
updating layout for application in backend
Modified Paths:
--------------
trunk/phpgwapi/templates/bookingfrontend/themes/alesund_kommune.css
trunk/phpgwapi/templates/portico/css/base.css
trunk/phpgwapi/templates/portico/head.inc.php
Modified: trunk/phpgwapi/templates/bookingfrontend/themes/alesund_kommune.css
===================================================================
--- trunk/phpgwapi/templates/bookingfrontend/themes/alesund_kommune.css
2018-01-04 19:01:00 UTC (rev 17499)
+++ trunk/phpgwapi/templates/bookingfrontend/themes/alesund_kommune.css
2018-01-04 19:04:54 UTC (rev 17500)
@@ -10,28 +10,43 @@
*/
body {
- font-family: Calibri,Candara,Segoe,Segoe UI,Optima,Arial,sans-serif;
+ font-family: Raleway,Calibri,Candara,Segoe,Segoe
UI,Optima,Arial,sans-serif !important;
+ font-size: 16px;
}
address@hidden (min-width: 62em) {
+ .main-wrapper{
+ margin-left: auto;
+ margin-right: auto;
+ width: 1200px;
+ }
+
+ .footer-wrapper{
+ margin-left: auto;
+ margin-right: auto;
+ width: 1200px;
+ }
+
+ .custom-menu-screen{
+ display: none;
+ }
+}
.home-menu {
- background: rgb(231, 239,241);
+ background: white;
+ box-shadow: none;
}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6
-{
+h1,h2,h3,h4,h5,h6{
color: #2d6d8f;
- letter-spacing: 0.1em;
font-weight: normal;
- /* text-transform: uppercase;*/
+ font-style: normal;
+ /* text-transform: uppercase;*/
}
+
+
.pure-g [class*="pure-u"] {
- font-family: Calibri,Candara,Segoe,Segoe UI,Optima,Arial,sans-serif;
+ font-family: Raleway,Calibri,Candara,Segoe,Segoe
UI,Optima,Arial,sans-serif;
}
.l-box-lrg {
@@ -43,10 +58,8 @@
text-align: center;
}
-.footer {
- background: #383838;
-}
+
.home-menu .pure-menu-heading {
color: #2d6d8f;
font-weight: 400;
@@ -63,7 +76,7 @@
.home-menu li a:hover,
.home-menu li a:focus {
background: none;
- /* border: none;*/
+ /* border: none;*/
color: #00acb8;
}
@@ -148,14 +161,14 @@
}
.custom-menu-screen {
- /* background-color: rgba(0, 0, 0, 0.5);*/
- background-color: rgb(231, 239,241);
+ /* background-color: rgba(0, 0, 0, 0.5);*/
+ background-color: white;
-webkit-transition: all 0.5s;
-moz-transition: all 0.5s;
-ms-transition: all 0.5s;
transition: all 0.5s;
height: 3em;
- width: 70em;
+ width: 100%;
position: absolute;
top: 0;
z-index: -1;
@@ -168,8 +181,75 @@
transform: translateY(-44px);
}
address@hidden (max-width: 62em) {
+.float-right-top-menu {
+ float: right;
+ margin-top: 0px;
+ position: absolute;
+}
+.header-line {
+ background: #DFF8F5;
+ overflow: hidden;
+}
+
+.header-line .img-content {
+ float: right;
+ margin-right: 1em;
+ padding-right: 1em;
+ width: 45%;
+ min-width: 300px;
+}
+
+.header-line .text-content {
+ margin-left: 1em;
+ padding: 1em;
+ float: left;
+ width: 45%;
+}
+
+
+
address@hidden (max-width: 650px){
+ .header-line .img-content {
+ width: 100%;
+ margin: 0px;
+ padding: 0px;
+ }
+
+
+ .img-content img{
+ width: 100%;
+ }
+
+ .header-line .text-content {
+ width: 100%;
+ margin: 0px;
+ padding: 1em;
+ }
+
+ .footer-center{
+ width: 100%;
+ }
+
+
+ .footer-left{
+ width: 100%;
+ text-align: left;
+ padding-left: 2em;
+ }
+}
+
+
address@hidden (min-width: 650px){
+ .footer-left {
+ float: left;
+ width: 25%;
+ text-align: left;
+ padding-left: 2em;
+ }
+}
+
address@hidden (max-width: 62em) {
.custom-menu {
display: block;
}
@@ -182,7 +262,7 @@
.custom-menu-bottom {
position: absolute;
width: 100%;
- border-top: 1px solid #eee;
+ /* border-top: 1px solid #eee; */
background-color: #2d3e50\9;
z-index: 100;
}
@@ -215,4 +295,220 @@
overflow: hidden;
}
-}
\ No newline at end of file
+
+ .footer-right{
+ display: none;
+ }
+
+}
+
+.footer{
+ background: #E7EFF1;
+ white-space: nowrap;
+ position: absolute;
+ color: black;
+
+ width: 100%;
+}
+
+.footer a{
+ color: #2D6D8F;
+}
+
+.footer a:hover{
+ color: #00acb8;
+}
+
+
address@hidden (min-width: 62em) {
+ .img-logo img {
+ max-width: 75%;
+ height: auto;
+ padding-left: 0.8em;
+ }
+
+ .custom-menu{
+ width: 50%;
+ }
+
+ .costum-menu-right{
+ margin-bottom: 110px;
+ position: relative;
+ }
+
+
+ .pure-menu-list{
+ margin-right: 2em;
+ }
+
+ .costum-menu-border{
+ border-left: solid #2D6D8F 0.15em;
+ }
+
+ .pure-menu-nav a{
+ padding-right: 0.4em !important;
+ padding-left: 0.2em !important;
+ }
+ .pure-u-lg-1-2 {
+ width: 49%
+ }
+
+ .search-left-field{
+ margin-right: 1%;
+ }
+
+ .search-right-field{
+ margin-left: 1%;
+ }
+}
+
+.footer-center {
+ float: left;
+ width: 42%;
+ text-align: left;
+ padding-left: 2em;
+}
+
+.footer-right {
+ float: right;
+ width: 33%;
+ text-align: left;
+ padding-left: 2em;
+}
+
+.footer-left img{
+ width: 80%;
+ height: auto;
+}
+
+.select-box ul {
+ list-style-type: none;
+ padding: 0px;
+}
+
+.img-desc img{
+ height: 336px;
+ width: 560px;
+ padding-top: 5px;
+}
+
+.images dt{
+ margin: 0px 0px 20px 0px !important;
+ font-style: normal !important;
+
+}
+
+
+
+
+.search-searchterm, .search-building input{
+ width: 100%;
+ max-width: none !important;
+ margin-top: 1em;
+}
+
+#field_searchterm, .search-building input{
+ /* Firefox */
+ width: -moz-calc(100% - 30px);
+ /* WebKit */
+ width: -webkit-calc(100% - 30px);
+ /* Opera */
+ width: -o-calc(100% - 30px);
+ /* Standard */
+ width: calc(100% - 30px);
+ max-width: none;
+ height: 25px;
+
+}
+
+#submit_searchterm{
+ width: 30px;
+ height: 25px;
+ background:
url('http://aktivby.alesund.kommune.no/phpgwapi/templates/bookingfrontend/images/search_icon.png');
+ background-repeat: no-repeat;
+ background-color: #00ACB8;
+ background-position: center;
+ border: none;
+ display: inline;
+ position: absolute;
+}
+
+#submit_building{
+ width: 30px;
+ height: 25px;
+ background:
url('http://aktivby.alesund.kommune.no/phpgwapi/templates/bookingfrontend/images/search_icon.png');
+ background-repeat: no-repeat;
+ background-color: #00ACB8;
+ background-position: center;
+ border: none;
+ display: inline;
+ position: absolute;
+ pointer-events: none;
+}
+
+
+.search-line .heading {
+ border-bottom: none !important;
+}
+
+
+.control {
+ display: block;
+ position: relative;
+ padding-left: 30px;
+ margin-bottom: 5px;;
+ cursor: pointer;
+ font-size: 18px;
+}
+.control input {
+ position: absolute;
+ z-index: -1;
+ opacity: 0;
+}
+.control__indicator {
+ position: absolute;
+ top: 2px;
+ left: 0;
+ height: 20px;
+ width: 20px;
+ background: white;
+ border: solid 1px gray;
+}
+.control:hover input ~ .control__indicator{
+ background: #E7EFF1;
+}
+.control input:checked ~ .control__indicator {
+ background: #00ACB8;
+}
+.control__indicator:after {
+ content: '';
+ position: absolute;
+ display: none;
+}
+.control input:checked ~ .control__indicator:after {
+ display: block;
+}
+.control--checkbox .control__indicator:after {
+ left: 7px;
+ top: 3px;
+ width: 3px;
+ height: 8px;
+ border: solid #fff;
+ border-width: 0 2px 2px 0;
+ transform: rotate(45deg);
+}
+
+#result{
+ list-style-type: none;
+ padding-left: 0.2em;
+}
+
+
+.resource-button{
+ background-color: #00ACB8;
+ color: white;
+ border: none;
+ padding: .5em;
+ font-weight: bold;
+}
+
Modified: trunk/phpgwapi/templates/portico/css/base.css
===================================================================
--- trunk/phpgwapi/templates/portico/css/base.css 2018-01-04 19:01:00 UTC
(rev 17499)
+++ trunk/phpgwapi/templates/portico/css/base.css 2018-01-04 19:04:54 UTC
(rev 17500)
@@ -535,3 +535,13 @@
font-weight: bold;
text-align: center;
}
+
+.historyTable th:first-child{
+ width: 20%;
+}
+
+.historyTable{
+ border-collapse:separate;
+ border-spacing:1.2em;
+ text-align: left;
+}
\ No newline at end of file
Modified: trunk/phpgwapi/templates/portico/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/portico/head.inc.php 2018-01-04 19:01:00 UTC
(rev 17499)
+++ trunk/phpgwapi/templates/portico/head.inc.php 2018-01-04 19:04:54 UTC
(rev 17500)
@@ -45,6 +45,15 @@
$stylesheets = array();
+ // added aalesund stylesheet
+ $stylesheets[] =
"/phpgwapi/templates/aalesund/bootstrap/css/bootstrap.min.css";
+ $stylesheets[] = "/phpgwapi/templates/aalesund/css/bootstrap.css";
+ $stylesheets[] = "/phpgwapi/templates/aalesund/css/ionicons.css";
+
+ // // // // // // // // // //
+
+
+
// $stylesheets[] = "/phpgwapi/js/materialize/css/materialize.min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/global.css";
// $stylesheets[] = "/phpgwapi/templates/pure/css/demo_mmenu.css";
@@ -55,7 +64,11 @@
$stylesheets[] =
"/phpgwapi/js/DataTables/Responsive/css/responsive.dataTables.min.css";
$stylesheets[] = "/phpgwapi/templates/base/css/base.css";
$stylesheets[] = "/phpgwapi/templates/portico/css/base.css";
-
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['theme']))
+
+
+
+
+
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['theme']))
{
$stylesheets[] =
"/phpgwapi/templates/portico/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17500] updating layout for application in backend,
roger . kolseth <=