From ac6b679f822cb009d9f3f90b86a5d04eaca8e674 Mon Sep 17 00:00:00 2001
From: Gary Kacmarcik <garykac@google.com>
Date: Thu, 13 Nov 2014 12:52:17 -0800
Subject: [PATCH] [Chromoting] Extract butterbar css into separate file.

Update butter_bar filenames to be consistent.

BUG=
R=jamiewalch@chromium.org

Review URL: https://codereview.chromium.org/723873002

Cr-Commit-Position: refs/heads/master@{#304076}
---
 remoting/remoting_webapp_files.gypi           |  3 +-
 remoting/webapp/base/html/main.css            | 36 -----------------
 remoting/webapp/crd/html/butter_bar.css       | 40 +++++++++++++++++++
 .../html/{butterbar.html => butter_bar.html}  |  0
 remoting/webapp/crd/html/template_main.html   |  5 ++-
 5 files changed, 45 insertions(+), 39 deletions(-)
 create mode 100644 remoting/webapp/crd/html/butter_bar.css
 rename remoting/webapp/crd/html/{butterbar.html => butter_bar.html} (100%)

diff --git a/remoting/remoting_webapp_files.gypi b/remoting/remoting_webapp_files.gypi
index c0e3bfd6fffd..f5ff2b0ef94a 100644
--- a/remoting/remoting_webapp_files.gypi
+++ b/remoting/remoting_webapp_files.gypi
@@ -270,6 +270,7 @@
       'webapp/base/resources/open_sans.css',
       'webapp/base/resources/open_sans.woff',
       'webapp/base/resources/spinner.gif',
+      'webapp/crd/html/butter_bar.css',
       'webapp/crd/html/toolbar.css',
       'webapp/crd/html/menu_button.css',
       'webapp/crd/html/window_frame.css',
@@ -295,7 +296,7 @@
     'remoting_webapp_template_files': [
       'webapp/base/html/client_plugin.html',
       'webapp/base/html/dialog_auth.html',
-      'webapp/crd/html/butterbar.html',
+      'webapp/crd/html/butter_bar.html',
       'webapp/crd/html/dialog_client_connect_failed.html',
       'webapp/crd/html/dialog_client_connecting.html',
       'webapp/crd/html/dialog_client_host_needs_upgrade.html',
diff --git a/remoting/webapp/base/html/main.css b/remoting/webapp/base/html/main.css
index 8d7a52c3f810..a9df6ec2841d 100644
--- a/remoting/webapp/base/html/main.css
+++ b/remoting/webapp/base/html/main.css
@@ -425,42 +425,6 @@ section {
   margin-top: 30px;
 }
 
-#butter-bar {
-  position: absolute;
-  top: 80px;
-  left: 0;
-  display: -webkit-box;
-  width: 100%;
-}
-
-#butter-bar-dismiss img {
-  vertical-align: top;
-  opacity: 0.4;
-  margin-__MSG_@@bidi_start_edge__: 2px;
-  margin-__MSG_@@bidi_end_edge__: -12px;
-}
-
-#butter-bar-dimiss:hover {
-  opacity: 0.7;
-}
-
-#butter-bar > p {
-  background-color: #f9edbe;
-  border: 1px solid #f0c36d;
-  border-radius: 2px;
-  box-shadow: 0px 2px 4px rgba(0,0,0,0.2);
-  color: #222;
-  font-size: 12px;
-  padding: 4px 16px;
-  margin: auto;
-}
-
-#butter-bar a {
-  color: inherit;
-  text-decoration: underline;
-  padding-__MSG_@@bidi_start_edge__: 2px;
-}
-
 #paired-clients-list table {
   width: 100%;
 }
diff --git a/remoting/webapp/crd/html/butter_bar.css b/remoting/webapp/crd/html/butter_bar.css
new file mode 100644
index 000000000000..61a142a17dd6
--- /dev/null
+++ b/remoting/webapp/crd/html/butter_bar.css
@@ -0,0 +1,40 @@
+/* Copyright 2014 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#butter-bar {
+  position: absolute;
+  top: 80px;
+  left: 0;
+  display: -webkit-box;
+  width: 100%;
+}
+
+#butter-bar-dismiss img {
+  vertical-align: top;
+  opacity: 0.4;
+  margin-__MSG_@@bidi_start_edge__: 2px;
+  margin-__MSG_@@bidi_end_edge__: -12px;
+}
+
+#butter-bar-dimiss:hover {
+  opacity: 0.7;
+}
+
+#butter-bar > p {
+  background-color: #f9edbe;
+  border: 1px solid #f0c36d;
+  border-radius: 2px;
+  box-shadow: 0px 2px 4px rgba(0,0,0,0.2);
+  color: #222;
+  font-size: 12px;
+  padding: 4px 16px;
+  margin: auto;
+}
+
+#butter-bar a {
+  color: inherit;
+  text-decoration: underline;
+  padding-__MSG_@@bidi_start_edge__: 2px;
+}
diff --git a/remoting/webapp/crd/html/butterbar.html b/remoting/webapp/crd/html/butter_bar.html
similarity index 100%
rename from remoting/webapp/crd/html/butterbar.html
rename to remoting/webapp/crd/html/butter_bar.html
diff --git a/remoting/webapp/crd/html/template_main.html b/remoting/webapp/crd/html/template_main.html
index 2ba4d0419b1d..3abdc6ff0aba 100644
--- a/remoting/webapp/crd/html/template_main.html
+++ b/remoting/webapp/crd/html/template_main.html
@@ -9,10 +9,11 @@
   <head>
     <meta charset="utf-8">
     <link rel="icon" type="image/png" href="chromoting16.webp">
-    <link rel="stylesheet" href="open_sans.css">
+    <link rel="stylesheet" href="butter_bar.css">
     <link rel="stylesheet" href="connection_stats.css">
     <link rel="stylesheet" href="main.css">
     <link rel="stylesheet" href="menu_button.css">
+    <link rel="stylesheet" href="open_sans.css">
     <link rel="stylesheet" href="toolbar.css">
     <link rel="stylesheet" href="window_frame.css">
 
@@ -45,7 +46,7 @@
              hidden>
 
           <meta-include src="webapp/crd/html/ui_header.html"/>
-          <meta-include src="webapp/crd/html/butterbar.html"/>
+          <meta-include src="webapp/crd/html/butter_bar.html"/>
           <meta-include src="webapp/crd/html/ui_it2me.html"/>
           <meta-include src="webapp/crd/html/ui_me2me.html"/>