From e262c3ea87d5b4ad6de31b4424393deecd408625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Solard?= Date: Thu, 7 Aug 2014 18:23:21 +0200 Subject: [PATCH] Refactor css files --- .../webmail/static/webmail/css/webmail.css | 65 ++++++---- modoboa/static/css/custom.css | 122 +++++++++--------- modoboa/static/css/searchbar.css | 1 - 3 files changed, 101 insertions(+), 87 deletions(-) diff --git a/modoboa/extensions/webmail/static/webmail/css/webmail.css b/modoboa/extensions/webmail/static/webmail/css/webmail.css index 8cb587f65..3ee2630bf 100644 --- a/modoboa/extensions/webmail/static/webmail/css/webmail.css +++ b/modoboa/extensions/webmail/static/webmail/css/webmail.css @@ -1,3 +1,4 @@ + /* MEDIA */ @media (max-width: 400px) { td#subject, td[name='subject'] @@ -49,6 +50,7 @@ } + /* GENERAL */ body, html { overflow: hidden; height: 100%; @@ -128,8 +130,9 @@ td[name="date"] { margin-left: 10px; } + /* - * Top navbar + *TOP NAVBAR */ .navbar-header{ @@ -141,6 +144,34 @@ td[name="date"] { } + +/* + *listing + */ +#listing{ + overflow: auto; +} +#listing.listing-up-1198{ + padding-left: 15px; +} +#listing.listing-less-1198{ + bottom: 0px; + left: 0px; + padding-left: 0px; + right: 0; + top: 0px; + overflow-y: hidden; +} + +#listing .test{ + overflow-y: scroll; + position: absolute; + left: 0; + right: 0; + top: 41px; + bottom: 41px; +} + /* * Mailboxes list */ @@ -183,30 +214,6 @@ li.droppable li{ margin-left: 10px; } -/* listing */ -#listing{ - overflow: auto; -} -#listing.listing-up-1198{ - padding-left: 15px; -} -#listing.listing-less-1198{ - bottom: 0px; - left: 0px; - padding-left: 0px; - right: 0; - top: 0px; - overflow-y: hidden; -} - -#listing .test{ - overflow-y: scroll; - position: absolute; - left: 0; - right: 0; - top: 41px; - bottom: 41px; -} /* * Compose form */ @@ -324,7 +331,9 @@ td[class*=openable] { cursor: pointer; } -/* Action buttons */ +/* + *Action buttons + */ #menubar .btn-toolbar{ margin-left: 1px; @@ -343,7 +352,9 @@ td[class*=openable] { margin-left:5px; } -/* send mail */ +/* + *send mail + */ #body_container{ height: 600px; diff --git a/modoboa/static/css/custom.css b/modoboa/static/css/custom.css index 4dd81aef6..5d5d1c36d 100644 --- a/modoboa/static/css/custom.css +++ b/modoboa/static/css/custom.css @@ -1,4 +1,4 @@ - /* Media */ + /* ------- Media ------- */ @media (max-width: 440px) { @@ -32,8 +32,35 @@ } } + /* --------- general --------- */ - /* Colapse Nav */ + /* Form */ + + .form-horizontal .form-group { + margin-left: -15px; + } + + /* Buttons */ + + .btn-back{ + color: #EBEAE9; + background-color: #222222; + } + + /* links */ + a{ + color: #0088CC; + } + + a:hover{ + color: #0088CC; + } + + div.container-fluid div.row-fluid div.col-md-2 div.well ul.nav div.side-bar-responsive li a{ + color: #0088CC; + } + + /* Colapse Nav */ .navbar-inverse .navbar-toggle { border-color: #999999; @@ -54,7 +81,7 @@ margin-right: 18px; } - /*Global*/ + /* Global */ .container-fluid{ padding:0; @@ -73,8 +100,6 @@ label{ margin-bottom:8px; } -/* end Global*/ - .form-horizontal .param-label { float: left; padding-top: 5px; @@ -152,34 +177,31 @@ label{ margin: 0 10px; } -/* Form */ - .form-horizontal .form-group { - margin-left: -15px; - } -/* Buttons */ - -.btn-back{ - color: #EBEAE9; - background-color: #222222; -} - -/* links */ - a{ - color: #0088CC; - } - - a:hover{ - color: #0088CC; - } - -div.container-fluid div.row-fluid div.col-md-2 div.well ul.nav div.side-bar-responsive li a{ - color: #0088CC; -} /* --------- main page --------- */ -/*left navSideBar */ + + + /* Top navbar section */ + + .top-navbar{ + border-radius: 0; + min-height: 26px; + } + + .display-less-1198{ + display: none; + } + + div#navigate-navbar-collapse.navbar-collapse{ + z-index: 9999; + } + html body div.navbar div.container-fluid div#navigate-navbar-collapse.collapse ul.nav li.dropdown a.dropdown-toggle{ + color: white; + } + + /*left navSideBar */ div.container-fluid div.well{ padding:0; @@ -224,6 +246,17 @@ div.container-fluid div.row-fluid .well div.side-bar-responsive li:hover a{ margin-bottom: 4px; } + + /* listing */ + + #listing{ + margin-bottom:60px; + } + + .table > thead > tr > th { + border-bottom: 2px solid #FBFBFB; + } + /* Bottom navBar*/ .nav-bottom { @@ -267,34 +300,7 @@ div.container-fluid div.row-fluid .well div.side-bar-responsive li:hover a{ } -/* Top navbar section */ - -.top-navbar{ - border-radius: 0; - min-height: 26px; -} - - .display-less-1198{ - display: none; - } - - div#navigate-navbar-collapse.navbar-collapse{ - z-index: 9999; - } - html body div.navbar div.container-fluid div#navigate-navbar-collapse.collapse ul.nav li.dropdown a.dropdown-toggle{ - color: white; - } - - -/* listing */ - -#listing{ - margin-bottom:60px; -} - -.table > thead > tr > th { - border-bottom: 2px solid #FBFBFB; -} +/* --------- specific pages --------- */ /* identities tables */ @@ -312,8 +318,6 @@ div.container-fluid div.row-fluid .well div.side-bar-responsive li:hover a{ } - - /* modals */ .modal-body .form-group input[type='checkbox'] { diff --git a/modoboa/static/css/searchbar.css b/modoboa/static/css/searchbar.css index c9a87f6d7..74293c631 100644 --- a/modoboa/static/css/searchbar.css +++ b/modoboa/static/css/searchbar.css @@ -1,6 +1,5 @@ #searchbox { margin-right: 10px; - /*margin-left: 10px;*/ z-index: 2; position: relative; }