Bug 1248157 - Change more info-/error screens to in-content info page style. r=aleth
authorRichard Marti <richard.marti@gmail.com>
Sat, 13 Feb 2016 16:15:42 +0100 (2016-02-13)
changeset 18979 4ffdbec0f2778c4abcc1ee8764eb89cdb9b6e36d
parent 18978 475bcb77d9b9fc9ccdcd00a93845d3c2dccecf53
child 18980 f006326842f72330f016ac1feba17401db1d9138
push id11643
push useraleth@instantbird.org
push dateSun, 14 Feb 2016 14:19:24 +0000 (2016-02-14)
treeherdercomm-central@4ffdbec0f277 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaleth
bugs1248157
Bug 1248157 - Change more info-/error screens to in-content info page style. r=aleth
im/content/accounts.xul
im/content/viewlog.xul
im/themes/accounts.css
im/themes/viewlog.css
--- a/im/content/accounts.xul
+++ b/im/content/accounts.xul
@@ -118,17 +118,16 @@
     <menuitem command="cmd_movedown" observes="contextAccountsItems"/>
     <menuseparator observes="contextAccountsItems"/>
     <menuitem command="cmd_edit" observes="contextAccountsItems"/>
   </menupopup>
 
   <deck flex="1" id="accountsDesk" ondblclick="gAccountManager.new();">
     <vbox flex="1" id="noAccountScreen" align="center" pack="center">
       <hbox id="noAccountBox" align="top">
-        <image id="noAccountImage"/>
         <vbox id="noAccountInnerBox" flex="1">
           <label id="noAccountTitle" value="&accountManager.noAccount.title;"/>
           <description id="noAccountDesc">&accountManager.noAccount.description;</description>
         </vbox>
       </hbox>
     </vbox>
     <notificationbox id="accountsNotificationBox" flex="1">
       <richlistbox id="accountlist" flex="1" context="accountsContextMenu"
--- a/im/content/viewlog.xul
+++ b/im/content/viewlog.xul
@@ -117,17 +117,16 @@
                  disablehistory="true" src="about:blank" flex="1"/>
         <vbox flex="1">
           <browser id="conv-browser" type="content-conversation" flex="1"
                    context="contentAreaContextMenu" tooltip="imTooltip"/>
           <progressmeter id="browserProgress" hidden="true"/>
         </vbox>
         <vbox flex="1" id="corruptLogScreen" align="center" pack="center">
           <hbox id="corruptLogBox">
-            <image id="corruptLogImage"/>
             <vbox id="corruptLogInnerBox" align="center" pack="center" flex="1">
               <description id="corruptLogDesc">&logsWindow.corruptlogfile;</description>
             </vbox>
           </hbox>
         </vbox>
       </deck>
       <findbar id="findbar"/>
     </vbox>
--- a/im/themes/accounts.css
+++ b/im/themes/accounts.css
@@ -18,43 +18,44 @@ notification > hbox {
 %endif
 
 #accountsNotificationBox {
   margin: 0 0;
   -moz-appearance: none;
 }
 
 #noAccountScreen {
-  background-color: -moz-Dialog;
+  color: -moz-FieldText;
+  background-color: -moz-Field;
   overflow: auto;
 }
 #noAccountBox {
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-  border: 1px solid ThreeDShadow;
-  border-radius: 10px;
-  padding: 1.1em;
-  -moz-padding-start: 20px;
-  margin-left: 1em;
-  margin-right: 1em;
-}
-#noAccountImage {
-  list-style-image: url("chrome://global/skin/icons/information-64.png");
-  -moz-margin-end: 1.2em;
+  background: url("chrome://global/skin/icons/info.svg") left 5px no-repeat;
+  background-size: 2.5em;
+  padding-right: 3.5em;
+  padding-left: 3.5em;
+  margin-inline-start: 2.5em;
+  margin-inline-end: 1.5em;
 }
 #noAccountInnerBox {
-  max-width: 25em;
+  opacity: .8;
 }
 #noAccountTitle {
-  margin: 0 1em 0.6em 0;
-  font-size: 160%;
-  border-bottom: 1px solid ThreeDLightShadow
+  font-size: 2em;
+  font-weight: lighter;
+  line-height: 1.2;
+  margin: 0;
+  margin-bottom: .3em;
+  padding-bottom: .2em;
+  border-bottom: 1px solid -moz-FieldText;
 }
 #noAccountDesc {
   font-size: 110%;
+  margin-right: 0;
+  margin-left: 0;
 }
 
 #accountlist {
   margin: 0 0;
   -moz-appearance: none;
 %ifndef XP_MACOSX
   border-bottom: 2px solid;
   -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
@@ -107,17 +108,17 @@ button {
 
 button:focus {
   box-shadow: @focusRingShadow@, @roundButtonShadow@;
 }
 
 button:active:hover:focus {
   box-shadow: @focusRingShadow@, @roundButtonPressedShadow@;
 }
- 
+
 button:hover:active:not([disabled="true"]) {
   background: @toolbarbuttonPressedBackgroundColor@;
   text-shadow: @loweredShadow@;
   box-shadow: @toolbarbuttonPressedInnerShadow@, @loweredShadow@;
 }
 
 #bottombuttons button:-moz-window-inactive {
   color: @toolbarbuttonInactiveFontColor@ !important; /* remove this when we support click-through, bug 392188 */
--- a/im/themes/viewlog.css
+++ b/im/themes/viewlog.css
@@ -53,39 +53,34 @@ splitter:-moz-window-inactive {
 
 #logTree {
   margin: 0 0;
 }
 %endif
 %endif
 
 #corruptLogScreen {
-  background-color: -moz-Dialog;
+  color: -moz-FieldText;
+  background-color: -moz-Field;
   overflow: auto;
+  font-size: 16px;
+  font-weight: normal;
 }
 
 #corruptLogBox {
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-  border: 1px solid ThreeDShadow;
-  border-radius: 10px;
-  padding: 1.1em;
-  -moz-padding-start: 20px;
-  margin-left: 1em;
-  margin-right: 1em;
-}
-
-#corruptLogImage {
-%ifdef XP_MACOSX
-  list-style-image: url("chrome://global/skin/icons/error-large.png");
-%else
-  list-style-image: url("chrome://global/skin/icons/error-48.png");
-%endif
-  -moz-margin-end: 1em;
+  max-width: calc(500px + 7em);
+  min-height: 3em;
+  background: url("chrome://global/skin/icons/warning.svg") left 0 no-repeat;
+  background-size: 3em;
+  margin-right: .5em;
+  margin-left: .5em;
+  padding-right: 3.5em;
+  padding-left: 3.5em;
 }
 
 #corruptLogInnerBox {
-  max-width: 25em;
+  opacity: .8;
 }
 
 #corruptLogDesc {
-  font-size: 16px;
+  margin-right: 0;
+  margin-left: 0;
 }