From c2298c2e6b588ad035a2f40c45d6a7ae6bc5fd36 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 4 Mar 2017 17:49:44 +0100
Subject: [PATCH] Clean CSS
---
htdocs/theme/eldy/style.css.php | 75 +++++++++++++------
htdocs/theme/md/style.css.php | 128 +++++++++++++++++++++++---------
2 files changed, 142 insertions(+), 61 deletions(-)
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f58ed5d4144..a5ae098c545 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -266,7 +266,6 @@ textarea:focus, button:focus {
border: 1px solid #aaa !important;
}
input:focus, select:focus {
- /* box-shadow: 0 0 4px #8091BF; */
border-bottom: 1px solid #666;
}
input.select2-input {
@@ -289,7 +288,6 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
font-size: <?php print $fontsize ?>px;
font-family: <?php print $fontlist ?>;
- /* border: 1px solid #C0C0C0; */
border: none;
border-bottom: 1px solid #C0C0C0;
outline: none;
@@ -300,10 +298,6 @@ input {
}
input, select {
border-bottom: solid 1px rgba(0,0,0,.2);
- /*border-radius: 2px;
- border: solid 1px rgba(0,0,0,.3);
- border-top:solid 1px rgba(0,0,0,.3);
- border-bottom:solid 1px rgba(0,0,0,.2);*/
padding:4px;
margin-left:0px;
@@ -311,7 +305,7 @@ input, select {
margin-top:1px;
}
textarea {
- border-radius: 2px;
+ border-radius: 0;
border: solid 1px rgba(0,0,0,.3);
border-top:solid 1px rgba(0,0,0,.3);
border-bottom:solid 1px rgba(0,0,0,.2);
@@ -582,7 +576,7 @@ div.myavailability {
.strikefordisabled {
text-decoration: line-through;
}
-/* using a tdoverflowxxx make the min-with not working */
+/* using a tdoverflowxxx make the min-width not working */
.tdoverflow {
max-width: 0;
overflow: hidden;
@@ -1701,7 +1695,7 @@ div.blockvmenusearchphone
.vmenu div.blockvmenusearch
{
padding-bottom: 14px;
- border-bottom: 1px solid #e0e0e0;
+/* border-bottom: 1px solid #e0e0e0; */
}
.vmenu div.blockvmenuend
{
@@ -3945,38 +3939,75 @@ div.dataTables_length select {
.selectoptiondisabledwhite {
background: #FFFFFF !important;
}
-
.select2-arrow {
border: none;
border-left: none !important;
background: none !important;
}
-
.select2-choice
{
- /* border: 1px solid #aaa; */
border-top: none !important;
border-left: none !important;
border-right: none !important;
border-bottom: 1px solid #aaa;
}
-.select2-drop.select2-drop-above.select2-drop-active,
-.select2-container-active .select2-choice,
-.select2-container-active .select2-choices,
-.select2-dropdown-open.select2-drop-above .select2-choice,
-.select2-dropdown-open.select2-drop-above .select2-choices,
-.select2-container-multi.select2-container-active .select2-choices
+.select2-drop.select2-drop-above {
+ box-shadow: none !important;
+}
+.select2-drop.select2-drop-above.select2-drop-active {
+ border-top: 1px solid #ccc;
+}
+.select2-container-active .select2-choice, .select2-container-active .select2-choices
{
- border: 1px solid #aaa;
+ outline: none;
+ border-top: none;
+ border-left: none;
+ border-bottom: none;
+ -webkit-box-shadow: none !important;
+ box-shadow: none !important;
+}
+.select2-dropdown-open {
+ background-color: #fff;
+}
+.select2-dropdown-open .select2-choice, .select2-dropdown-open .select2-choices
+{
+ outline: none;
+ border-top: none;
+ border-left: none;
+ border-bottom: none;
+ -webkit-box-shadow: none !important;
+ box-shadow: none !important;
+ background-color: #fff;
}
.select2-disabled
{
color: #888;
}
+.select2-drop.select2-drop-above.select2-drop-active, .select2-drop {
+ border-radius: 0;
+}
+.select2-drop.select2-drop-above {
+ border-radius: 0;
+}
+.select2-dropdown-open.select2-drop-above .select2-choice, .select2-dropdown-open.select2-drop-above .select2-choices {
+ background-image: none;
+ border-left: 1px solid #ccc !important;
+ border-right: 1px solid #ccc !important;
+ border-radius: 0 !important;
+}
+div.select2-drop-above
+{
+ background: #fff;
+ -webkit-box-shadow: none !important;
+ box-shadow: none !important;
+}
.select2-drop-active
{
+ border: 1px solid #ccc;
+ padding-top: 4px;
+}
+.select2-search input {
border: none;
- border-top: none;
}
a span.select2-chosen
{
@@ -3984,12 +4015,8 @@ a span.select2-chosen
}
.select2-container .select2-choice {
background-image: none;
- /* height: 24px; */
line-height: 24px;
}
-.select2-choices .select2-search-choice {
- /* border: 1px solid #aaa !important; */
-}
.select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-ajax-error, .select2-results .select2-selection-limit
{
background: #FFFFFF;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 3fa54b1d462..625251a6bb0 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -241,8 +241,8 @@ body {
<?php } ?>
color: rgb(<?php echo $colortext; ?>);
font-size: <?php print $fontsize ?>px;
- font-family: <?php print $fontlist ?>;
line-height: 130%;
+ font-family: <?php print $fontlist ?>;
margin-top: 0;
margin-bottom: 0;
margin-right: 0;
@@ -261,10 +261,21 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
background-color: #FDFDFD;
}
+textarea:focus, button:focus {
+ /* v6 box-shadow: 0 0 4px #8091BF; */
+ border: 1px solid #aaa !important;
+}
input:focus, textarea:focus, button:focus, select:focus {
- box-shadow: 0 0 4px #8091BF;
- /* TODO Remove shadow on focus. Use instead border-bottom: 1px solid #aaa !important; To disable with select2 too. */
+ border-bottom: 1px solid #666;
+}
+input.select2-input {
+ border-bottom: none ! important;
}
+.select2-choice {
+ border: none;
+ border-bottom: 1px solid #aaa !important;
+}
+
textarea.cke_source:focus
{
box-shadow: none;
@@ -276,17 +287,28 @@ textarea.cke_source:focus
input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
font-size: <?php print $fontsize ?>px;
font-family: <?php print $fontlist ?>;
- border: 1px solid #C0C0C0;
+ border: none;
+ border-bottom: 1px solid #C0C0C0;
+ outline: none;
margin: 0px 0px 0px 0px;
}
-input, textarea, select {
- border-radius:2px;
- border:solid 1px rgba(0,0,0,.3);
+input, select {
+ border-bottom: solid 1px rgba(0,0,0,.2);
+
+ padding:4px;
+ margin-left:0px;
+ margin-bottom:1px;
+ margin-top:1px;
+ }
+
+textarea {
+ border-radius: 0;
+ border: solid 1px rgba(0,0,0,.3);
border-top:solid 1px rgba(0,0,0,.3);
border-bottom:solid 1px rgba(0,0,0,.2);
+
background-color: #FFF;
- /* box-shadow: 1px 1px 1px rgba(0,0,0,.2) inset;*/
padding:4px;
margin-left:1px;
margin-bottom:1px;
@@ -361,7 +383,7 @@ fieldset { border: 1px solid #AAAAAA !important; }
.legendforfieldsetstep { padding-bottom: 10px; }
-.button, sbmtConnexion {
+.button, .buttonDelete, input[name="sbmtConnexion"] {
font-family: <?php print $fontlist ?>;
border-color: #c5c5c5;
border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
@@ -371,7 +393,8 @@ fieldset { border: 1px solid #AAAAAA !important; }
margin-top: 0;
text-align: center;
cursor: pointer;
- color: #333333;
+ color: #333333 !important;
+ text-decoration: none !important;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
background-color: #f5f5f5;
background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
@@ -393,17 +416,17 @@ fieldset { border: 1px solid #AAAAAA !important; }
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
}
-.button:focus {
+.button:focus, .buttonDelete:focus {
-moz-box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
-webkit-box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
}
-.button:hover {
+.button:hover, .buttonDelete:hover {
-moz-box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
-webkit-box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
}
-.button:disabled {
+.button:disabled, .buttonDelete:disabled {
opacity: 0.4;
filter: alpha(opacity=40); /* For IE8 and earlier */
box-shadow: none;
@@ -559,6 +582,7 @@ div.myavailability {
.strikefordisabled {
text-decoration: line-through;
}
+/* using a tdoverflowxxx make the min-width not working */
.tdoverflow {
max-width: 0;
overflow: hidden;
@@ -1716,10 +1740,10 @@ div.blockvmenusearch
padding-right: 1px;
padding-top: 3px;
padding-bottom: 3px;
- margin: 1px 0px 8px 0px;
+ margin: 1px 0px 12px 0px;
padding-bottom: 10px;
- border-bottom: 1px solid #f4f4f4;
+ /* border-bottom: 1px solid #f4f4f4; */
}
div.blockvmenusearchphone
{
@@ -2350,14 +2374,6 @@ div.pagination li.pagination span {
line-height: 1.42857143;
color: #000;
text-decoration: none;
-
- background-color: #f5f5f5;
- background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
- background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
- background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
- background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
- background-repeat: repeat-x;
}
div.pagination li.pagination span.inactive {
cursor: default;
@@ -3834,8 +3850,12 @@ div.dataTables_length select {
.select2-container .select2-choice .select2-arrow {
border-radius: 0;
}
+.select2-container-multi .select2-choices {
+ background-image: none;
+}
.select2-container .select2-choice {
color: #000;
+ border-radius: 0;
}
.selectoptiondisabledwhite {
background: #FFFFFF !important;
@@ -3848,31 +3868,68 @@ div.dataTables_length select {
}
.select2-choice
{
- /* border: 1px solid #aaa; */
border-top: none !important;
border-left: none !important;
border-right: none !important;
border-bottom: 1px solid #aaa;
}
-
-.select2-choice,
-.select2-drop.select2-drop-above.select2-drop-active,
-.select2-container-active .select2-choice,
-.select2-container-active .select2-choices,
-.select2-dropdown-open.select2-drop-above .select2-choice,
-.select2-dropdown-open.select2-drop-above .select2-choices,
-.select2-container-multi.select2-container-active .select2-choices
+.select2-drop.select2-drop-above {
+ box-shadow: none !important;
+}
+.select2-drop.select2-drop-above.select2-drop-active {
+ border-top: 1px solid #ccc;
+}
+.select2-container-active .select2-choice, .select2-container-active .select2-choices
{
- border: 1px solid #aaa;
+ outline: none;
+ border-top: none;
+ border-left: none;
+ border-bottom: none;
+ -webkit-box-shadow: none !important;
+ box-shadow: none !important;
+}
+.select2-dropdown-open {
+ background-color: #fff;
+}
+.select2-dropdown-open .select2-choice, .select2-dropdown-open .select2-choices
+{
+ outline: none;
+ border-top: none;
+ border-left: none;
+ border-bottom: none;
+ -webkit-box-shadow: none !important;
+ box-shadow: none !important;
+ background-color: #fff;
}
.select2-disabled
{
color: #888;
}
+.select2-drop.select2-drop-above.select2-drop-active, .select2-drop {
+ border-radius: 0;
+}
+.select2-drop.select2-drop-above {
+ border-radius: 0;
+}
+.select2-dropdown-open.select2-drop-above .select2-choice, .select2-dropdown-open.select2-drop-above .select2-choices {
+ background-image: none;
+ border-left: 1px solid #ccc !important;
+ border-right: 1px solid #ccc !important;
+ border-radius: 0 !important;
+}
+div.select2-drop-above
+{
+ background: #fff;
+ -webkit-box-shadow: none !important;
+ box-shadow: none !important;
+}
.select2-drop-active
{
+ border: 1px solid #ccc;
+ padding-top: 4px;
+}
+.select2-search input {
border: none;
- border-top: none;
}
a span.select2-chosen
{
@@ -3882,9 +3939,6 @@ a span.select2-chosen
background-image: none;
line-height: 24px;
}
-.select2-choices .select2-search-choice {
- border: 1px solid #aaa !important;
-}
.select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-ajax-error, .select2-results .select2-selection-limit
{
background: #FFFFFF;
--
GitLab