X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fdownloads%2Fdownloads.css;h=ce1c7b914eece6b67784c241bcc7797bae2efff4;hp=a59e09757d7929f3a6593ae8a0073880450638c2;hb=1b1f3d099d79ff3f7e081b2702a1076c6cd627c4;hpb=1cf9b0825ab3c891686ef5cdcde86e6a8efbf701

diff --git a/LCARStrek/browser/downloads/downloads.css b/LCARStrek/browser/downloads/downloads.css
index a59e0975..ce1c7b91 100644
--- a/LCARStrek/browser/downloads/downloads.css
+++ b/LCARStrek/browser/downloads/downloads.css
@@ -4,6 +4,9 @@
 
 /* === BEGIN downloads.inc.css === */
 
+/* In the original, this is at the end of the file as a preprocessor-include */
+@import url("progressmeter.inc.css");
+
 /*** Panel and outer controls ***/
 
 #downloadsPanel > .panel-arrowcontainer > .panel-arrowcontent {
@@ -18,10 +21,8 @@
 
 #downloadsListBox {
   background-color: transparent;
-  padding: 0;
   color: inherit;
   margin: 0;
-  border: none;
 }
 
 #emptyDownloads {
@@ -81,55 +82,15 @@ richlistitem[type="download"] > toolbarseparator {
   padding-inline-end: 10px;
 }
 
-#downloadsPanel[hasdownloads] #downloadsFooterButtons:not(.downloadsHideDropmarker) > #downloadsHistory {
-  padding-inline-start: 68px;
-}
-
-toolbarseparator.downloadsDropmarkerSplitter {
-  margin: 7px 0;
-}
-
 richlistitem[type="download"] > toolbarseparator {
   margin: 10px 0;
 }
 
-richlistitem[type="download"]:hover > toolbarseparator,
-#downloadsFooter:hover toolbarseparator.downloadsDropmarkerSplitter,
-#downloadsFooter[showingdropdown] toolbarseparator {
-  margin: 0;
-}
-
-.downloadsDropmarker {
-  padding: 0 21px;
-}
-
-.downloadsDropmarker > .button-box > hbox {
-  display: none;
-}
-
-.downloadsDropmarker > .button-box > .button-menu-dropmarker {
-  display: -moz-box;
-  padding: 0;
+richlistitem[type="download"]:hover > toolbarseparator {
   margin: 0;
 }
 
-.downloadsDropmarker > .button-box > .button-menu-dropmarker > .dropmarker-icon {
-  width: 16px;
-  height: 16px;
-/*  list-style-image: url("chrome://browser/skin/downloads/menubutton-dropmarker.svg");
-  filter: url("chrome://browser/skin/filters.svg#fill");
-  fill: currentColor;*/
-}
-
-/* Override default icon size which is too small for this dropdown */
-.downloadsDropmarker > .button-box > .button-menu-dropmarker {
-  width: 16px;
-  height: 16px;
-}
-
 #downloadsSummary {
-  padding: 0 12px;
-  cursor: pointer;
   -moz-user-focus: normal;
 }
 
@@ -146,36 +107,26 @@ richlistitem[type="download"]:hover > toolbarseparator,
 #downloadsSummary,
 richlistitem[type="download"] {
   height: var(--downloads-item-height);
-  padding-inline-end: 0;
-  color: inherit;
 }
 
 richlistitem[type="download"] {
-  margin: 0;
   border-bottom: 1px solid var(--panel-separator-color);
   background: transparent;
-  padding: 0;
+  color: inherit;
 }
 
 richlistitem[type="download"]:last-child {
   border-bottom: none;
 }
 
-richlistitem[type="download"] > .downloadMainArea {
-  padding: 8px;
-}
-
 .downloadTypeIcon {
-  margin-top: 8px;
-  margin-inline-end: 12px;
-  margin-bottom: 8px;
-  margin-inline-start: 0;
+  margin: 8px 13px;
   width: 32px;
   height: 32px;
 }
 
 .downloadBlockedBadge {
-  margin: 0 4px;
+  margin: 0 5px;
   background: url("chrome://browser/skin/downloads/download-blocked.svg") top right / 16px no-repeat;
 }
 
@@ -205,26 +156,65 @@ richlistitem[type="download"][verdict="Uncommon"] .downloadBlockedBadge {
    font-size of .downloadContainer's parent, we use calc to go from the
    smaller font-size back to the original font-size.
  */
-#downloadsSummaryDetails,
 .downloadContainer {
   font-size: calc(100% * var(--downloads-item-font-size-factor));
+  margin-inline-end: 13px;
 }
 
 #downloadsSummaryDescription,
 .downloadTarget {
-  margin-bottom: var(--downloads-item-target-margin-bottom);
-  cursor: inherit;
-}
-
-.downloadTarget {
+  margin: 0;
   font-size: calc(100% / var(--downloads-item-font-size-factor));
 }
 
 #downloadsSummaryDetails,
 .downloadDetails {
-  margin-top: var(--downloads-item-details-margin-top);
   opacity: var(--downloads-item-details-opacity);
-  cursor: inherit;
+  /* Use calc() to keep the height consistent with .downloadTarget, so that the
+     progress bar can be vertically centered. */
+  margin: 4px 0 calc(1em / var(--downloads-item-font-size-factor) - 1em);
+}
+
+/* The following rules control which message is shown under the name of the
+   download, using a set of elements that share the class ".downloadDetails".
+   At any given time, only one of these elements is displayed. We use a set of
+   rules to hide the elements that shouldn't be displayed in each case. */
+
+/* The full status message is only displayed in the Downloads View. */
+.downloadDetailsFull {
+  display: none;
+}
+
+/* When hovering the mouse pointer over the item, instead of the normal message
+   we display a more detailed one. */
+richlistitem[type="download"]:hover > .downloadMainArea > .downloadContainer > .downloadDetailsNormal,
+richlistitem[type="download"]:not(:hover) > .downloadMainArea > .downloadContainer > .downloadDetailsHover {
+  display: none;
+}
+
+/* When hovering the action button in particular, instead of the usual hover
+   message we display the command associated with the button. */
+richlistitem[type="download"].downloadHoveringButton > .downloadMainArea > .downloadContainer > .downloadDetailsHover,
+richlistitem[type="download"]:not(.downloadHoveringButton) > .downloadMainArea > .downloadContainer > .downloadButtonLabels {
+  display: none;
+}
+
+/* When hovering the main area of a finished download whose target exists,
+   instead of the usual hover message we display the "Open File" command. */
+richlistitem[type="download"][state="1"][exists] > .downloadMainArea:hover > .downloadContainer > .downloadDetailsHover,
+richlistitem[type="download"]:not([state="1"]) > .downloadMainArea > .downloadContainer > .downloadOpenFile,
+richlistitem[type="download"]:not([exists]) > .downloadMainArea > .downloadContainer > .downloadOpenFile,
+.downloadMainArea:not(:hover) > .downloadContainer > .downloadOpenFile {
+  display: none;
+}
+
+/* When hovering items blocked by Application Reputation, instead of the other
+   hover messages we display the "Show more information" label. */
+richlistitem[type="download"][verdict] > .downloadMainArea > .downloadContainer > .downloadDetailsHover,
+richlistitem[type="download"][verdict] > .downloadMainArea > .downloadContainer > .downloadButtonLabels,
+richlistitem[type="download"]:not([verdict]) > .downloadMainArea > .downloadContainer > .downloadShowMoreInfo,
+richlistitem[type="download"]:not(:hover) > .downloadMainArea > .downloadContainer > .downloadShowMoreInfo {
+  display: none;
 }
 
 richlistitem[type="download"][verdict] > toolbarseparator {
@@ -236,15 +226,15 @@ richlistitem[type="download"][verdict] > toolbarseparator {
   margin: 0;
 /*  border: none; */
   background: transparent;
-  padding: 8px;
-  color: #A09090;
+  padding: 0;
+  color: inherit;
 }
 
 .downloadButton > .button-box > .button-icon {
   width: 16px;
   height: 16px;
   margin: 1px;
-  filter: url("chrome://browser/skin/filters.svg#fill");
+  filter: url("chrome://global/skin/filters.svg#fill");
   fill: currentColor;
 }
 
@@ -253,21 +243,16 @@ richlistitem[type="download"][verdict] > toolbarseparator {
   padding: 0;
 }
 
-richlistitem[type="download"][state="1"][exists]:hover > .downloadMainArea,
-richlistitem[type="download"]:not([verdict]):hover > .downloadButtonArea {
-  background-color: var(--arrowpanel-dimmed);
-}
-
 richlistitem[type="download"][state="1"][exists] .downloadMainArea:hover,
 richlistitem[type="download"]:not([verdict]) > .downloadButtonArea:hover,
 richlistitem[type="download"][verdict]:hover {
-  background-color: var(--arrowpanel-dimmed-further);
+  background-color: var(--arrowpanel-dimmed);
 }
 
 richlistitem[type="download"][state="1"][exists] > .downloadMainArea:hover:active,
 richlistitem[type="download"]:not([verdict]) > .downloadButtonArea:hover:active,
 richlistitem[type="download"][verdict]:hover:active {
-  background-color: var(--arrowpanel-dimmed-even-further);
+  background-color: var(--arrowpanel-dimmed-further);
 }
 
 richlistitem[type="download"][showingsubview] {
@@ -284,10 +269,6 @@ richlistitem[type="download"][verdict="Malware"][showingsubview] {
   color: #000000;
 }
 
-richlistitem[type="download"][verdict="Malware"]:hover > .downloadButtonArea > .downloadButton {
-  color: inherit;
-}
-
 /*** Button icons ***/
 
 .downloadIconCancel > .button-box > .button-icon {
@@ -367,19 +348,13 @@ richlistitem[type="download"][verdict="Malware"]:hover > .downloadButtonArea > .
   -moz-margin-end: 16px;
 }
 
+/*** Progressmeter ***/
+/* %include progressmeter.inc.css - this happens as @import at the start of the file */
+
 /* === END downloads.inc.css === */
 
 /*** Panel and outer controls ***/
 
-#downloadsSummary {
-}
-
-#downloadsSummary:hover {
-}
-
-#downloadsSummary:hover:active {
-}
-
 #downloadsPanel[keyfocus] #downloadsSummary:focus,
 #downloadsPanel[keyfocus] .downloadsPanelFooterButton:focus {
   outline: 1px #008484 dotted;
@@ -408,10 +383,8 @@ richlistitem[type="download"][showingsubview][verdict="Malware"] {
 /*** List items and similar elements in the summary ***/
 
 :root {
-  --downloads-item-height: 7em;
+  --downloads-item-height: 5.5em;
   --downloads-item-font-size-factor: 0.9;
-  --downloads-item-target-margin-bottom: 6px;
-  --downloads-item-details-margin-top: 0;
   --downloads-item-details-opacity: 0.6;
 }
 
@@ -428,7 +401,7 @@ richlistitem[type="download"][verdict="PotentiallyUnwanted"] .blockedIcon {
 }
 
 richlistitem[type="download"][verdict="Uncommon"] .blockedIcon {
-  list-style-image: url("chrome://global/skin/icons/information-32.png");
+  list-style-image: url("chrome://global/skin/icons/info.svg");
 }
 
 @media (-moz-windows-default-theme) {