X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fpreferences%2Fin-content%2Fpreferences.css;h=c5c1fcc074f2278228bc988bdac642865dc5abf0;hp=ecfb6bab05a688739a2027a16ba7d1012c036e47;hb=d23bf94a3357d30cf7300a6eb9c051f0a225b02a;hpb=e184b6619b56a4a97edc2b1f31c778bfebacf421

diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css
index ecfb6bab..c5c1fcc0 100644
--- a/LCARStrek/browser/preferences/in-content/preferences.css
+++ b/LCARStrek/browser/preferences/in-content/preferences.css
@@ -2,7 +2,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this file,
    - You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* === BEGIN shared/in-content/preferences.css === */
+/* === BEGIN shared/incontentprefs/preferences.inc.css === */
 
 @namespace html "http://www.w3.org/1999/xhtml";
 
@@ -28,7 +28,6 @@
   max-width: 800px;
   font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
   font-size: 1.25rem;
-  line-height: 22px;
   color: #FF9F00;
 }
 
@@ -41,54 +40,36 @@ treecol {
   /* override the * rule */
   -moz-user-select: none;
 }
-
-/* Category List */
-
-#categories {
-  max-height: 100vh;
-
-  background-color: #A09090;
-  padding-top: 4em;
-  margin: 0;
-  border-radius: 1em 0 0 0;
-  border: none;
+/*
+#engineList treechildren::-moz-tree-image(engineShown, checked),
+#blocklistsTree treechildren::-moz-tree-image(selectionCol, checked) {
+  list-style-image: url("chrome://global/skin/in-content/check.svg#check");
+  width: 21px;
+  height: 21px;
 }
 
-#categories > scrollbox {
-  overflow-x: hidden !important;
+#engineList treechildren::-moz-tree-image(engineShown, checked, selected),
+#blocklistsTree treechildren::-moz-tree-image(selectionCol, checked, selected) {
+  list-style-image: url("chrome://global/skin/in-content/check.svg#check-inverted");
 }
 
-.category {
-  background-color: #000000;
-  color: #FFCF00;
-  -moz-border-end-width: 0;
-  -moz-padding-start: 15px;
-  -moz-padding-end: 21px;
-  min-height: 40px;
-  transition: background-color 150ms;
+#engineList treechildren::-moz-tree-row,
+#blocklistsTree treechildren::-moz-tree-row {
+  min-height: 36px;
 }
-
-.category:hover {
-  background-color: #FFCF00;
-  color: #000000;
+*/
+#selectionCol {
+  min-width: 26px;
 }
 
-.category[selected] {
-  background-color: #008484;
-  color: #000000;
-}
+/* Category List */
 
-#categories[keyboard-navigation="true"]:-moz-focusring > .category[current] {
-  border-top: 1px dotted #000000;
-  border-bottom: 1px dotted #000000;
+#categories {
+  max-height: 100vh;
 }
 
-.category-name {
-  line-height: 22px;
-  font-size: 1.25rem;
-  padding-bottom: 2px;
-  -moz-padding-start: 9px;
-  margin: 0;
+#categories > scrollbox {
+  overflow-x: hidden !important;
 }
 
 /**
@@ -101,11 +82,6 @@ treecol {
   visibility: collapse;
 }
 
-.category-icon {
-  width: 24px;
-  height: 24px;
-}
-
 #category-general > .category-icon {
   list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#general");
 }
@@ -186,6 +162,16 @@ treecol {
 
 /* header */
 
+.header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.header[hidden=true] {
+  display: none;
+}
+
 #header-advanced {
   border-bottom: none;
   padding-bottom: 0;
@@ -237,7 +223,7 @@ treecol {
 
 #useFirefoxSync  {
   font-size: 90%;
-  -moz-margin-end: 8px !important;
+  margin-inline-end: 8px !important;
 }
 
 #getStarted {
@@ -255,6 +241,15 @@ treecol {
   margin-right: 4px !important;
 }
 
+#notificationsPolicyLearnMore {
+  margin-inline-start: 1.5em !important;
+}
+
+#defaultFontSizeLabel {
+  /* !important needed to override common !important rule */
+  margin-inline-start: 4px !important;
+}
+
 /* Applications Pane Styles */
 
 #applicationsContent {
@@ -262,7 +257,7 @@ treecol {
 }
 
 #filter {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 #handlersView {
@@ -274,13 +269,13 @@ treecol {
 }
 
 .typeIcon {
-  -moz-margin-start: 10px !important;
-  -moz-margin-end: 9px !important;
+  margin-inline-start: 10px !important;
+  margin-inline-end: 9px !important;
 }
 
 .actionIcon {
-  -moz-margin-start: 11px !important;
-  -moz-margin-end: 8px !important;
+  margin-inline-start: 11px !important;
+  margin-inline-end: 8px !important;
 }
 
 .actionsMenu {
@@ -288,11 +283,32 @@ treecol {
 }
 
 .actionsMenu > menupopup > menuitem {
-  -moz-padding-start: 10px !important;
+  padding-inline-start: 10px !important;
 }
 
 .actionsMenu > menupopup > menuitem > .menu-iconic-left {
-  -moz-margin-end: 8px !important;
+  margin-inline-end: 8px !important;
+}
+
+/* Privacy pane */
+
+#trackingProtectionPBMLearnMore,
+#trackingProtectionLearnMore,
+#browserContainersLearnMore {
+  margin-inline-start: 1.5em !important;
+  margin-top: 0;
+  font-weight: normal;
+}
+
+.doNotTrackLearnMore {
+  margin-inline-start: calc(1em + 30px);
+  margin-bottom: 1em;
+  font-weight: normal;
+}
+
+.doNotTrackLearnMore > label {
+  font-size: 1em !important;
+  margin-left: 0;
 }
 
 /* Collapse the non-active vboxes in decks to use only the height the
@@ -301,9 +317,8 @@ treecol {
 #historyPane:not([selectedIndex="2"]) > #historyCustomPane,
 #weavePrefsDeck:not([selectedIndex="1"]) > #hasAccount,
 #weavePrefsDeck:not([selectedIndex="2"]) > #needsUpdate,
-#weavePrefsDeck:not([selectedIndex="3"]) > #fxaDeterminingStatus,
-#weavePrefsDeck:not([selectedIndex="4"]) > #noFxaAccount,
-#weavePrefsDeck:not([selectedIndex="5"]) > #hasFxaAccount,
+#weavePrefsDeck:not([selectedIndex="3"]) > #noFxaAccount,
+#weavePrefsDeck:not([selectedIndex="4"]) > #hasFxaAccount,
 #fxaLoginStatus:not([selectedIndex="1"]) > #fxaLoginUnverified,
 #fxaLoginStatus:not([selectedIndex="2"]) > #fxaLoginRejected {
   visibility: collapse;
@@ -326,10 +341,10 @@ description > html|a {
 #weavePrefsDeck > vbox > description,
 #weavePrefsDeck > vbox > #pairDevice > label,
 #weavePrefsDeck > #needsUpdate > hbox > #loginError,
-#weavePrefsDeck > #hasFxaAccount > hbox:not(#tosPP-normal) > label,
-#weavePrefsDeck > #hasFxaAccount > hbox:not(#tosPP-small) > label {
-  /* no margin-start for elements at the begin of a line */
-  -moz-margin-start: 0;
+#weavePrefsDeck > #hasFxaAccount > vbox > label,
+#weavePrefsDeck > #hasFxaAccount > hbox:not(#tosPP-normal) > label {
+  /* no margin-inline-start for elements at the begin of a line */
+  margin-inline-start: 0;
 }
 
 #advancedPrefs {
@@ -337,31 +352,36 @@ description > html|a {
 }
 
 #tabsElement {
-/*  -moz-margin-end: 4px; / add the 4px end-margin of other elements */
+/*  margin-inline-end: 4px; / add the 4px end-margin of other elements */
 }
 
 #telemetryLearnMore,
 #FHRLearnMore,
 #crashReporterLearnMore {
+  /* provide some margin between the links and the label text */
+  /* !important is needed to override the rules defined in common.css */
+  margin-inline-start: 20px !important;
   /* center the links */
   margin-top: 8px;
   margin-bottom: 8px;
 }
 
-#trackingProtectionImage {
-  width: 16px;
-  height: 16px;
-  list-style-image: url("chrome://browser/skin/bad-content-blocked-16.png");
+.indent {
+  /* !important needed to override margin-inline-start:0 !important; rule
+     define in common.css for labels - but not in LCARStrek*/
+  margin-inline-start: 33px /*!important*/;
 }
-
-@media (min-resolution: 2dppx) {
-  #trackingProtectionImage {
-    list-style-image: url("chrome://browser/skin/bad-content-blocked-16@2x.png");
-  }
+ 
+.text-link {
+  margin-bottom: 0;
 }
 
 #showUpdateHistory {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
+}
+
+#fxaProfileImage {
+  -moz-user-focus: normal;
 }
 
 /**
@@ -394,23 +414,25 @@ description > html|a {
 }
 
 #dialogBox > .groupbox-title {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
+  margin-inline-start: 0;
+  margin-inline-end: 0;
 /*  padding: 3.5px 0;
   background-color: #F1F1F1; */
 }
 
 #dialogTitle {
   text-align: center;
+  -moz-user-select: none;
 }
 
 .close-icon {
   background-color: transparent !important;
   border: none;
   box-shadow: none;
-  height: 18px;
   padding: 0;
-  min-width: 18px;
+  height: auto;
+  min-height: 16px;
+  min-width: 0;
 }
 
 #dialogBox > .groupbox-title > caption {
@@ -441,34 +463,224 @@ description > html|a {
  */
 
 /**
- * Sync migration
+ * Font dialog menulist fixes
  */
-#sync-migrate-upgrade-description {
-  /* description elts need a min-width to wrap correctly - bug 630864? */
-  min-width: 100px
+
+#defaultFontType,
+#serif,
+#sans-serif,
+#monospace {
+  min-width: 30ch;
 }
 
-#sync-migration {
-  border: 1px solid #9C9CFF;
-  background-color: #000000;
-  color: #A09090;
-  text-shadow: none;
-  margin: 5px 0 0 0;
-  animation: fadein 3000ms;
+/**
+ * Sync
+ */
+
+#fxaProfileImage {
+  max-width: 60px;
+  border-radius: 50%;
+  list-style-image: url(chrome://browser/skin/fxa/default-avatar.svg);
+  margin-inline-end: 15px;
+  image-rendering: -moz-crisp-edges;
+}
+
+#fxaLoginStatus[hasName] #fxaProfileImage {
+  max-width: 80px;
+}
+
+#fxaProfileImage.actionable {
+  cursor: pointer;
+}
+
+#fxaProfileImage.actionable:hover {
+  box-shadow: 0px 0px 0px 1px #FFCF00;
+}
+
+#fxaProfileImage.actionable:hover:active {
+  box-shadow: 0px 0px 0px 1px #FF9F00;
+}
+
+#noFxaAccount {
+  /* Overriding the margins from the base preferences.css theme file.
+     These overrides can be simplified by fixing bug 1027174 */
+  margin: 0;
+  padding-top: 15px;
 }
 
-@keyframes fadein {
-  from { opacity: 0; }
-  to   { opacity: 1; }
+#fxaContentWrapper {
+  -moz-box-flex: 1;
+}
+
+#noFxaGroup {
+  -moz-box-flex: 1;
+  margin: 0;
+}
+
+#fxaContentWrapper {
+  padding-right: 15px;
+}
+
+#noFxaGroup > vbox,
+#fxaGroup {
+  -moz-box-align: start;
+}
+
+#fxaSyncEngines > vbox:first-child {
+  margin-right: 80px;
+}
+
+#fxaSyncComputerName {
+  margin-inline-start: 0px;
+  -moz-box-flex: 1;
+}
+
+#tosPP-small-ToS {
+  margin-bottom: 1em;
+}
+
+#fxaLoginRejectedWarning {
+  list-style-image: url("chrome://browser/skin/warning.svg");
+  margin: 4px 8px 0px 0px;
+}
+
+#noFxaCaption {
+  font-weight: bold;
+  margin-bottom: 11px;
+}
+
+.fxaSyncIllustration {
+  margin-top: 35px;
+}
+
+#syncOptions caption {
+  margin-bottom: 11px;
+}
+
+#fxaSyncComputerName {
+  margin-left: 0px;
+}
+
+#noFxaDescription {
+  margin-bottom: 20px !important;
+}
+
+.separator {
+  border-bottom: 1px solid var(--in-content-header-border-color);
+}
+
+.fxaAccountBox {
+  border: 1px solid #A09090;
+  border-radius: 5px;
+  padding: 14px 20px 14px 14px;
+}
+
+#signedOutAccountBoxTitle {
+  font-weight: bold;
+}
+
+.fxaAccountBoxButtons {
+  margin-bottom: 0 !important;
+  margin-top: 11px;
+}
+
+.fxaAccountBoxButtons > * {
+  -moz-box-flex: 1;
+}
+
+.fxaAccountBoxButtons > button {
+  text-align: center;
+  padding-left: 11px;
+  padding-right: 11px;
+  margin: 0;
+  min-width: 0;
+}
+
+.fxaAccountBoxButtons > button:first-child {
+  margin-right: 14px !important;
+}
+
+.fxaSyncIllustration {
+  width: 231px;
+  list-style-image: url(chrome://browser/skin/fxa/sync-illustration.png)
+}
+
+#fxaLoginStatus[hasName] #fxaEmailAddress1 {
+  font-size: 1.1rem;
+}
+
+#fxaEmailAddress1,
+#fxaEmailAddress2,
+#fxaEmailAddress3 {
+  word-break: break-all;
+}
+
+.fxaFirefoxLogo {
+  list-style-image: url(chrome://browser/skin/fxa/logo.png);
+  max-width: 64px;
+  margin-inline-end: 14px;
+}
+
+.fxaMobilePromo {
+  margin-bottom: 20px;
+  margin-top: 25px;
+}
+
+#fxaLoginRejectedWarning {
+  list-style-image: url(chrome://browser/skin/warning.svg);
+  filter: drop-shadow(0 1px 0 hsla(206, 50%, 10%, .15));
+  margin: 4px 8px 0px 0px;
+}
+
+#syncOptions {
+  margin-bottom: 27.5px;
+}
+
+.androidLink {
+  background-image: url("chrome://browser/skin/fxa/android.png");
+}
+
+.iOSLink {
+  background-image: url("chrome://browser/skin/fxa/ios.png");
+}
+
+.androidLink,
+.iOSLink {
+  margin: 0 0 0 2px;
+  padding-left: 28px;
+  padding-top: 6px;
+  height: 28px;
+  background-repeat: no-repeat;
+  background-size: 24px 28px;
+}
+
+#tosPP-small {
+  margin-top: 20px;
+  margin-bottom: 20px;
+}
+
+@media (min-resolution: 1.1dppx) {
+  .androidLink {
+    background-image: url("chrome://browser/skin/fxa/android@2x.png");
+  }
+  .iOSLink {
+    background-image: url("chrome://browser/skin/fxa/ios@2x.png");
+  }
+  .fxaSyncIllustration {
+    list-style-image: url(chrome://browser/skin/fxa/sync-illustration@2x.png)
+  }
+  .fxaFirefoxLogo {
+    list-style-image: url(chrome://browser/skin/fxa/logo@2x.png);
+  }
 }
 
-/* === END shared/in-content/preferences.css === */
+/* === END shared/incontentprefs/preferences.inc.css === */
 
 caption {
 }
 
 .indent-small {
-  -moz-margin-start: 10px;
+  margin-inline-start: 10px;
 }
 
 @media (min-resolution: 2dppx) {