Bug 1090949 - Refactor WebIDE preferences panel style. r=ochameau
authorJan Keromnes <janx@linux.com>
Wed, 25 Mar 2015 11:04:42 -0700
changeset 266025 69b55839ccaf529c05b51d7d800c9b46e416e5e3
parent 266024 33b342d47748b5bd53f869a529b4464e8e297dd9
child 266026 afc993c8248c55ec9f6e15abacd194a199eb3b84
push id830
push userraliiev@mozilla.com
push dateFri, 19 Jun 2015 19:24:37 +0000
treeherdermozilla-release@932614382a68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersochameau
bugs1090949
milestone39.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1090949 - Refactor WebIDE preferences panel style. r=ochameau
browser/devtools/webide/content/prefs.xhtml
browser/devtools/webide/content/webide.xul
browser/devtools/webide/themes/deck.css
browser/devtools/webide/themes/jar.mn
browser/devtools/webide/themes/prefs.css
browser/devtools/webide/themes/webide.css
--- a/browser/devtools/webide/content/prefs.xhtml
+++ b/browser/devtools/webide/content/prefs.xhtml
@@ -8,72 +8,61 @@
   <!ENTITY % webideDTD SYSTEM "chrome://browser/locale/devtools/webide.dtd" >
   %webideDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/deck.css" type="text/css"/>
-    <link rel="stylesheet" href="chrome://webide/skin/prefs.css" type="text/css"/>
     <script type="application/javascript;version=1.8" src="chrome://webide/content/prefs.js"></script>
   </head>
   <body>
 
     <div id="controls">
       <a id="restore">&prefs_restore;</a>
       <a id="manageComponents">&prefs_manage_components;</a>
       <a id="close">&deck_close;</a>
     </div>
 
     <h1>&prefs_title;</h1>
 
     <h2>&prefs_general_title;</h2>
 
     <ul>
       <li>
+        <label title="&prefs_options_showeditor_tooltip;">
+          <input type="checkbox" data-pref="devtools.webide.showProjectEditor"/>
+          <span>&prefs_options_showeditor;</span>
+        </label>
+      </li>
+      <li>
         <label title="&prefs_options_rememberlastproject_tooltip;">
           <input type="checkbox" data-pref="devtools.webide.restoreLastProject"/>
           <span>&prefs_options_rememberlastproject;</span>
         </label>
       </li>
       <li>
         <label title="&prefs_options_autoconnectruntime_tooltip;">
           <input type="checkbox" data-pref="devtools.webide.autoConnectRuntime"/>
           <span>&prefs_options_autoconnectruntime;</span>
         </label>
       </li>
       <li>
-        <label title="&prefs_options_showeditor_tooltip;">
-          <input type="checkbox" data-pref="devtools.webide.showProjectEditor"/>
-          <span>&prefs_options_showeditor;</span>
-        </label>
-      </li>
-      <li>
         <label title="&prefs_options_templatesurl_tooltip;">
           <span>&prefs_options_templatesurl;</span>
           <input data-pref="devtools.webide.templatesURL"/>
         </label>
       </li>
     </ul>
 
     <h2>&prefs_editor_title;</h2>
 
     <ul>
       <li>
-        <label><span>&prefs_options_keybindings;</span>
-          <select data-pref="devtools.editor.keymap">
-            <option value="default">&prefs_options_keybindings_default;</option>
-            <option value="vim">Vim</option>
-            <option value="emacs">Emacs</option>
-            <option value="sublime">Sublime</option>
-          </select>
-        </label>
-      </li>
-      <li>
         <label><span>&prefs_options_tabsize;</span>
           <select data-pref="devtools.editor.tabsize">
             <option value="2">2</option>
             <option value="4">4</option>
             <option value="8">8</option>
           </select>
         </label>
       </li>
@@ -96,12 +85,22 @@
         </label>
       </li>
       <li>
         <label title="&prefs_options_autoclosebrackets_tooltip;">
           <input type="checkbox" data-pref="devtools.editor.autoclosebrackets"/>
           <span>&prefs_options_autoclosebrackets;</span>
         </label>
       </li>
+      <li>
+        <label><span>&prefs_options_keybindings;</span>
+          <select data-pref="devtools.editor.keymap">
+            <option value="default">&prefs_options_keybindings_default;</option>
+            <option value="vim">Vim</option>
+            <option value="emacs">Emacs</option>
+            <option value="sublime">Sublime</option>
+          </select>
+        </label>
+      </li>
     </ul>
 
   </body>
 </html>
--- a/browser/devtools/webide/content/webide.xul
+++ b/browser/devtools/webide/content/webide.xul
@@ -178,17 +178,17 @@
         <vbox id="runtime-panel-simulator"></vbox>
         <toolbarbutton class="panel-item" label="&runtimePanel_installsimulator;" id="runtime-panel-installsimulator" command="cmd_showAddons"/>
         <label class="panel-header">&runtimePanel_other;</label>
         <vbox id="runtime-panel-other"></vbox>
         <vbox flex="1" id="runtime-actions">
           <toolbarbutton class="panel-item" id="runtime-details" command="cmd_showRuntimeDetails"/>
           <toolbarbutton class="panel-item" id="runtime-permissions" command="cmd_showPermissionsTable"/>
           <toolbarbutton class="panel-item" id="runtime-preferences" command="cmd_showDevicePrefs"/>
-          <toolbarbutton class="panel-item" id="runtime-preferences" command="cmd_showSettings"/>
+          <toolbarbutton class="panel-item" id="runtime-settings" command="cmd_showSettings"/>
           <toolbarbutton class="panel-item" id="runtime-screenshot"  command="cmd_takeScreenshot"/>
           <toolbarbutton class="panel-item" id="runtime-disconnect"  command="cmd_disconnectRuntime"/>
         </vbox>
       </vbox>
     </panel>
 
   </popupset>
 
--- a/browser/devtools/webide/themes/deck.css
+++ b/browser/devtools/webide/themes/deck.css
@@ -52,8 +52,21 @@ th, td {
 
 th {
   min-width: 130px;
 }
 
 th:first-of-type, td:first-of-type {
   text-align: left;
 }
+
+li {
+  list-style: none;
+  padding: 2px;
+}
+
+li > label:hover {
+  background-color: rgba(0,0,0,0.02);
+}
+
+li > label > span {
+  display: inline-block;
+}
--- a/browser/devtools/webide/themes/jar.mn
+++ b/browser/devtools/webide/themes/jar.mn
@@ -6,16 +6,15 @@ webide.jar:
 % skin webide classic/1.0 %skin/
 * skin/webide.css              (webide.css)
   skin/icons.png               (icons.png)
   skin/details.css             (details.css)
   skin/newapp.css              (newapp.css)
   skin/throbber.svg            (throbber.svg)
   skin/deck.css                (deck.css)
   skin/addons.css              (addons.css)
-  skin/prefs.css               (prefs.css)
   skin/runtimedetails.css      (runtimedetails.css)
   skin/permissionstable.css    (permissionstable.css)
   skin/monitor.css             (monitor.css)
   skin/config-view.css         (config-view.css)
   skin/wifi-auth.css           (wifi-auth.css)
   skin/logs.css                (logs.css)
   skin/project-listing.css     (project-listing.css)
deleted file mode 100644
--- a/browser/devtools/webide/themes/prefs.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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/. */
-
-li {
-  list-style: none;
-}
-
-li > label:hover {
-  background-color: rgba(0,0,0,0.02);
-}
-
-li > label > span {
-  display: inline-block;
-}
--- a/browser/devtools/webide/themes/webide.css
+++ b/browser/devtools/webide/themes/webide.css
@@ -250,31 +250,33 @@ panel > .panel-arrowcontainer > .panel-a
 #runtime-panel-other {
   margin-bottom: 12px;
 }
 
 #runtime-details,
 #runtime-screenshot,
 #runtime-permissions,
 #runtime-preferences,
+#runtime-settings,
 #runtime-disconnect,
 #runtime-panel-nousbdevice,
 #runtime-panel-noadbhelper,
 #runtime-panel-installsimulator,
 .runtime-panel-item-usb,
 .runtime-panel-item-wifi,
 .runtime-panel-item-other,
 .runtime-panel-item-simulator {
   list-style-image: url("icons.png");
 }
 
 #runtime-details                { -moz-image-region: rect(156px,438px,182px,412px) }
 #runtime-screenshot             { -moz-image-region: rect(130px,438px,156px,412px) }
 #runtime-permissions            { -moz-image-region: rect(104px,438px,130px,412px) }
 #runtime-preferences            { -moz-image-region: rect(104px,462px,129px,438px) }
+#runtime-settings               { -moz-image-region: rect(104px,462px,129px,438px) }
 #runtime-disconnect             { -moz-image-region: rect(52px,438px,78px,412px) }
 #runtime-panel-nousbdevice      { -moz-image-region: rect(156px,438px,182px,412px) }
 #runtime-panel-noadbhelper      { -moz-image-region: rect(234px,438px,260px,412px) }
 #runtime-panel-installsimulator { -moz-image-region: rect(0px,438px,26px,412px) }
 .runtime-panel-item-usb         { -moz-image-region: rect(52px,438px,78px,412px) }
 .runtime-panel-item-wifi        { -moz-image-region: rect(208px,438px,234px,412px) }
 .runtime-panel-item-other       { -moz-image-region: rect(26px,438px,52px,412px) }
 .runtime-panel-item-simulator   { -moz-image-region: rect(0px,438px,26px,412px) }