Merge branch 'master' of linz:/srv/git/themes

diff --git a/EarlyBlue/global/menulist.css b/EarlyBlue/global/menulist.css
index 8746165b4bf1d68a5dde1ea3d85849e118f97915..9418c5d94da76a04474188972bacab661d25e999 100644 (file)
--- a/EarlyBlue/global/menulist.css
+++ b/EarlyBlue/global/menulist.css
@@ -117,6 +117,8 @@ html|*.menulist-editable-input {
   margin: 0px !important;
   border: none !important;
   padding: 0px !important;
+  background-color: inherit;
+  color: inherit;
   font: inherit;
 }
 

diff --git a/LCARStrek/communicator/communicator.css b/LCARStrek/communicator/communicator.css
index cfedc070cc7ee4162956e5e36fcc06a2aa5be835..23b5c4bd37a5ecd80859b12c8d9ca883c6bfc6b1 100644 (file)
--- a/LCARStrek/communicator/communicator.css
+++ b/LCARStrek/communicator/communicator.css
@@ -122,6 +122,16 @@ menuitem.menuitem-iconic > .menu-iconic-left {
   display: -moz-box;
 }
 
+/* ::::: sync notification ::::: */
+
+#sync-notifications > notification {
+  margin-top: 3px;
+}
+
+#sync-notifications > notification > .notification-inner > hbox > button {
+  margin: 0;
+}
+
 /******* lightweight themes *******/
 
 toolbar button:-moz-lwtheme,

diff --git a/LCARStrek/global/menulist.css b/LCARStrek/global/menulist.css
index 09feabda19d43e04b6ee1fa7f8dfab726977c3e0..93d31e06f2eea996990b340196d16879b47c9348 100644 (file)
--- a/LCARStrek/global/menulist.css
+++ b/LCARStrek/global/menulist.css
@@ -152,6 +152,8 @@ html|*.menulist-editable-input {
   margin: 0px !important;
   border: none !important;
   padding: 0px !important;
+  background-color: inherit;
+  color: inherit;
   font: inherit;
 }
 

diff --git a/LCARStrek/global/notification.css b/LCARStrek/global/notification.css
index 15ad8ca75a4b11b12567b252342d622f54c88856..601b23d2a1d22ac11e437230a8f89da8018a8bc4 100644 (file)
--- a/LCARStrek/global/notification.css
+++ b/LCARStrek/global/notification.css
@@ -52,7 +52,7 @@ notification[type="critical"] .messageImage {
 }
 
 .messageCloseButton > .toolbarbutton-icon {
-  -moz-margin-start: 5px;
+  -moz-margin-start: 2px;
 }
 
 /* Popup notification */