Skip to content

Commit

Permalink
[Chromoting] Extract butterbar css into separate file.
Browse files Browse the repository at this point in the history
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}
  • Loading branch information
Gary Kacmarcik committed Nov 13, 2014
1 parent 103d306 commit ac6b679
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 39 deletions.
3 changes: 2 additions & 1 deletion remoting/remoting_webapp_files.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand Down
36 changes: 0 additions & 36 deletions remoting/webapp/base/html/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -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%;
}
Expand Down
40 changes: 40 additions & 0 deletions remoting/webapp/crd/html/butter_bar.css
Original file line number Diff line number Diff line change
@@ -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;
}
File renamed without changes.
5 changes: 3 additions & 2 deletions remoting/webapp/crd/html/template_main.html
Original file line number Diff line number Diff line change
Expand Up @@ -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">

Expand Down Expand Up @@ -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"/>

Expand Down

0 comments on commit ac6b679

Please sign in to comment.